From 204490cad6047527eb59cd9460b55702420a3023 Mon Sep 17 00:00:00 2001 From: “wangming” <“wangming@antissoft.com”> Date: Fri, 6 Dec 2024 15:57:13 +0800 Subject: [PATCH] 1 --- .DS_Store | Bin 0 -> 10244 bytes wenjuan/.env.development | 5 +++-- wenjuan/.env.production | 10 ++++++++++ wenjuan/package.json | 4 ++-- wenjuan/src/main.js | 4 +++- wenjuan/src/utils/common.js | 0 wenjuan/src/utils/request.js | 28 +++++++++++++++------------- wenjuan/src/views/investigation/index.vue | 3 --- wenjuan/vue.config.js | 37 +++++-------------------------------- 9 files changed, 38 insertions(+), 53 deletions(-) create mode 100644 .DS_Store create mode 100644 wenjuan/src/utils/common.js diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..d6a9587 Binary files /dev/null and b/.DS_Store differ diff --git a/wenjuan/.env.development b/wenjuan/.env.development index 913ea44..0201f3d 100644 --- a/wenjuan/.env.development +++ b/wenjuan/.env.development @@ -3,10 +3,11 @@ ENV = 'development' # 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' diff --git a/wenjuan/.env.production b/wenjuan/.env.production index 86a8937..59dc11d 100644 --- a/wenjuan/.env.production +++ b/wenjuan/.env.production @@ -10,3 +10,13 @@ VUE_APP_BASE_API = '/prod-api' # 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 diff --git a/wenjuan/package.json b/wenjuan/package.json index 4f6aba6..17ed50d 100644 --- a/wenjuan/package.json +++ b/wenjuan/package.json @@ -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", diff --git a/wenjuan/src/main.js b/wenjuan/src/main.js index 05c301f..28842de 100644 --- a/wenjuan/src/main.js +++ b/wenjuan/src/main.js @@ -15,6 +15,7 @@ import router from './router' 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 '@/permission' // 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' diff --git a/wenjuan/src/utils/common.js b/wenjuan/src/utils/common.js new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/wenjuan/src/utils/common.js diff --git a/wenjuan/src/utils/request.js b/wenjuan/src/utils/request.js index 1123f7a..99fd4d9 100644 --- a/wenjuan/src/utils/request.js +++ b/wenjuan/src/utils/request.js @@ -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 diff --git a/wenjuan/src/views/investigation/index.vue b/wenjuan/src/views/investigation/index.vue index e3660d2..f0e5cdf 100644 --- a/wenjuan/src/views/investigation/index.vue +++ b/wenjuan/src/views/investigation/index.vue @@ -2413,10 +2413,7 @@ this.xiangTabs = 'first' 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}` diff --git a/wenjuan/vue.config.js b/wenjuan/vue.config.js index 0f52a75..25dde0e 100644 --- a/wenjuan/vue.config.js +++ b/wenjuan/vue.config.js @@ -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: { -- libgit2 0.21.4