From c33a119c89c56f82871a230d543a60aa458a6753 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Tue, 18 Jun 2024 18:36:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E9=9E=8D=E9=92=A2?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/login_v2.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/home/login_v2.vue b/src/views/home/login_v2.vue index d62f7fe8..959a8d74 100644 --- a/src/views/home/login_v2.vue +++ b/src/views/home/login_v2.vue @@ -1178,7 +1178,7 @@ export default { if (!arr2.length) { if (this.loginType == 1) { // this.$router.push("/projectIndex"); - if (!this.$store.state.userInfo.personMail) { + if (!this.$store.state.userInfo.personMail && this.company == 'agjt') { this.checkInfoComplete(); } this.$router.push("/workSpace"); @@ -1196,7 +1196,7 @@ export default { ) { if (this.loginType == 1) { // this.$router.push("/projectIndex"); - if (!this.$store.state.userInfo.personMail) { + if (!this.$store.state.userInfo.personMail && this.company == 'agjt') { this.checkInfoComplete(); } this.$router.push("/workSpace"); From 5fa165ddac4f33911658933a24c5aabf7ad04e2a Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Tue, 18 Jun 2024 20:17:08 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=B8=AD=E7=A7=91=E4=BD=B3=E6=88=90?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index f12c1aad..9bbceeb7 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -178,7 +178,7 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 // 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/' // 百色三标段项目 + // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址 // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址 @@ -187,6 +187,7 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用) // axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址 + axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址 } else if (process.env.NODE_ENV == "debug") { axios.defaults.baseURL = "https://www.ceshi.com"; } else if (process.env.NODE_ENV == "production") {