From 814bee0d55a707e48d3819b9f8a3ed2e49ea74c5 Mon Sep 17 00:00:00 2001 From: yangxin <2509699647@qq.com> Date: Mon, 3 Mar 2025 15:44:24 +0800 Subject: [PATCH] '更新' --- admin-web-master/src/layout/index.vue | 28 ++++++++++++++-------------- admin-web-master/src/views/customer/rUser/index.vue | 28 ++++++++++++++++++++++++---- admin-web-master/src/views/customer/yixiang/index.vue | 36 +++++++++++++++++++++++++++++++----- admin-web-master/src/views/serve/Merchant/index.vue | 4 ++-- ceres-uniapp-master/pages/tabbar/user/index.vue | 2 +- ceres-uniapp-master/pages_category_page2/userModule/personalDetails.vue | 46 ++++++++++++++++++++++++++++++++++++++++------ ceres-uniapp-master/utils/payUtil.js | 30 +++++++++++++++++------------- lvdao-miniapp/pages/shops/shops.vue | 19 ++++++++++++++++--- 8 files changed, 145 insertions(+), 48 deletions(-) diff --git a/admin-web-master/src/layout/index.vue b/admin-web-master/src/layout/index.vue index bfe4062..bea6de8 100644 --- a/admin-web-master/src/layout/index.vue +++ b/admin-web-master/src/layout/index.vue @@ -197,17 +197,17 @@ } } return { - msg: [], - list: [], + // msg: [], + // list: [], // msg: ['招商服务系统'], - // msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'], - // list: [ - // ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'], - // ['品牌策划', '活动策划', '氛围策划', '媒体推广'], - // ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'], - // ['联机交易', '对账处理', '日志管理', '商户服务'], - // ['渠道售票统计分析', '销售额统计分析'], - // ], + msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'], + list: [ + ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'], + ['品牌策划', '活动策划', '氛围策划', '媒体推广'], + ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'], + ['联机交易', '对账处理', '日志管理', '商户服务'], + ['渠道售票统计分析', '销售额统计分析'], + ], listMune: [], mumeList: [], mumeChildren1: [], @@ -296,10 +296,10 @@ this.userAvatar = getUserAvatar() }, mounted() { - this.getMemu() - this.address() - this.waibu() - // this.neibu() + // this.getMemu() + // this.address() + // this.waibu() + this.neibu() }, methods: { diff --git a/admin-web-master/src/views/customer/rUser/index.vue b/admin-web-master/src/views/customer/rUser/index.vue index 860894b..46ea0e5 100644 --- a/admin-web-master/src/views/customer/rUser/index.vue +++ b/admin-web-master/src/views/customer/rUser/index.vue @@ -326,10 +326,30 @@ import merchantInformation from '../../../components/merchantInformation/index.v }, this.getAll() }, - async sethei(ids, num) { - // console.log(ids, num) - await cerePlatformMerchantedit({id:ids,isBlackList:num}) - this.getAll() + sethei(ids, num) { + const h = this.$createElement; + this.$msgbox({ + title: '消息', + message: h('p', null, [ + h('span', null, '是否处理'), + ]), + showCancelButton: true, + showClose:false, + confirmButtonText: '确定', + cancelButtonText: '取消', + customClass:'oe-dialog-btn', + beforeClose: (action, instance, done) => { + if (action === 'confirm') { + cerePlatformMerchantedit({id:ids,isBlackList:num}).then(res=>{ + this.getAll() + done(); + }) + } else { + done(); + } + } + }) + } } } diff --git a/admin-web-master/src/views/customer/yixiang/index.vue b/admin-web-master/src/views/customer/yixiang/index.vue index e56042a..5db57b7 100644 --- a/admin-web-master/src/views/customer/yixiang/index.vue +++ b/admin-web-master/src/views/customer/yixiang/index.vue @@ -33,6 +33,14 @@ + + + + + +