From a1df60612cb6fb8d2ee6ff6b91dbba986351b7cc Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Mon, 4 Dec 2023 17:18:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/config.js | 2 +- src/assets/js/http.js | 4 ++-- src/store/index.js | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/public/js/config.js b/public/js/config.js index 802d4761..0a958e0f 100644 --- a/public/js/config.js +++ b/public/js/config.js @@ -20,7 +20,7 @@ var COMPANY = '' //通用 // COMPANY = 'shjg'//上海优益（上海建工） // COMPANY = 'syhy'//沈阳和盈 // COMPANY = 'jxwjj'//嘉兴王江泾公用码头项目 -// COMPANY = 'gxbs'//广西百色 +COMPANY = 'gxbs'//广西百色 var PROJECT = { local_test: 'common', // 普通版 diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 84ebd825..ead82d76 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -82,8 +82,8 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上 // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江 // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） - axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 - // axios.defaults.baseURL ='http://192.168.34.221:30012/' //郭圣雄本地 + // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 + axios.defaults.baseURL ='http://192.168.34.221:30012/' //郭圣雄本地 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 // axios.defaults.baseURL ='http://101.43.164.214:11111/' //广西百色项目 diff --git a/src/store/index.js b/src/store/index.js index e4230109..1201a67d 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -48,15 +48,15 @@ export default new Vuex.Store({ // FILEURL:'http://192.168.34.221:30001/image/',//郭圣雄 // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试 // FILEURL:'http://10.0.1.43:6023/image/',//测试 - // BASEURL: baseUrl - // ? baseUrl - // : window.location.protocol + "//" + window.location.host + "/", //正式环境 - // UPLOADURL: - // window.location.protocol + - // "//" + - // window.location.host + - // "/upload/image", //正式环境 - // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 + BASEURL: baseUrl + ? baseUrl + : window.location.protocol + "//" + window.location.host + "/", //正式环境 + UPLOADURL: + window.location.protocol + + "//" + + window.location.host + + "/upload/image", //正式环境 + FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 //--------------------------------------------------------------------------------------------- // BASEURL: baseUrl // ? baseUrl @@ -104,8 +104,8 @@ export default new Vuex.Store({ // FILEURL: 'http://118.121.198.147:23232/image/',//四川成润（正式） // UPLOADURL: 'http://121.196.214.246/api/upload/image',//金林湾 // FILEURL: 'http://121.196.214.246/api/image/',//金林湾 - UPLOADURL: 'http://192.168.34.221:28888/upload/image',//郭圣雄本地 - FILEURL: 'http://192.168.34.221:28888/image/',//郭圣雄本地 + // UPLOADURL: 'http://192.168.34.221:28888/upload/image',//郭圣雄本地 + // FILEURL: 'http://192.168.34.221:28888/image/',//郭圣雄本地 // UPLOADURL: 'http://101.43.164.214:45011/upload/image',//上海优益 // FILEURL: 'http://101.43.164.214:45011/image/',//上海优益