From cfcb44ef317aae49826a27d7fd56b179b269e0d8 Mon Sep 17 00:00:00 2001 From: 2509699674 <2509699647@qq.com> Date: Thu, 23 Jan 2025 17:46:27 +0800 Subject: [PATCH] '改bug版' --- admin-web-master/src/components/chakan/ggsh.vue | 51 +++++++++++++++++++++++++++++++-------------------- admin-web-master/src/layout/index.vue | 4 ++-- admin-web-master/src/main.js | 3 ++- admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue | 4 +++- admin-web-master/src/views/customer/icManagement/index.vue | 54 +++++++++++++++++++++++++++++++++++++++--------------- admin-web-master/src/views/customer/rsaManagement/genjin.vue | 56 ++++++++++++++++++++++++++++++++++++-------------------- admin-web-master/src/views/customer/rsaManagement/index.vue | 41 ++++++++++++++++++++++++++++------------- admin-web-master/src/views/customer/rsaManagement/tanpan.vue | 47 +++++++++++++++++++++++++++++++---------------- admin-web-master/src/views/serve/MarkActivity/index.vue | 17 +++++++++++++++-- admin-web-master/src/views/serve/Merchant/index.vue | 14 +++++++++++--- admin-web-master/src/views/serve/actSp.vue | 2 ++ lvdao-miniapp/pages/activityAdd/activityAdd.vue | 2 +- lvdao-miniapp/pages/advertisement/advertisement.vue | 23 +++++++++++------------ lvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue | 2 +- lvdao-miniapp/pages/business/businessList/businessList.vue | 2 +- lvdao-miniapp/pages/details/details.vue | 19 +++++++++++++++---- lvdao-miniapp/pages/home/home.vue | 6 +++++- lvdao-miniapp/pages/marketing/marketingList/marketingList.vue | 4 +++- lvdao-miniapp/pages/message/message.vue | 2 +- lvdao-miniapp/pages/my/my.vue | 2 +- lvdao-miniapp/pages/participation/participation.vue | 2 +- lvdao-miniapp/pages/rsaManagement/rsaManagement.vue | 5 +++-- lvdao-miniapp/pages/saleReport/saleReport.vue | 4 ++-- lvdao-miniapp/pages/shops/shops.scss | 2 +- lvdao-miniapp/pages/shops/shops.vue | 52 ++++++++++++++++++++++++++++++++++++++++++---------- 25 files changed, 288 insertions(+), 132 deletions(-) diff --git a/admin-web-master/src/components/chakan/ggsh.vue b/admin-web-master/src/components/chakan/ggsh.vue index 66b4338..24a17d7 100644 --- a/admin-web-master/src/components/chakan/ggsh.vue +++ b/admin-web-master/src/components/chakan/ggsh.vue @@ -20,8 +20,8 @@ - -
{{info.entityName}}
+ +
{{info.subjectName}}
 @@ -32,8 +32,8 @@ - -
{{info.entityType}}
+ +
{{info.type}}
 @@ -57,8 +57,8 @@ - -
{{info.residence}}
+ +
{{info.address}}
 @@ -87,36 +87,36 @@ - -
{{info.operatorName}}
+ +
{{shopMsg.name}}
 -
{{info.phone}}
+
{{shopMsg.phone}}
 -
{{info.idCardType}}
+
{{shopMsg.idCardType}}
 - -
{{info.idNumber}}
+ +
{{shopMsg.idCardNumber}}
 - +
- +
- +
- +
@@ -211,7 +211,7 @@ - +
{{info.cereAdvertisingInformation.memo || '无'}}
 @@ -262,7 +262,9 @@ import { AdvertiserInfoEdit, } from '@/api/advertisement.js' - + import { + cerePlatformMerchant + } from '@/api/newly.js' import TitleWithCircle from '@/components/top/index'; import MapXian from "@/components/MapContainer/MapXian"; export default { @@ -301,12 +303,21 @@ shop: {}, newshop: {}, newinfo: {}, - parentMessage: {} + parentMessage: {}, + pagequery: { + pageNumber: 0, + pageSize: 10, + checkState:'2', + name: '', + }, + shopMsg:{} } }, created() { console.log(this.info) - + cerePlatformMerchant(this.pagequery).then(res=>{ + this.shopMsg = res.data.content[0] + }) }, computed: { diff --git a/admin-web-master/src/layout/index.vue b/admin-web-master/src/layout/index.vue index c8beb4b..9eb5c1e 100644 --- a/admin-web-master/src/layout/index.vue +++ b/admin-web-master/src/layout/index.vue @@ -263,7 +263,7 @@ export default { // ['招商资源监测','商家管理','商铺租赁服务','招商方案管理','招商租赁管理'], ['招商资源监测','商家管理','商铺租赁服务','招商方案管理','招商租赁管理','广告服务','轮播图设置','商户意向管理','客服服务管理'], ['品牌策划','活动策划','氛围策划','媒体推广'], - ['订单管理','积分管理','消息中心','会员管理','评论管理','商品管理','库存管理','销售统计','平台活动'], + ['订单管理','积分管理','消息中心','会员管理','评论管理','商品管理','库存管理','销售统计','优惠券管理'], ['联机交易','对账处理','日志管理','商户服务'], ['渠道售票统计分析','销售额统计分析'], ], @@ -645,7 +645,7 @@ this.listMune[0] = All ['招商资源监测','商家管理','商铺租赁服务','招商方案管理','招商租赁管理','广告服务','轮播图设置','商户意向管理','客服服务管理'], // ['招商资源监测','商家管理','招商方案管理','招商租赁管理','广告服务','客服服务管理','系统设置','商铺租赁服务','招商过程管理','商户寻租管理','轮播图设置'], ['品牌策划','活动策划','氛围策划','媒体推广'], - ['订单管理',,'积分管理','消息中心','会员管理','评论管理','商品管理','库存管理','销售统计','平台活动'], + ['订单管理',,'积分管理','消息中心','会员管理','评论管理','商品管理','库存管理','销售统计','优惠券管理'], ['联机交易','对账处理','日志管理','商户服务'], ['渠道售票统计分析','销售额统计分析'], ], diff --git a/admin-web-master/src/main.js b/admin-web-master/src/main.js index ca65a83..dbaf58f 100644 --- a/admin-web-master/src/main.js +++ b/admin-web-master/src/main.js @@ -39,7 +39,8 @@ Vue.prototype.$hostUrl =`${window.location.protocol}//${window.location.host}/cd let host = window.location.host; if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528' ) { - Vue.prototype.$baseURL ='http://172.16.61.125/cdwlMall' + // Vue.prototype.$baseURL ='http://172.16.61.125/cdwlMall' + Vue.prototype.$baseURL ='https://jy.scjysm.asia:18086/cdwlMall' Vue.prototype.$fontBold = `http://172.16.61.125/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Bold.ttf` Vue.prototype.$fontRegular = `http://172.16.61.125/cdwlMall/zsfwzxt/assets/Alibaba-PuHuiTi-Regular.ttf` } else { diff --git a/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue index 0332412..615d5ed 100644 --- a/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue +++ b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue @@ -248,6 +248,8 @@ type: 'success' }) this.removeonaction('1') + this.addcl = false + this.getAll() } else { this.$message({ message: res.msg, @@ -544,4 +546,4 @@ padding: 0; display: none; } - \ No newline at end of file + diff --git a/admin-web-master/src/views/customer/icManagement/index.vue b/admin-web-master/src/views/customer/icManagement/index.vue index 17e94e4..f692be3 100644 --- a/admin-web-master/src/views/customer/icManagement/index.vue +++ b/admin-web-master/src/views/customer/icManagement/index.vue @@ -46,7 +46,7 @@ - +