diff --git a/admin-web-master/src/components/add/addfa.vue b/admin-web-master/src/components/add/addfa.vue index df71a7a..55f1008 100644 --- a/admin-web-master/src/components/add/addfa.vue +++ b/admin-web-master/src/components/add/addfa.vue @@ -101,7 +101,7 @@ - + diff --git a/admin-web-master/src/layout/index.vue b/admin-web-master/src/layout/index.vue index 58b44d5..a60a1c4 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: { @@ -512,7 +512,7 @@ getMemu() { // console.log(userData, 'userData') - // let userData = JSON.parse(localStorage.getItem('user')); + let userData = JSON.parse(localStorage.getItem('user')); if (!userData) { window.location.href = 'https://admin-uat.028wlkj.com:1020/login' // window.location.href = 'http://128.10.9.151:5173/home' @@ -774,18 +774,18 @@ clk(index) { this.index = index this.listMune = [] - this.list = [ - ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'], - ['品牌策划', '活动策划', '氛围策划', '媒体推广'], - ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'], - ['联机交易', '对账处理', '日志管理', '商户服务'], - ['渠道售票统计分析', '销售额统计分析'], - ] - // this.getMemu() - // this.waibu() - - this.neibu() + // this.list = [ + // ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'], + // ['品牌策划', '活动策划', '氛围策划', '媒体推广'], + // ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'], + // ['联机交易', '对账处理', '日志管理', '商户服务'], + // ['渠道售票统计分析', '销售额统计分析'], + // ] + this.getMemu() + this.waibu() this.list = this.mumeList + // this.neibu() + }, handleClickOutside() { this.$store.dispatch('app/closeSideBar', { diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js index eaaed36..b0da5ae 100644 --- a/admin-web-master/src/utils/request.js +++ b/admin-web-master/src/utils/request.js @@ -17,7 +17,8 @@ let baseURL = '' if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; - baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; + // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; + baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server' // baseURL = 'http://128.10.249.21:9003'; // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; diff --git a/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue index 0f0c020..c55fca6 100644 --- a/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue +++ b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue @@ -412,7 +412,7 @@ // console.error({...this.pagequery}) const res = await AdvertiserInfoGetAll(this.pagequery) this.tableData = res.data.content - this.total = res.data.totalElements + this.total = res.data.totalElements || 0 let obj1 = { pageNumber: 0, pageSize: 10, diff --git a/admin-web-master/src/views/serve/MarkActivity/index.vue b/admin-web-master/src/views/serve/MarkActivity/index.vue index 741072b..28dc3f2 100644 --- a/admin-web-master/src/views/serve/MarkActivity/index.vue +++ b/admin-web-master/src/views/serve/MarkActivity/index.vue @@ -157,16 +157,16 @@ - + - + - + - - + @@ -260,14 +260,14 @@ {{scope.$index + 1}} - - - + - + - + + - + - + - + - - - + + diff --git a/admin-web-master/src/views/serve/Merchant/index.vue b/admin-web-master/src/views/serve/Merchant/index.vue index b7beec1..4ca2718 100644 --- a/admin-web-master/src/views/serve/Merchant/index.vue +++ b/admin-web-master/src/views/serve/Merchant/index.vue @@ -162,16 +162,16 @@ - + - + - + - - + @@ -284,14 +284,14 @@ {{scope.$index + 1}} - - - + - + - + + - + - + - + - - - + + diff --git a/lvdao-miniapp/pages/workbench/workbench.vue b/lvdao-miniapp/pages/workbench/workbench.vue index f9d623e..d81ef1c 100644 --- a/lvdao-miniapp/pages/workbench/workbench.vue +++ b/lvdao-miniapp/pages/workbench/workbench.vue @@ -131,11 +131,11 @@ id: 1, title: '活动与意向申请', children: [ - { name: '问卷调查', img: '/workbench1.png', path: '/pages/questionnaire/questionnaire' }, + { name: '问卷调查', img: '/wjdc.png', path: '/pages/questionnaire/questionnaire' }, // { name: '招商方案', img: '/workbench2.png', path: '/pages/Iproposal/Iproposal' }, - { name: '我的活动', img: '/workbench3.png', path: '/pages/participation/participation' }, - { name: '活动申请', img: '/workbench4.png', path: '/pages/mycreated/mycreated' }, - { name: '意向申请', img: '/workbench5.png', path: '/pages/rsaManagement/rsaManagement' }, + { name: '我的活动', img: '/wdhd.png', path: '/pages/participation/participation' }, + { name: '活动申请', img: '/hdsq.png', path: '/pages/mycreated/mycreated' }, + { name: '意向申请', img: '/yxsq.png', path: '/pages/rsaManagement/rsaManagement' }, ] }, ], @@ -148,8 +148,8 @@ // { name: '招商方案', img: '/workbench2.png', path: '/pages/Iproposal/Iproposal' }, // { name: '我的活动', img: '/workbench3.png', path: '/pages/participation/participation' }, // { name: '活动申请', img: '/workbench4.png', path: '/pages/mycreated/mycreated' }, - { name: '销售上报', img: '/workbench5.png', path: '/pages/saleReport/saleReport' }, - { name: '销售统计', img: '/workbench5.png', path: '/pages/salesReporting/salesReporting' }, + { name: '销售上报', img: '/xssb.png', path: '/pages/saleReport/saleReport' }, + { name: '销售统计', img: '/xstj.png', path: '/pages/salesReporting/salesReporting' }, ] }, ], @@ -161,8 +161,8 @@ // { name: '文件调查', img: '/workbench1.png', path: '/pages/questionnaire/questionnaire' }, // { name: '招商方案', img: '/workbench2.png', path: '/pages/Iproposal/Iproposal' }, // { name: '我的活动', img: '/workbench3.png', path: '/pages/participation/participation' }, - // { name: '活动申请', img: '/workbench4.png', path: '/pages/mycreated/mycreated' }, - { name: '租金缴费', img: '/workbench1.png', path: '/pagesA/rentPay/rentPay' }, + // { name: '活动申请', img: '/wyjf.png', path: '/pages/mycreated/mycreated' }, + { name: '租金缴费', img: '/zjjf.png', path: '/pagesA/rentPay/rentPay' }, ] }, ], diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js index 5e772e3..1454b95 100644 --- a/lvdao-miniapp/utils/request.js +++ b/lvdao-miniapp/utils/request.js @@ -1,7 +1,8 @@ // let hostall = window.location.href; // let c1 = hostall.split('cdwlMall')[0]; -let c1 = 'https://jy.scjysm.asia:18086/' +// let c1 = 'https://jy.scjysm.asia:18086/' +let c1 = 'https://zhgw-uat.028wlkj.com/' //封装request请求 const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { //判断header提交数据类型