webapp / GreenwayWeb

Commit 86d40468e01ed9c39e28c13557485ae0121420d5

Authored by wesley88
1 parent c7069386

1

Inline Side-by-side
Showing 6 changed files with 32 additions and 32 deletions
admin-web-master/src/layout/index.vue
  View file @86d4046
... ... @@ -197,17 +197,17 @@
197 197 }
198 198 }
199 199 return {
200   - msg: [],
201   - list: [],
  200 + // msg: [],
  201 + // list: [],
202 202 // msg: ['招商服务系统'],
203   - // msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'],
204   - // list: [
205   - // ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'],
206   - // ['品牌策划', '活动策划', '氛围策划', '媒体推广'],
207   - // ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'],
208   - // ['联机交易', '对账处理', '日志管理', '商户服务'],
209   - // ['渠道售票统计分析', '销售额统计分析'],
210   - // ],
  203 + msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'],
  204 + list: [
  205 + ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'],
  206 + ['品牌策划', '活动策划', '氛围策划', '媒体推广'],
  207 + ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'],
  208 + ['联机交易', '对账处理', '日志管理', '商户服务'],
  209 + ['渠道售票统计分析', '销售额统计分析'],
  210 + ],
211 211 listMune: [],
212 212 mumeList: [],
213 213 mumeChildren1: [],
... ... @@ -296,10 +296,10 @@
296 296 this.userAvatar = getUserAvatar()
297 297 },
298 298 mounted() {
299   - this.getMemu()
300   - this.address()
301   - this.waibu()
302   - // this.neibu()
  299 + // this.getMemu()
  300 + // this.address()
  301 + // this.waibu()
  302 + this.neibu()
303 303 },
304 304  
305 305 methods: {
... ... @@ -780,12 +780,12 @@
780 780 ['联机交易', '对账处理', '日志管理', '商户服务'],
781 781 ['渠道售票统计分析', '销售额统计分析'],
782 782 ]
783   - // this.neibu()
  783 + this.neibu()
784 784  
785 785  
786   - this.getMemu()
787   - this.waibu()
788   - this.list = this.mumeList
  786 + // this.getMemu()
  787 + // this.waibu()
  788 + // this.list = this.mumeList
789 789  
790 790  
791 791 },
... ...
lvdao-miniapp/main.js
  View file @86d4046
... ... @@ -8,13 +8,13 @@ import uView from "uview-ui";
8 8 import DialogBox from './components/DialogBox/DialogBox';
9 9 // let hostall = window.location.href;
10 10 // let c1 = hostall.split('cdwlMall')[0];
11   -let c1 = 'https://jy.scjysm.asia:18086/'
12   -// let c1 = 'https://zhgw-uat.028wlkj.com/'
  11 +// let c1 = 'https://jy.scjysm.asia:18086/'
  12 +let c1 = 'https://zhgw-uat.028wlkj.com/'
13 13 Vue.config.productionTip = false
14 14 Vue.prototype.$http = http
15 15 Vue.prototype.$imgUrl = (url) => {
16   - return (c1 + "cdwlMall/questionnaire/file/static" + url);
17   - // return (c1 + "cdwlMall/zsfwzxt/test/file/static" + url);
  16 + // return (c1 + "cdwlMall/questionnaire/file/static" + url);
  17 + return (c1 + "cdwlMall/zsfwzxt/test/file/static" + url);
18 18 }
19 19 Vue.prototype.$img = c1+ 'cdwlMall'
20 20 // Vue.prototype.$upload = "https://zhld.028wlkj.com:49008/cdwlMall/admin-server/miniio/upload"
... ...
lvdao-miniapp/manifest.json
  View file @86d4046
1 1 {
2 2 "name" : "绿道",
3   - "appid" : "__UNI__F034047",
  3 + "appid" : "__UNI__189D96A",
4 4 "description" : "",
5 5 "versionName" : "1.0.2",
6 6 "versionCode" : "100",
... ...
lvdao-miniapp/pages/orderList/inventory.vue
  View file @86d4046
... ... @@ -89,9 +89,9 @@
89 89 },
90 90 methods: {
91 91 gopath(url,id){
92   - uni.navigateTo({
93   - url:url+'?id='+id
94   - })
  92 + // uni.navigateTo({
  93 + // url:url+'?id='+id
  94 + // })
95 95 },
96 96 getALL() {
97 97 this.$http.sendRequest('/product/getAll', 'POST', this.pageindex,2).then(res => {
... ...
lvdao-miniapp/pages/orderList/inventorydetails.vue
  View file @86d4046
... ... @@ -127,7 +127,7 @@
127 127 onLoad(options) {
128 128 this.imgurl = this.$img
129 129 console.log(options)
130   - this.$http.sendRequest('/order/getById', 'POST', {
  130 + this.$http.sendRequest('/product/getById', 'POST', {
131 131 orderId: options.id
132 132 }, 1).then(res => {
133 133 this.dataList = res.data.data
... ...
lvdao-miniapp/utils/request.js
  View file @86d4046
1 1  
2 2 // let hostall = window.location.href;
3 3 // let c1 = hostall.split('cdwlMall')[0];
4   -let c1 = 'https://jy.scjysm.asia:18086/'
5   -// let c1 = 'https://zhgw-uat.028wlkj.com/'
  4 +// let c1 = 'https://jy.scjysm.asia:18086/'
  5 +let c1 = 'https://zhgw-uat.028wlkj.com/'
6 6 //封装request请求
7 7 const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
8 8 //判断header提交数据类型
... ... @@ -21,7 +21,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
21 21 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
22 22 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
23 23  
24   - // bases = 'http://128.10.249.22:9003'+ url;
  24 + // bases = 'http://128.10.249.46:9003'+ url;
25 25 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
26 26  
27 27 bases = c1 + 'cdwlMall/meserver/admin-server' + url;
... ... @@ -30,7 +30,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
30 30 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
31 31 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url;
32 32 // bases = 'http://128.10.249.22:9003:9007' + url;
33   - // bases = 'http://192.168.2.230:9007' + url;
  33 + // bases = 'http://128.10.249.46:9007' + url;
34 34 bases = c1 + 'cdwlMall/meserver/api' + url;
35 35  
36 36 }else{
... ... @@ -39,7 +39,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
39 39 // bases = 'http://172.16.61.123/cdwlMall/business-server' + url;
40 40 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
41 41 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url;
42   - // bases = 'http://192.168.2.230:9004' + url;
  42 + // bases = 'http://128.10.249.46:9004' + url;
43 43 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
44 44 bases = c1 + 'cdwlMall/business-server' + url;
45 45  
... ...