Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

杨鑫
2 parents c72ce3d7 204490ca
Showing 9 changed files with 38 additions and 53 deletions
.DS_Store
wenjuan/.env.development
wenjuan/.env.production
wenjuan/package.json
wenjuan/src/main.js
wenjuan/src/utils/common.js
wenjuan/src/utils/request.js
wenjuan/src/views/investigation/index.vue
wenjuan/vue.config.js
@@ -3,10 +3,11 @@ ENV = &#39;development&#39;
 # base api
 VUE_APP_BASE_API = '/dev-api'
-
+VUE_APP_DOMAIN_PREFIX_1='http://192.168.2.162:9003'
+VUE_APP_DOMAIN_PREFIX_2='http://192.168.2.162:9007'
 # 开发环境
 # 演示环境
 # VUE_APP_DOMAIN_PREFIX = '/api'
 # VUE_APP_DOMAIN_PREFIX = 'http://8.130.38.56:8027/admin-web'
-VUE_APP_DOMAIN_PREFIX = 'http://8.130.38.56:8027/admin-server'
+#VUE_APP_DOMAIN_PREFIX = 'http://8.130.38.56:8027/admin-server'
 # VUE_APP_DOMAIN_PREFIX = 'http://47.101.222.106:8001'
@@ -10,3 +10,13 @@ VUE_APP_BASE_API = &#39;/prod-api&#39;
 # VUE_APP_DOMAIN_PREFIX = 'http://172.16.61.48/admin-server'
 # VUE_APP_DOMAIN_PREFIX = 'http://8.130.38.56:8027/admin-server'
 # VUE_APP_DOMAIN_PREFIX = 'http://8.130.38.56:8027/admin-web'
+
+#生产环境
+VUE_APP_Host='https://h5.028wlkj.com'
+VUE_APP_DOMAIN_PREFIX_1=VUE_APP_Host+'/cdwlMall/meserver/admin-server/'
+VUE_APP_DOMAIN_PREFIX_2=VUE_APP_Host+'/cdwlMall/meserver/api'
+
+
+#测试环境
+# VUE_APP_DOMAIN_PREFIX_1='https://jy.scjysm.asia:18086/meserver/admin-server'
+# VUE_APP_DOMAIN_PREFIX_2='https://jy.scjysm.asia:18086/cdwlMall/meserver/api'
 \ No newline at end of file
@@ -18,7 +18,7 @@
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^1.0.2",
     "axios": "0.18.1",
-    "core-js": "3.6.5",
+    "core-js": "^3.39.0",
     "echarts": "^4.9.0",
     "element-ui": "^2.15.6",
     "es6-promise": "^4.2.8",
@@ -48,7 +48,7 @@
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.4",
     "@vue/cli-plugin-eslint": "4.4.4",
-    "@vue/cli-plugin-unit-jest": "4.4.4",
+    "@vue/cli-plugin-unit-jest": "^5.0.8",
     "@vue/cli-service": "4.4.4",
     "@vue/test-utils": "1.0.0-beta.29",
     "autoprefixer": "9.5.1",
@@ -15,6 +15,7 @@ import router from &#39;./router&#39;
 import '@/icons' // icon
 import '@/permission' // permission control
+import { env } from 'echarts/lib/export'
 /**
  * If you don't want to use mock-server
@@ -25,7 +26,8 @@ import &#39;@/permission&#39; // permission control
  * please remove it before going online ! ! !
  */
 Vue.prototype.$echarts = echarts
-Vue.prototype.$API = 'http://192.168.2.133:9007'
+// Vue.prototype.$API = '/cdwlMall/meserver/api'
+Vue.prototype.$API = process.env.VUE_APP_DOMAIN_PREFIX_2;
 // Vue.prototype.$API = 'http://172.16.61.48/meserver/api'
 // Vue.prototype.$API = 'https://jy.scjysm.asia:18086/meserver/api'
 // Vue.prototype.$API = 'https://h5.028wlkj.com/cdwlMall/meserver/api'
@@ -11,25 +11,27 @@ import {
 } from '@/utils/auth'
 const host = window.location.host;
 let PREFIX;
-if (host == '172.16.61.48' || host == '172.16.61.49 :5173' || host =='172.16.61.123:9003') {
-   // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server';
-   PREFIX = 'https://jy.scjysm.asia:18086/meserver/admin-server';
-   // PREFIX = 'http://172.16.61.126:8080/meserver/admin-server';
-   // PREFIX = 'http://172.16.61.48/meserver/admin-server';
-}else if( host == 'localhost:9528' || host == '8.130.38.56:8027' || host == 'localhost:9529'){
+if (host == '172.16.61.48' || host == '172.16.61.49 :5173' || host == '172.16.61.123:9003') {
+  // PREFIX = 'https://wjdc.scjysm.asia:1443/meserver/admin-server';
+  PREFIX = 'https://jy.scjysm.asia:18086/meserver/admin-server';
+
+  // PREFIX = 'http://172.16.61.126:8080/meserver/admin-server';
+  // PREFIX = 'http://172.16.61.48/meserver/admin-server';
+} else if (host == 'localhost:9528' || host == '8.130.38.56:8027' || host == 'localhost:9529') {
   // 其他情况的默认值
- PREFIX = 'http://192.168.2.133:9003';
- // PREFIX = 'https://h5.028wlkj.com/cdwlMall/meserver/admin-server/';
- // PREFIX = 'https://jy.scjysm.asia:18086/meserver/admin-server';
-   // PREFIX = 'https://zhld.028wlkj.com:1443/meserver/admin-server';
-   // PREFIX = 'http://172.16.61.126:8080/meserver/admin-server';
+  PREFIX = process.env.VUE_APP_DOMAIN_PREFIX_1;
+
+  // PREFIX = 'https://h5.028wlkj.com/cdwlMall/meserver/admin-server/';
+  // PREFIX = 'https://jy.scjysm.asia:18086/meserver/admin-server';
+  // PREFIX = 'https://zhld.028wlkj.com:1443/meserver/admin-server';
+  // PREFIX = 'http://172.16.61.126:8080/meserver/admin-server';
-}else{
+} else {
   PREFIX = '/cdwlMall/meserver/admin-server';
 }
- const baseURL = PREFIX
+const baseURL = PREFIX
 // const baseURL = process.env.VUE_APP_DOMAIN_PREFIX
 // create an axios instance
 Vue.prototype.axios = axios
@@ -2413,10 +2413,7 @@ this.xiangTabs = &#39;first&#39;
         if (typeof this.secondData.question != 'object') {
           this.secondData.question = JSON.parse(this.secondData.question)
         }
-
         const host = `${window.location.protocol}//${window.location.host}`
-
-
           this.wenjuanUrl = `${host}/cdwlMall/meh5/pages_category_page1/question/question?ids=${item.id}`
@@ -41,45 +41,18 @@ module.exports = {
     },
     // before: require('./mock/mock-server.js'),
     proxy: {
-      // '/api': {
-      //   target: 'http://8.130.38.56:8027/admin-web', // 测试
-      //   // target: 'http://localhost:9003/', // 平台端
-      //   // target: 'https://bizapi.zkthink.com', // 商家端
-      //   changeOrigin: true,
-      //   pathRewrite: {
-      //     '^/api': ''
-      //   }
-      // },
-      // '/adminapi': {
-      //   target: 'http://8.130.38.56:8027/admin-web', // 测试
-      //   // target: 'http://localhost:9003/', // 平台端
-      //   // target: 'https://bizapi.zkthink.com', // 商家端
-      //   changeOrigin: true,
-      //   pathRewrite: {
-      //     '^/adminapi': ''
-      //   }
-      // },
-      // '/': {
-      //   target: 'http://8.130.38.56:8027/admin-web', // 测试
-      //   // target: 'http://localhost:9003/', // 平台端
-      //   // target: 'https://bizapi.zkthink.com', // 商家端
-      //   changeOrigin: true,
-      // },
+      '/cdwlMall/meserver/api': {
+        target:process.env.VUE_APP_DOMAIN_PREFIX_2,
+        changeOrigin: true,
+      },
       '/cdwlMall/meserver/admin-server/':{
-        // target: 'https://wjdc.scjysm.asia:1443/meserver/admin-server/', // 测试
-        target: 'https://h5.028wlkj.com/cdwlMall/meserver/admin-server/', // 测试
-        // target: 'http://172.16.61.123:8080/meserver/admin-server/', // 测试
-        // https://jy.scjysm.asia:18086/admin-server  http://172.16.61.123:8080/meserver/admin-server/    https://wjdc.scjysm.asia1443/cdwlMall/admin-server
-        // target: 'http://localhost:9003/', // 平台端
-        // target: 'https://bizapi.zkthink.com', // 商家端
+        target:process.env.VUE_APP_DOMAIN_PREFIX_1,
         changeOrigin: true,
         pathRewrite: {
         					// pathRewrite 方法重写 url
         					'^/meserver': '/',
         				},
       },
-
-
     }
   },
   configureWebpack: {