From 86d40468e01ed9c39e28c13557485ae0121420d5 Mon Sep 17 00:00:00 2001 From: wesley88 <9519127+wesley88@user.noreply.gitee.com> Date: Fri, 14 Mar 2025 13:40:42 +0800 Subject: [PATCH] 1 --- admin-web-master/src/layout/index.vue | 36 ++++++++++++++++++------------------ lvdao-miniapp/main.js | 8 ++++---- lvdao-miniapp/manifest.json | 2 +- lvdao-miniapp/pages/orderList/inventory.vue | 6 +++--- lvdao-miniapp/pages/orderList/inventorydetails.vue | 2 +- lvdao-miniapp/utils/request.js | 10 +++++----- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/admin-web-master/src/layout/index.vue b/admin-web-master/src/layout/index.vue index a73cb9b..e748c5a 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: { @@ -780,12 +780,12 @@ ['联机交易', '对账处理', '日志管理', '商户服务'], ['渠道售票统计分析', '销售额统计分析'], ] - // this.neibu() + this.neibu() - this.getMemu() - this.waibu() - this.list = this.mumeList + // this.getMemu() + // this.waibu() + // this.list = this.mumeList }, diff --git a/lvdao-miniapp/main.js b/lvdao-miniapp/main.js index 04a1ae4..05955c5 100644 --- a/lvdao-miniapp/main.js +++ b/lvdao-miniapp/main.js @@ -8,13 +8,13 @@ import uView from "uview-ui"; import DialogBox from './components/DialogBox/DialogBox'; // let hostall = window.location.href; // let c1 = hostall.split('cdwlMall')[0]; -let c1 = 'https://jy.scjysm.asia:18086/' -// let c1 = 'https://zhgw-uat.028wlkj.com/' +// let c1 = 'https://jy.scjysm.asia:18086/' +let c1 = 'https://zhgw-uat.028wlkj.com/' Vue.config.productionTip = false Vue.prototype.$http = http Vue.prototype.$imgUrl = (url) => { - return (c1 + "cdwlMall/questionnaire/file/static" + url); - // return (c1 + "cdwlMall/zsfwzxt/test/file/static" + url); + // return (c1 + "cdwlMall/questionnaire/file/static" + url); + return (c1 + "cdwlMall/zsfwzxt/test/file/static" + url); } Vue.prototype.$img = c1+ 'cdwlMall' // Vue.prototype.$upload = "https://zhld.028wlkj.com:49008/cdwlMall/admin-server/miniio/upload" diff --git a/lvdao-miniapp/manifest.json b/lvdao-miniapp/manifest.json index ac3b56a..c759f17 100644 --- a/lvdao-miniapp/manifest.json +++ b/lvdao-miniapp/manifest.json @@ -1,6 +1,6 @@ { "name" : "绿道", - "appid" : "__UNI__F034047", + "appid" : "__UNI__189D96A", "description" : "", "versionName" : "1.0.2", "versionCode" : "100", diff --git a/lvdao-miniapp/pages/orderList/inventory.vue b/lvdao-miniapp/pages/orderList/inventory.vue index f57dab1..53b803d 100644 --- a/lvdao-miniapp/pages/orderList/inventory.vue +++ b/lvdao-miniapp/pages/orderList/inventory.vue @@ -89,9 +89,9 @@ }, methods: { gopath(url,id){ - uni.navigateTo({ - url:url+'?id='+id - }) + // uni.navigateTo({ + // url:url+'?id='+id + // }) }, getALL() { this.$http.sendRequest('/product/getAll', 'POST', this.pageindex,2).then(res => { diff --git a/lvdao-miniapp/pages/orderList/inventorydetails.vue b/lvdao-miniapp/pages/orderList/inventorydetails.vue index dfaaed3..b9a982e 100644 --- a/lvdao-miniapp/pages/orderList/inventorydetails.vue +++ b/lvdao-miniapp/pages/orderList/inventorydetails.vue @@ -127,7 +127,7 @@ onLoad(options) { this.imgurl = this.$img console.log(options) - this.$http.sendRequest('/order/getById', 'POST', { + this.$http.sendRequest('/product/getById', 'POST', { orderId: options.id }, 1).then(res => { this.dataList = res.data.data diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js index a5d215f..a210110 100644 --- a/lvdao-miniapp/utils/request.js +++ b/lvdao-miniapp/utils/request.js @@ -1,8 +1,8 @@ // let hostall = window.location.href; // let c1 = hostall.split('cdwlMall')[0]; -let c1 = 'https://jy.scjysm.asia:18086/' -// let c1 = 'https://zhgw-uat.028wlkj.com/' +// let c1 = 'https://jy.scjysm.asia:18086/' +let c1 = 'https://zhgw-uat.028wlkj.com/' //封装request请求 const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { //判断header提交数据类型 @@ -21,7 +21,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url; // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url; - // bases = 'http://128.10.249.22:9003'+ url; + // bases = 'http://128.10.249.46:9003'+ url; // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url; bases = c1 + 'cdwlMall/meserver/admin-server' + url; @@ -30,7 +30,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url; // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url; // bases = 'http://128.10.249.22:9003:9007' + url; - // bases = 'http://192.168.2.230:9007' + url; + // bases = 'http://128.10.249.46:9007' + url; bases = c1 + 'cdwlMall/meserver/api' + url; }else{ @@ -39,7 +39,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { // bases = 'http://172.16.61.123/cdwlMall/business-server' + url; // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url; // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url; - // bases = 'http://192.168.2.230:9004' + url; + // bases = 'http://128.10.249.46:9004' + url; // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url; bases = c1 + 'cdwlMall/business-server' + url; -- libgit2 0.21.4