From 9768b04c883cd9bf9a405e653843670215b23750 Mon Sep 17 00:00:00 2001 From: helen Date: Fri, 27 Dec 2024 14:18:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=81=E7=A6=81bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/manage/banned/index.ts | 4 +- src/api/manage/mkJigsaw/index.ts | 11 ++ src/components/Map/index.vue | 2 +- src/views/manage/hotel/index.vue | 15 +-- src/views/manage/mkJigsaw/index.vue | 159 +++++++++++++++++++++++++++- src/views/manage/report/index.vue | 40 ++++++- vite.config.ts | 4 +- 7 files changed, 214 insertions(+), 21 deletions(-) diff --git a/src/api/manage/banned/index.ts b/src/api/manage/banned/index.ts index 9d7ad39..4d8f547 100644 --- a/src/api/manage/banned/index.ts +++ b/src/api/manage/banned/index.ts @@ -43,9 +43,9 @@ export const addBanned = (data: BannedForm) => { * 修改举报 * @param data */ -export const updateBanned = (data: BannedForm) => { +export const updatemanage = (data: BannedForm) => { return request({ - url: '/manage/banned', + url: '/manage/report', method: 'put', data: data }); diff --git a/src/api/manage/mkJigsaw/index.ts b/src/api/manage/mkJigsaw/index.ts index 199f288..3653ac0 100644 --- a/src/api/manage/mkJigsaw/index.ts +++ b/src/api/manage/mkJigsaw/index.ts @@ -95,3 +95,14 @@ export const productCategoryall = (query?: MkJigsawQuery): AxiosPromise => { + return request({ + url: '/manage/mkJoin/list', + method: 'get', + params: query + }); +}; diff --git a/src/components/Map/index.vue b/src/components/Map/index.vue index 0ce92da..6b62e2f 100644 --- a/src/components/Map/index.vue +++ b/src/components/Map/index.vue @@ -136,7 +136,7 @@ const onClick = (e: any) => { data.result.address_component.city + data.result.address_component.district + data.result.address_component.street + - data.result.address_component.street_number +data.result.title; + data.result.address_component.street_number + data.result.formatted_addresses.recommend; form.value.latitude = data.result.location.lat; form.value.longitude = data.result.location.lng; // form.value.address = data.result.formatted_addresses.recommend; diff --git a/src/views/manage/hotel/index.vue b/src/views/manage/hotel/index.vue index 4fa5113..ab200b9 100644 --- a/src/views/manage/hotel/index.vue +++ b/src/views/manage/hotel/index.vue @@ -10,7 +10,8 @@ - + + @@ -36,7 +37,8 @@ @@ -44,16 +46,16 @@ @@ -282,6 +284,7 @@ const handleUpdate = async (row?: HotelVO) => { Object.assign(form.value, res.data); center.value = { lat: row.latitude, lng: row.longitude }; geometries.value = [{ styleId: 'marker', position: { lat: row.latitude, lng: row.longitude } }]; + searchLocation.value = form.value.address; dialog.visible = true; dialog.title = '修改住宿'; }; @@ -416,7 +419,7 @@ const onClick = (e: any) => { data.result.address_component.district + data.result.address_component.street + data.result.address_component.street_number + - data.result.title; + data.result.formatted_addresses.recommend; form.value.latitude = data.result.location.lat; form.value.longitude = data.result.location.lng; // form.value.province = data.result.address_component.province; diff --git a/src/views/manage/mkJigsaw/index.vue b/src/views/manage/mkJigsaw/index.vue index 3272908..1072676 100644 --- a/src/views/manage/mkJigsaw/index.vue +++ b/src/views/manage/mkJigsaw/index.vue @@ -47,12 +47,12 @@ @@ -222,6 +222,64 @@ + + +
+ + + + + + + +
+ + + + +
+ + + + + {{ productInfo.form.productName }} + + + + + {{ formatCategoryName(productInfo.form.categoryId) }} + + + + + {{ formatVendorName(productInfo.form.vendorId) }} + + + + + + + + + + {{ productInfo.form.productShows }} + + + + +
+ + @@ -234,9 +292,12 @@ import { updateMkJigsaw, productall, mkJigsawDetaillist, - productCategoryall -} from '@/api/manage/mkJigsaw'; + productCategoryall, mkJoinlist +} from "@/api/manage/mkJigsaw"; import { MkJigsawVO, MkJigsawQuery, MkJigsawForm } from '@/api/manage/mkJigsaw/types'; +import { mkRewardUserList } from '@/api/manage/mkConfig'; +import { listProductCategory } from '@/api/manage/productCategory'; +import { getProduct } from '@/api/manage/product'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { mk_jigsaw_task_catagory } = toRefs(proxy?.useDict('mk_jigsaw_task_catagory')); @@ -266,7 +327,24 @@ const dialog = reactive({ visible: false, title: '' }); - +const mkRewardUserParams = reactive({ + pageNum: 1, + pageSize: 10, + bizId: null +}); +const mkReward = reactive({ + visible: false +}); +const productInfo = reactive({ + visible: false, + form: { + image: null, + vendorId: null, + categoryId: null, + productName: null, + productShows: null + } +}); const mksave = reactive({ visible: false, title: '拼图详情' @@ -364,6 +442,7 @@ const getList = async () => { const cancel = () => { reset(); dialog.visible = false; + mkReward.visible = false; }; /** 表单重置 */ @@ -570,10 +649,80 @@ const mkdatetime = () => { form.value.endDate = value2.value[1]; } }; +//参与人数 +const handleJoin = async () => { +const res = await mkJoinlist() +}; +//关闭奖品详情 +const cancelProductInfo = () => { + productInfo.visible = false; +}; +/** + * 查看奖品详情 + * @param productId + */ +const getproductInfo = async (productId: any) => { + const res = await getProduct(productId); + productInfo.form = res.data; + productInfo.visible = true; +}; +const mkRewardUserLists = ref([]); + +const handleAward = async (row: any) => { + loading.value = true; + mkRewardUserParams.bizId = row.id; + const res = await mkRewardUserList(mkRewardUserParams).finally(() => (loading.value = false)); + mkRewardUserLists.value = res.rows; + mkReward.visible = true; + + // dialog.title = "修改营销配置"; +}; +/** + * 供应商列表 + */ +const listVendorList = ref([]); +const getlistVendor = async () => { + let res = await listVendor({ pageNum: 1, pageSize: 9999 }); + listVendorList.value = res.rows; +}; +/** + * 格式化 供应商名称 + * @param id + */ +const formatVendorName = (id: any) => { + for (let i = 0; i < listVendorList.value.length; i++) { + const element = listVendorList.value[i]; + if (element.id == id) { + return element.vendorName; + } + } +}; +/** + * 商品类别列表 + */ +const productCategoryList = ref([]); +const getProductCategoryList = async () => { + let res = await listProductCategory({ pageNum: 1, pageSize: 9999 }); + productCategoryList.value = res.rows; +}; +/** + * 格式化商品类别名称 + * @param row + */ +const formatCategoryName = (id: any) => { + for (let i = 0; i < productCategoryList.value.length; i++) { + const element = productCategoryList.value[i]; + if (element.id == id) { + return element.category; + } + } +}; onMounted(() => { getList(); getproductall(); goodleibie(); + getlistVendor(); //供应商列表 + getProductCategoryList(); //商品类别列表 });