修改路由守卫

src/layout/user-layout.vue

@@ -45,11 +45,11 @@
         </div>
         </div>
 
 
         <div class="right-menu flex-align-center">
         <div class="right-menu flex-align-center">
-          <router-link v-if="userStore.id" to="/console/overview" class="console" style="font-size: 18px;">控制台
+          <router-link v-if="userStore.token" to="/console/overview" class="console" style="font-size: 18px;">控制台
           </router-link>
           </router-link>
 
 
-          <el-dropdown v-if="userStore.id" @command="handleCommand" class="">
-            <div v-if="userStore.id" class="avatar-wrapper flex-align-center">
+          <el-dropdown v-if="userStore.token" @command="handleCommand" class="">
+            <div v-if="userStore.token" class="avatar-wrapper flex-align-center">
               <img :src="userStore.avatar" class="user-avatar"/>
               <img :src="userStore.avatar" class="user-avatar"/>
               <div class="user-name">{{ userStore.name }}</div>
               <div class="user-name">{{ userStore.name }}</div>
             </div>
             </div>

src/permission.js

@@ -3,13 +3,9 @@ import { ElMessage } from 'element-plus'
 import NProgress from 'nprogress'
 import NProgress from 'nprogress'
 import 'nprogress/nprogress.css'
 import 'nprogress/nprogress.css'
 import { getToken } from '@/utils/auth'
 import { getToken } from '@/utils/auth'
-import { isHttp } from '@/utils/validate'
-import { isRelogin } from '@/utils/request'
-import useUserStore from '@/store/modules/user'
 import useSettingsStore from '@/store/modules/settings'
 import useSettingsStore from '@/store/modules/settings'
-import usePermissionStore from '@/store/modules/permission'
 
 
-NProgress.configure({showSpinner: false})
+NProgress.configure({ showSpinner: false })
 
 
 const whiteList = [
 const whiteList = [
   '/login',
   '/login',
@@ -25,51 +21,36 @@ const whiteList = [
 
 
 router.beforeEach((to, from, next) => {
 router.beforeEach((to, from, next) => {
   NProgress.start()
   NProgress.start()
-  if (getToken()) {
+
+  // 设置页面标题
   to.meta.title && useSettingsStore().setTitle(to.meta.title)
   to.meta.title && useSettingsStore().setTitle(to.meta.title)
-    /* has token*/
-    if (to.path === '/login') {
-      next({path: '/'})
-      NProgress.done()
-    } else if (whiteList.indexOf(to.path) !== -1) {
-      useUserStore().getInfo().then(res => {
-      })
+
+  // 1. 判断是否在白名单中
+  if (whiteList.includes(to.path)) {
+    // 白名单路由直接放行，不需要检查token
     next()
     next()
-    } /*else {
-      if (useUserStore().roles.length === 0) {
-        isRelogin.show = true
-        // 判断当前用户是否已拉取完user_info信息
-        useUserStore().getInfo().then(() => {
-          isRelogin.show = false
-          usePermissionStore().generateRoutes().then(accessRoutes => {
-            // 根据roles权限生成可访问的路由表
-            accessRoutes.forEach(route => {
-              if (!isHttp(route.path)) {
-                router.addRoute(route) // 动态添加可访问路由表
+    NProgress.done()
+    return
   }
   }
-            })
-            next({...to, replace: true}) // hack方法 确保addRoutes已完成
-          })
-        }).catch(err => {
-          useUserStore().logOut().then(() => {
-            ElMessage.error(err)
-            next({path: '/'})
-          })
-        })
-      } else {
-        next()
+
+  // 2. 非白名单路由，检查是否登录
+  const hasToken = getToken()
+  if (!hasToken) {
+    // 未登录访问非白名单路由，重定向到登录页
+    next(`/login?redirect=${to.fullPath}`)
+    NProgress.done()
+    return
   }
   }
-    }*/
+
+  // 3. 已登录访问非白名单路由，直接放行（不做权限检查）
+  if (to.path === '/login') {
+    // 已登录但访问登录页，重定向到首页
+    next({ path: '/' })
+    NProgress.done()
   } else {
   } else {
-    // 没有token
-    if (whiteList.indexOf(to.path) !== -1) {
-      // 在免登录白名单，直接进入
     next()
     next()
-    } else {
-      next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
     NProgress.done()
     NProgress.done()
   }
   }
-  }
 })
 })
 
 
 router.afterEach(() => {
 router.afterEach(() => {