准备

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);

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);

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: "登录",
     },

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)
   }

src/views/main-navbar.vue

@@ -8,10 +8,10 @@
       <div class="aui-navbar__header">
         <h1 class="aui-navbar__brand" @click="$router.push({ name: 'home' })">
           <a class="aui-navbar__brand-lg" href="javascript:;">{{
-            $store.state.user.agencyName 
+            $store.state.user.agencyName
           }}</a>
           <a class="aui-navbar__brand-mini" href="javascript:;">{{
-            $store.state.user.agencyName .slice(0, 2)
+            $store.state.user.agencyName.slice(0, 2)
           }}</a>
         </h1>
       </div>
@@ -48,7 +48,7 @@
           </el-menu-item>
 
           <el-menu-item
-            v-show="menu.showFlag==1"
+            v-show="menu.showFlag == 1"
             v-for="(menu, idx) in $store.state.sidebarMenuList"
             :key="menu.id"
             :menu="menu"
@@ -228,12 +228,7 @@ export default {
               }
 
               clearLoginInfo();
-              // this.$router.push({ name: "login" });
-              // if (localStorage.getItem('userType') === 'work') {
-              //   this.$router.push({ name: 'loginWork' })
-              // } else {
-              //   this.$router.push({ name: 'login' })
-              // }
+              this.$router.push({ name: "login" });
             })
             .catch(() => {});
         })

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(() => {});
         })

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";
       }