diff --git a/.env.development b/.env.development index dfe40e96d..1e6ede547 100644 --- a/.env.development +++ b/.env.development @@ -3,7 +3,7 @@ NODE_ENV=development # VUE_APP_API_SERVER = http://192.168.1.60:8080/api # # VUE_APP_API_SERVER = http://192.168.1.140/api # VUE_APP_API_SERVER = http://219.146.91.110:30801/api -VUE_APP_API_SERVER = http://192.168.1.140/api +VUE_APP_API_SERVER = http://119.167.67.163:10081/api VUE_APP_API_LIVE = http://192.168.1.140/live/ # VUE_APP_API_SERVER = http://219.146.91.110:30801/api219.146.91.110:30801 # VUE_APP_API_SERVER = https://epmet-yantai.elinkservice.cn/api diff --git a/src/js/dai/request.js b/src/js/dai/request.js index 455a6fae4..ef0d958e1 100644 --- a/src/js/dai/request.js +++ b/src/js/dai/request.js @@ -55,8 +55,13 @@ const request = curry( }) // Message.error(res.data.msg); clearLoginInfo(); + if(localStorage.getItem('ticket')){ + localStorage.removeItem('ticket') + location.href = 'http://119.167.67.163:18182' + } + return next({ - name: "login", + name: "login", }); } diff --git a/src/js/dai/request2.js b/src/js/dai/request2.js index 8ea616692..f67d79a76 100644 --- a/src/js/dai/request2.js +++ b/src/js/dai/request2.js @@ -55,6 +55,10 @@ const request = curry( type: 'error', duration: 2 * 1000 }) + if(localStorage.getItem('ticket')){ + localStorage.removeItem('ticket') + location.href = 'http://119.167.67.163:18182' + } clearLoginInfo(); return next({ name: "login", diff --git a/src/router/index.js b/src/router/index.js index 44561983b..e8ed22f28 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -998,6 +998,7 @@ router.beforeEach((to, from, next) => { return null; } const match = location.href.match(/[?&]ticket=([^&#]+)/); + localStorage.setItem('ticket',match[1]) if (match && to.name =='login') { http.get(`/auth/xiaZhuangLogin/dealUserInfo?ticket=${match[1]}`) .then(({data: res}) => { diff --git a/src/utils/request.js b/src/utils/request.js index 3696ebe00..9a08ab4ba 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -80,7 +80,12 @@ http.interceptors.response.use(response => { // }else { // router.replace({ name: 'login' }) // } - router.replace({ name: 'login' }) + if(localStorage.getItem('ticket')){ + localStorage.removeItem('ticket') + location.href = 'http://119.167.67.163:18182' + }else{ + router.replace({ name: 'login' }) + } return Promise.reject(response.data.msg) } diff --git a/src/views/main-navbar.vue b/src/views/main-navbar.vue index 1a95a9cd1..ed4768706 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -198,17 +198,20 @@ export default { this.$http .post('/auth/login/logout') .then(({ data: res }) => { - if (res.code !== 0) { + clearLoginInfo(); + if(localStorage.getItem('ticket')){ + localStorage.removeItem('ticket') + location.href = 'http://119.167.67.163:18182' + }else{ + if (res.code !== 0) { //别处登陆时 退出不提示 直接跳登陆页即可 if (res.code !== 10007) { this.$message.error(res.msg); } } - - clearLoginInfo(); - // this.$router.push({ name: 'login' }); console.log(`${location.origin}/epmet-work-pc/#/login`); location.href = `${location.origin}/epmet-work-pc/#/login` + } // if (localStorage.getItem('userType') === 'work') { // this.$router.push({ name: 'loginWork' }) // } else {