From 2f1e292961dc60011c1210a1cb18c91660021fd1 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Mon, 17 Oct 2022 17:44:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E8=A3=85=E7=99=BB=E5=BD=95?=
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                      | 10 +++
 src/utils/request.js                     |  2 +-
 src/views/main-navbar.vue                |  2 +-
 src/views/main-shuju/main-navbar.vue     |  2 +-
 src/views/pages/yantai-login-transit.vue | 83 ++++++++++++++++++++++++
 7 files changed, 102 insertions(+), 9 deletions(-)
 create mode 100644 src/views/pages/yantai-login-transit.vue

diff --git a/src/js/dai/request.js b/src/js/dai/request.js
index 709895d60..0c30fbde3 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 709895d60..0c30fbde3 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 9ba8abf56..36180a6d1 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -37,6 +37,16 @@ export const pageRoutes = [
       title: "登录",
     },
   },
+  {
+    path: "/login-transit",
+    component: () => {
+      return import("@/views/pages/yantai-login-transit");
+    },
+    name: "login-transit",
+    meta: {
+      title: "登录",
+    },
+  },
   {
     path: "/",
     name: "index",
diff --git a/src/utils/request.js b/src/utils/request.js
index 7de9ad4cb..33e675326 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -61,7 +61,7 @@ http.interceptors.response.use(response => {
     // }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 abcd89837..3154b5f74 100644
--- a/src/views/main-navbar.vue
+++ b/src/views/main-navbar.vue
@@ -228,7 +228,7 @@ export default {
               }
 
               clearLoginInfo();
-              this.$router.push({ name: "login" });
+              // this.$router.push({ name: "login" });
               // if (localStorage.getItem('userType') === 'work') {
               //   this.$router.push({ name: 'loginWork' })
               // } else {
diff --git a/src/views/main-shuju/main-navbar.vue b/src/views/main-shuju/main-navbar.vue
index 94e303e02..1603758b4 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
new file mode 100644
index 000000000..9e55f4b32
--- /dev/null
+++ b/src/views/pages/yantai-login-transit.vue
@@ -0,0 +1,83 @@
+<template>
+  <div class="g-app">
+    <div class="m-loading">
+      <p v-if="status == 'success'">登录成功</p>
+      <p v-else-if="status == 'failed'">登录失败</p>
+    </div>
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import getQueryPara from "dai-js/modules/getQueryPara";
+
+export default {
+  data() {
+    return {
+      status: "ing",
+    };
+  },
+  components: {},
+  computed: {},
+  async mounted() {
+    let ticket = getQueryPara("ticket");
+    const loading = this.$loading({
+      lock: true,
+      text: "登录中……",
+      spinner: "el-icon-loading",
+      customClass: "u-loading-yantai-login-transit",
+      background: "rgba(255, 255, 255, 0.7)",
+    });
+    await this.login(ticket);
+    loading.close();
+  },
+
+  methods: {
+    //根据社区id获取小区列表
+    async login(ticket) {
+      const url = "/gov222";
+
+      let params = {
+        ticket,
+      };
+
+      const { data, code, msg } = await requestPost(url, params);
+
+      if (code === 0) {
+        this.status = "success";
+        this.$router.replace("/");
+      } else {
+        this.status = "failed";
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.m-loading {
+  text-align: center;
+  margin-top: 10vh;
+  line-height: 100px;
+  font-size: 50px;
+  color: rgb(62, 142, 247);
+}
+</style>
+
+<style lang="scss">
+.u-loading-yantai-login-transit {
+  margin-top: -140px;
+  //   transform: translateY(-100px);
+  .el-loading-spinner {
+    .el-loading-text,
+    .el-icon-loading {
+      line-height: 60px;
+      font-size: 30px;
+      color: rgb(62, 142, 247);
+    }
+    .el-icon-loading {
+      font-size: 40px;
+    }
+  }
+}
+</style>