From 5297f086b6efeb8511da06a2cfab6db8ef8a499f Mon Sep 17 00:00:00 2001
From: xuechunyuan <17853500702@163.com>
Date: Wed, 24 May 2023 18:35:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=AE=9A=E5=90=91=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/page/login/index.vue | 12 ++++++------
 src/permission.js        |  4 +---
 src/router/page/index.js |  7 ++++++-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/page/login/index.vue b/src/page/login/index.vue
index 022d66b..62b1113 100644
--- a/src/page/login/index.vue
+++ b/src/page/login/index.vue
@@ -4,14 +4,14 @@
 </template>
 <script>
 import { mapGetters } from "vuex";
-import {getToken} from '@/util/auth'
+// import {getToken} from '@/util/auth'
 
 export default {
   name: "login",
   components: {},
   data() {
     return {
-      loading: false
+      loading: true
     };
   },
   watch: {
@@ -31,20 +31,20 @@ export default {
   methods: {
     handleLogin() {
       const ssotoken = this.$route.query.SSOToken;
-      const token = getToken();
+      const token = "";//getToken();
       console.log('ssotken',ssotoken, '=======')
       if (token) {
         this.$router.push({ path: this.tagWel.value });
       }else{
-        this.loading = true;
+        // this.loading = true;
         this.$store
           .dispatch("LoginBySso",  {SSOToken: ssotoken,grantType:'yawei',fallbackUrl: ssotoken ? '' : window.location.href})
           .then(() => {
-            this.loading = false;
+            // this.loading = false;
             console.log('=============登录成功')
             this.$router.replace({ path: this.tagWel.value });
           },err => {
-            this.loading = false;
+            // this.loading = false;
             console.log('err=======res',err)
             if(err.error == 'invalid_request') {
               // let url = err.error_description+'?SSOToken=' + encodeURIComponent(window.location);
diff --git a/src/permission.js b/src/permission.js
index ac783ce..2e01152 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -18,7 +18,7 @@ router.beforeEach((to, from, next) => {
     if (store.getters.isLock && to.path !== lockPage) { //如果系统激活锁屏，全部跳转到锁屏页
       next({path: lockPage})
     } else if (to.path === '/newlogin') { //如果登录成功访问登录页跳转到主页
-      next({path: '/'})
+      next({path: '/wel/index'})
     } else {
       //如果用户信息为空则获取用户信息，获取用户信息失败，跳转到登录页
       if (store.getters.token.length === 0) {
@@ -57,8 +57,6 @@ router.beforeEach((to, from, next) => {
     //判断是否需要认证，没有登录访问去登录页
     if (meta.isAuth === false) {
       next()
-    } else if(to.path == '/wel/index') {
-      next('/login')
     } else {
       next('/newlogin')
     }
diff --git a/src/router/page/index.js b/src/router/page/index.js
index c59cde3..a640936 100644
--- a/src/router/page/index.js
+++ b/src/router/page/index.js
@@ -69,8 +69,13 @@ export default [{
   {
     path: '/',
     name: '主页',
-    redirect: '/wel'
+    redirect: '/login'
   },
+  // {
+  //   path: '/',
+  //   name: '主页',
+  //   redirect: '/wel'
+  // },
   {
     path: '/myiframe',
     component: Layout,