webapp / GreenwayWeb

Commit 204490cad6047527eb59cd9460b55702420a3023

Authored by “wangming”
1 parent 79e422cd

1

Inline Side-by-side
Showing 9 changed files with 38 additions and 53 deletions
.DS_Store 0 → 100644
View file @204490c
No preview for this file type
wenjuan/.env.development
  View file @204490c
... ... @@ -3,10 +3,11 @@ ENV = 'development'
3 3  
4 4 # base api
5 5 VUE_APP_BASE_API = '/dev-api'
6   -
  6 +VUE_APP_DOMAIN_PREFIX_1='http://192.168.2.162:9003'
  7 +VUE_APP_DOMAIN_PREFIX_2='http://192.168.2.162:9007'
7 8 # 开发环境
8 9 # 演示环境
9 10 # VUE_APP_DOMAIN_PREFIX = '/api'
10 11 # VUE_APP_DOMAIN_PREFIX = 'http://8.130.38.56:8027/admin-web'
11   -VUE_APP_DOMAIN_PREFIX = 'http://8.130.38.56:8027/admin-server'
  12 +#VUE_APP_DOMAIN_PREFIX = 'http://8.130.38.56:8027/admin-server'
12 13 # VUE_APP_DOMAIN_PREFIX = 'http://47.101.222.106:8001'
... ...
wenjuan/.env.production
  View file @204490c
... ... @@ -10,3 +10,13 @@ VUE_APP_BASE_API = '/prod-api'
10 10 # VUE_APP_DOMAIN_PREFIX = 'http://172.16.61.48/admin-server'
11 11 # VUE_APP_DOMAIN_PREFIX = 'http://8.130.38.56:8027/admin-server'
12 12 # VUE_APP_DOMAIN_PREFIX = 'http://8.130.38.56:8027/admin-web'
  13 +
  14 +#生产环境
  15 +VUE_APP_Host='https://h5.028wlkj.com'
  16 +VUE_APP_DOMAIN_PREFIX_1=VUE_APP_Host+'/cdwlMall/meserver/admin-server/'
  17 +VUE_APP_DOMAIN_PREFIX_2=VUE_APP_Host+'/cdwlMall/meserver/api'
  18 +
  19 +
  20 +#测试环境
  21 +# VUE_APP_DOMAIN_PREFIX_1='https://jy.scjysm.asia:18086/meserver/admin-server'
  22 +# VUE_APP_DOMAIN_PREFIX_2='https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
13 23 \ No newline at end of file
... ...
wenjuan/package.json
  View file @204490c
... ... @@ -18,7 +18,7 @@
18 18 "@wangeditor/editor": "^5.1.23",
19 19 "@wangeditor/editor-for-vue": "^1.0.2",
20 20 "axios": "0.18.1",
21   - "core-js": "3.6.5",
  21 + "core-js": "^3.39.0",
22 22 "echarts": "^4.9.0",
23 23 "element-ui": "^2.15.6",
24 24 "es6-promise": "^4.2.8",
... ... @@ -48,7 +48,7 @@
48 48 "devDependencies": {
49 49 "@vue/cli-plugin-babel": "4.4.4",
50 50 "@vue/cli-plugin-eslint": "4.4.4",
51   - "@vue/cli-plugin-unit-jest": "4.4.4",
  51 + "@vue/cli-plugin-unit-jest": "^5.0.8",
52 52 "@vue/cli-service": "4.4.4",
53 53 "@vue/test-utils": "1.0.0-beta.29",
54 54 "autoprefixer": "9.5.1",
... ...
wenjuan/src/main.js
  View file @204490c
... ... @@ -15,6 +15,7 @@ import router from './router'
15 15  
16 16 import '@/icons' // icon
17 17 import '@/permission' // permission control
  18 +import { env } from 'echarts/lib/export'
18 19  
19 20 /**
20 21 * If you don't want to use mock-server
... ... @@ -25,7 +26,8 @@ import '@/permission' // permission control
25 26 * please remove it before going online ! ! !
26 27 */
27 28 Vue.prototype.$echarts = echarts
28   -Vue.prototype.$API = 'http://192.168.2.133:9007'
  29 +// Vue.prototype.$API = '/cdwlMall/meserver/api'
  30 +Vue.prototype.$API = process.env.VUE_APP_DOMAIN_PREFIX_2;
29 31 // Vue.prototype.$API = 'http://172.16.61.48/meserver/api'
30 32 // Vue.prototype.$API = 'https://jy.scjysm.asia:18086/meserver/api'
31 33 // Vue.prototype.$API = 'https://h5.028wlkj.com/cdwlMall/meserver/api'
... ...
wenjuan/src/utils/common.js 0 → 100644
  View file @204490c
wenjuan/src/utils/request.js
  View file @204490c
... ... @@ -11,25 +11,27 @@ import {
11 11 } from '@/utils/auth'
12 12 const host = window.location.host;
13 13 let PREFIX;
14   -if (host == '172.16.61.48' || host == '172.16.61.49 :5173' || host =='172.16.61.123:9003') {
15   - // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server';
16   - PREFIX = 'https://jy.scjysm.asia:18086/meserver/admin-server';
17   - // PREFIX = 'http://172.16.61.126:8080/meserver/admin-server';
18   - // PREFIX = 'http://172.16.61.48/meserver/admin-server';
19   -}else if( host == 'localhost:9528' || host == '8.130.38.56:8027' || host == 'localhost:9529'){
  14 +if (host == '172.16.61.48' || host == '172.16.61.49 :5173' || host == '172.16.61.123:9003') {
  15 + // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server';
  16 + PREFIX = 'https://jy.scjysm.asia:18086/meserver/admin-server';
  17 +
  18 + // PREFIX = 'http://172.16.61.126:8080/meserver/admin-server';
  19 + // PREFIX = 'http://172.16.61.48/meserver/admin-server';
  20 +} else if (host == 'localhost:9528' || host == '8.130.38.56:8027' || host == 'localhost:9529') {
20 21 // 其他情况的默认值
21   - PREFIX = 'http://192.168.2.133:9003';
22   - // PREFIX = 'https://h5.028wlkj.com/cdwlMall/meserver/admin-server/';
23   - // PREFIX = 'https://jy.scjysm.asia:18086/meserver/admin-server';
24   - // PREFIX = 'https://zhld.028wlkj.com:1443/meserver/admin-server';
25   - // PREFIX = 'http://172.16.61.126:8080/meserver/admin-server';
  22 + PREFIX = process.env.VUE_APP_DOMAIN_PREFIX_1;
  23 +
  24 + // PREFIX = 'https://h5.028wlkj.com/cdwlMall/meserver/admin-server/';
  25 + // PREFIX = 'https://jy.scjysm.asia:18086/meserver/admin-server';
  26 + // PREFIX = 'https://zhld.028wlkj.com:1443/meserver/admin-server';
  27 + // PREFIX = 'http://172.16.61.126:8080/meserver/admin-server';
26 28  
27   -}else{
  29 +} else {
28 30 PREFIX = '/cdwlMall/meserver/admin-server';
29 31 }
30 32  
31 33  
32   - const baseURL = PREFIX
  34 +const baseURL = PREFIX
33 35 // const baseURL = process.env.VUE_APP_DOMAIN_PREFIX
34 36 // create an axios instance
35 37 Vue.prototype.axios = axios
... ...
wenjuan/src/views/investigation/index.vue
  View file @204490c
... ... @@ -2413,10 +2413,7 @@ this.xiangTabs = 'first'
2413 2413 if (typeof this.secondData.question != 'object') {
2414 2414 this.secondData.question = JSON.parse(this.secondData.question)
2415 2415 }
2416   -
2417 2416 const host = `${window.location.protocol}//${window.location.host}`
2418   -
2419   -
2420 2417 this.wenjuanUrl = `${host}/cdwlMall/meh5/pages_category_page1/question/question?ids=${item.id}`
2421 2418  
2422 2419  
... ...
wenjuan/vue.config.js
  View file @204490c
... ... @@ -41,45 +41,18 @@ module.exports = {
41 41 },
42 42 // before: require('./mock/mock-server.js'),
43 43 proxy: {
44   - // '/api': {
45   - // target: 'http://8.130.38.56:8027/admin-web', // 测试
46   - // // target: 'http://localhost:9003/', // 平台端
47   - // // target: 'https://bizapi.zkthink.com', // 商家端
48   - // changeOrigin: true,
49   - // pathRewrite: {
50   - // '^/api': ''
51   - // }
52   - // },
53   - // '/adminapi': {
54   - // target: 'http://8.130.38.56:8027/admin-web', // 测试
55   - // // target: 'http://localhost:9003/', // 平台端
56   - // // target: 'https://bizapi.zkthink.com', // 商家端
57   - // changeOrigin: true,
58   - // pathRewrite: {
59   - // '^/adminapi': ''
60   - // }
61   - // },
62   - // '/': {
63   - // target: 'http://8.130.38.56:8027/admin-web', // 测试
64   - // // target: 'http://localhost:9003/', // 平台端
65   - // // target: 'https://bizapi.zkthink.com', // 商家端
66   - // changeOrigin: true,
67   - // },
  44 + '/cdwlMall/meserver/api': {
  45 + target:process.env.VUE_APP_DOMAIN_PREFIX_2,
  46 + changeOrigin: true,
  47 + },
68 48 '/cdwlMall/meserver/admin-server/':{
69   - // target: 'https://wjdc.scjysm.asia:1443/meserver/admin-server/', // 测试
70   - target: 'https://h5.028wlkj.com/cdwlMall/meserver/admin-server/', // 测试
71   - // target: 'http://172.16.61.123:8080/meserver/admin-server/', // 测试
72   - // https://jy.scjysm.asia:18086/admin-server http://172.16.61.123:8080/meserver/admin-server/ https://wjdc.scjysm.asia1443/cdwlMall/admin-server
73   - // target: 'http://localhost:9003/', // 平台端
74   - // target: 'https://bizapi.zkthink.com', // 商家端
  49 + target:process.env.VUE_APP_DOMAIN_PREFIX_1,
75 50 changeOrigin: true,
76 51 pathRewrite: {
77 52 // pathRewrite 方法重写 url
78 53 '^/meserver': '/',
79 54 },
80 55 },
81   -
82   -
83 56 }
84 57 },
85 58 configureWebpack: {
... ...