From 00ac8250f1da65d24283e9c790385f75fc550e8e Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 18 Oct 2022 17:22:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=86=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/dai/request.js | 6 ++-- src/js/dai/request2.js | 6 ++-- src/router/index.js | 8 +++--- src/utils/request.js | 9 +----- src/views/main-navbar.vue | 13 +++------ src/views/main-shuju/main-navbar.vue | 2 +- src/views/pages/yantai-login-transit.vue | 35 ++++++++++++++++++++---- 7 files changed, 45 insertions(+), 34 deletions(-) diff --git a/src/js/dai/request.js b/src/js/dai/request.js index 0c30fbde3..709895d60 100644 --- a/src/js/dai/request.js +++ b/src/js/dai/request.js @@ -44,9 +44,9 @@ const request = curry( console.log("登录失效"); Message.error(res.data.msg); clearLoginInfo(); - // return next({ - // name: "login", - // }); + return next({ + name: "login", + }); } reslove(retData); diff --git a/src/js/dai/request2.js b/src/js/dai/request2.js index 0c30fbde3..709895d60 100644 --- a/src/js/dai/request2.js +++ b/src/js/dai/request2.js @@ -44,9 +44,9 @@ const request = curry( console.log("登录失效"); Message.error(res.data.msg); clearLoginInfo(); - // return next({ - // name: "login", - // }); + return next({ + name: "login", + }); } reslove(retData); diff --git a/src/router/index.js b/src/router/index.js index 36180a6d1..d047bac98 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -26,23 +26,23 @@ export const pageRoutes = [ }, }, { - path: "/login", + path: "/login-local", component: () => { return CUSTOMER == "yantai" ? import("@/views/pages/yantai-login") : import("@/views/pages/login"); }, - name: "login", + name: "login-local", meta: { title: "登录", }, }, { - path: "/login-transit", + path: "/login", component: () => { return import("@/views/pages/yantai-login-transit"); }, - name: "login-transit", + name: "login", meta: { title: "登录", }, diff --git a/src/utils/request.js b/src/utils/request.js index 33e675326..8411fb0bc 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -54,14 +54,7 @@ http.interceptors.response.use(response => { const code = [10007, 401, 10001, 10005] if (code.includes(response.data.code)) { clearLoginInfo() - // localStorage.setItem('userType', 'work') - // let userType = localStorage.getItem("userType"); - // if (userType === 'work'){ - // router.replace({ name: 'loginWork' }) - // }else { - // router.replace({ name: 'login' }) - // } - // router.replace({ name: 'login' }) + 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 3154b5f74..a870a077e 100644 --- a/src/views/main-navbar.vue +++ b/src/views/main-navbar.vue @@ -8,10 +8,10 @@

{{ - $store.state.user.agencyName + $store.state.user.agencyName }} {{ - $store.state.user.agencyName .slice(0, 2) + $store.state.user.agencyName.slice(0, 2) }}

@@ -48,7 +48,7 @@ {}); }) diff --git a/src/views/main-shuju/main-navbar.vue b/src/views/main-shuju/main-navbar.vue index 1603758b4..94e303e02 100644 --- a/src/views/main-shuju/main-navbar.vue +++ b/src/views/main-shuju/main-navbar.vue @@ -244,7 +244,7 @@ export default { clearLoginInfo(); - // this.$router.push({ name: "login" }); + this.$router.push({ name: "login" }); }) .catch(() => {}); }) diff --git a/src/views/pages/yantai-login-transit.vue b/src/views/pages/yantai-login-transit.vue index 9e55f4b32..7b37d0b0c 100644 --- a/src/views/pages/yantai-login-transit.vue +++ b/src/views/pages/yantai-login-transit.vue @@ -17,10 +17,12 @@ export default { status: "ing", }; }, + components: {}, computed: {}, + async mounted() { - let ticket = getQueryPara("ticket"); + let code = getQueryPara("code"); const loading = this.$loading({ lock: true, text: "登录中……", @@ -28,24 +30,45 @@ export default { customClass: "u-loading-yantai-login-transit", background: "rgba(255, 255, 255, 0.7)", }); - await this.login(ticket); - loading.close(); + if (code) { + await this.login(code); + loading.close(); + } else { + await this.skip(code); + } }, methods: { //根据社区id获取小区列表 - async login(ticket) { + async skip() { + const url = "/gov222"; + + let params = {}; + + const { data, code, msg } = await requestPost(url, params); + + if (code === 0) { + location.href = data.url; + } else { + console.log("获取跳转页面失败", msg); + } + }, + + //根据社区id获取小区列表 + async login(client_code) { const url = "/gov222"; let params = { - ticket, + client_code, }; const { data, code, msg } = await requestPost(url, params); if (code === 0) { this.status = "success"; - this.$router.replace("/"); + + localStorage.setItem("token", data.token); + this.$router.replace({ name: "index" }); } else { this.status = "failed"; }