webapp / GreenwayWeb

Commit 70086a6e6fd0e17ed7b6a7b74182a7acc16200c6

Authored by 杨鑫
2 parents 77959fdb 99c20f13

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	admin-web-master/src/utils/request.js
Inline Side-by-side
Showing 4 changed files with 17 additions and 11 deletions
admin-web-master/dist (2).zip renamed to admin-web-master/dist.zip
View file @70086a6
No preview for this file type
admin-web-master/src/layout/index.vue
  View file @70086a6
... ... @@ -199,7 +199,8 @@
199 199 return {
200 200 // msg: [],
201 201 // list: [],
202   - msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'],
  202 + msg: ['招商服务系统'],
  203 + // msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'],
203 204 list: [
204 205 ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '客服服务管理', '系统设置'],
205 206 ['品牌策划', '活动策划', '氛围策划', '媒体推广'],
... ...
lvdao-miniapp/main.js
  View file @70086a6
... ... @@ -6,16 +6,18 @@ import uView from "uview-ui";
6 6  
7 7 // 弹出框
8 8 import DialogBox from './components/DialogBox/DialogBox';
9   -
  9 + let hostall = window.location.href;
  10 +let c1 = hostall.split('cdwlMall')[0];
  11 +//let c1 = 'https://jy.scjysm.asia:18086/'
10 12 Vue.config.productionTip = false
11 13 Vue.prototype.$http = http
12 14 Vue.prototype.$imgUrl = (url) => {
13   - return ("https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static" + url);
  15 + return (c1 + "cdwlMall/questionnaire/file/static" + url);
14 16 }
15   -Vue.prototype.$img = 'https://jy.scjysm.asia:18086/cdwlMall'
  17 +Vue.prototype.$img = c1+ 'cdwlMall'
16 18 // Vue.prototype.$upload = "https://zhld.028wlkj.com:49008/cdwlMall/admin-server/miniio/upload"
17 19 // Vue.prototype.$img = "https://zhld.028wlkj.com:49008/cdwlMall"
18   -Vue.prototype.$upload = 'https://jy.scjysm.asia:18086/cdwlMall/admin-server/miniio/upload'
  20 +Vue.prototype.$upload = c1+ 'cdwlMall/admin-server/miniio/upload'
19 21 // Vue.prototype.$upload = 'http://172.16.61.125:9003/miniio/uploadQuestion'
20 22 // Vue.prototype.$upload = 'http://192.168.2.225:9003/miniio/upload'
21 23  
... ...
lvdao-miniapp/utils/request.js
  View file @70086a6
1 1  
2   -
3   -
  2 + let hostall = window.location.href;
  3 +let c1 = hostall.split('cdwlMall')[0];
  4 +//let c1 = 'https://jy.scjysm.asia:18086/'
4 5 //封装request请求
5 6 const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
6 7 //判断header提交数据类型
... ... @@ -17,27 +18,29 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
17 18 // bases = 'http://172.16.61.125:9003/' + url;
18 19 // bases = 'http://172.16.61.123/cdwlMall/admin-server' + url;
19 20 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
20   - bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
  21 + // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
21 22  
22 23 // bases = 'http://192.168.2.230:9003' + url;
23 24 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
24 25  
25   -
  26 + bases = c1 + 'cdwlMall/meserver/admin-server' + url;
26 27  
27 28 }else if(baseUrl == 3){
28   - bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
  29 + // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
29 30 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url;
30 31 // bases = 'http://192.168.2.107:9007' + url;
31 32 // bases = 'http://192.168.2.230:9007' + url;
  33 + bases = c1 + 'cdwlMall/meserver/api' + url;
32 34  
33 35 }else{
34 36 // bases = 'http://172.16.61.125:9004/' + url;
35 37 // bases = 'http://172.16.61.48/business-server' + url;
36 38 // bases = 'http://172.16.61.123/cdwlMall/business-server' + url;
37   - bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
  39 + // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
38 40 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url;
39 41 // bases = 'http://192.168.2.230:9004' + url;
40 42 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
  43 + bases = c1 + 'cdwlMall/business-server' + url;
41 44  
42 45 }
43 46 var token = uni.getStorageSync('token') || '';
... ...