From 7f7e010a048f2de8dcb6dd2e6e3e3da1ebfd4f43 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期三, 20 十二月 2023 16:58:46 +0800
Subject: [PATCH] 互联网

---
 src/permission.ts |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/permission.ts b/src/permission.ts
index d87f2a4..7a15bfa 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -8,24 +8,25 @@
 import useUserStore from '@/store/modules/user';
 import useSettingsStore from '@/store/modules/settings';
 import usePermissionStore from '@/store/modules/permission';
+import { ElMessage } from "element-plus";
 
 NProgress.configure({ showSpinner: false });
-const whiteList = ['/login', '/register', '/social-callback','/index'];
+const whiteList = ['/login', '/register', '/social-callback'];
 
 router.beforeEach(async (to, from, next) => {
   NProgress.start();
   if (getToken()) {
-    console.log('鏈塼oken',to.path);
+    console.log('鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁宸叉媺鍙栧畬user_info淇℃伅');
     to.meta.title && useSettingsStore().setTitle(to.meta.title as string);
     /* has token*/
     if (to.path === '/login') {
       next({ path: '/' });
       NProgress.done();
     } else {
-      console.log(useUserStore().roles);
       if (useUserStore().roles.length === 0) {
         isRelogin.show = true;
         // 鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁宸叉媺鍙栧畬user_info淇℃伅
+
         const [err] = await tos(useUserStore().getInfo());
         if (err) {
           await useUserStore().logout();
@@ -48,12 +49,12 @@
     }
   } else {
     // 娌℃湁token
+    console.log("娌℃湁token");
     if (whiteList.indexOf(to.path) !== -1) {
       // 鍦ㄥ厤鐧诲綍鐧藉悕鍗曪紝鐩存帴杩涘叆
       next();
     } else {
-      // next(`/login?redirect=${to.fullPath}`); // 鍚﹀垯鍏ㄩ儴閲嶅畾鍚戝埌鐧诲綍椤�
-      next(`/index`); // 鍚﹀垯鍏ㄩ儴閲嶅畾鍚戝埌鐧诲綍椤�
+      next(`/login?redirect=${to.fullPath}`); // 鍚﹀垯鍏ㄩ儴閲嶅畾鍚戝埌鐧诲綍椤�
       NProgress.done();
     }
   }

--
Gitblit v1.8.0