fix: 标签栏图标修正；概览页展示数据切换；消息通知异常显示修复

src/router/guard/permission.ts

@@ -12,70 +12,60 @@ let isMenuLoading = false
 let isMenuLoaded = false
 
 export default function setupPermissionGuard(router: Router) {
-  router.beforeEach(async (to, from, next) => {
+  router.beforeEach(async (to) => {
     const appStore = useAppStore()
     const userStore = useUserStore()
     const Permission = usePermission()
     const permissionsAllow = Permission.accessRouter(to)
 
-    if (appStore.menuFromServer) {
-      // 针对来自服务端的菜单配置进行处理
-      // Handle routing configuration from the server
+    try {
+      if (appStore.menuFromServer) {
+        // 针对来自服务端的菜单配置进行处理
+        // Handle routing configuration from the server
 
-      // 检查是否在白名单中
-      if (WHITE_LIST.find((el) => el.name === to.name)) {
-        next()
-        NProgress.done()
-        return
-      }
-      console.log('[Permission Guard] Menu not loaded, loading...')
-
-      // 检查动态路由是否已加载（使用标志位而非菜单长度，更可靠）
-      if (!isMenuLoaded && !isMenuLoading) {
-        console.log('[Permission Guard] Menu not loaded, loading...')
-        // 设置加载标志
-        isMenuLoading = true
-        try {
-          // 动态路由未加载，先获取菜单配置并注册路由
-          await appStore.fetchServerMenuConfig()
-          // 标记加载完成
-          isMenuLoaded = true
-          console.log('[Permission Guard] Menu loaded, redirecting to:', to.path)
-          // 路由注册后需要重新导航到当前路径
-          next({ path: to.path, query: to.query, params: to.params, replace: true } as RouteLocationRaw)
-        } catch (error) {
-          console.error('[Permission Guard] Failed to load menu:', error)
-          isMenuLoading = false
-          next(NOT_FOUND)
-        } finally {
-          isMenuLoading = false
+        // 检查是否在白名单中
+        if (WHITE_LIST.find((el) => el.name === to.name)) {
+          return true
         }
-        NProgress.done()
-        return
+        console.log('[Permission Guard] Menu not loaded, loading...')
+
+        // 检查动态路由是否已加载（使用标志位而非菜单长度，更可靠）
+        if (!isMenuLoaded && !isMenuLoading) {
+          console.log('[Permission Guard] Menu not loaded, loading...')
+          // 设置加载标志
+          isMenuLoading = true
+          try {
+            // 动态路由未加载，先获取菜单配置并注册路由
+            await appStore.fetchServerMenuConfig()
+            // 标记加载完成
+            isMenuLoaded = true
+            console.log('[Permission Guard] Menu loaded, redirecting to:', to.path)
+            // 路由注册后需要重新导航到当前路径
+            return { path: to.path, query: to.query, params: to.params, replace: true } as RouteLocationRaw
+          } catch (error) {
+            console.error('[Permission Guard] Failed to load menu:', error)
+            return NOT_FOUND
+          } finally {
+            isMenuLoading = false
+          }
+        }
+
+        // 如果正在加载菜单，等待加载完成
+        if (isMenuLoading) {
+          return { path: to.path, query: to.query, params: to.params, replace: true } as RouteLocationRaw
+        }
+
+        // 动态路由已加载，直接放行
+        // 因为路由已经通过 addRoute 注册，Vue Router 会自动匹配
+        return permissionsAllow ? true : NOT_FOUND
       }
 
-      // 如果正在加载菜单，等待加载完成
-      if (isMenuLoading) {
-        next({ path: to.path, query: to.query, params: to.params, replace: true } as RouteLocationRaw)
-        NProgress.done()
-        return
-      }
-
-      // 动态路由已加载，直接放行
-      // 因为路由已经通过 addRoute 注册，Vue Router 会自动匹配
       if (permissionsAllow) {
-        next()
-      } else {
-        next(NOT_FOUND)
-      }
-    } else {
-      // eslint-disable-next-line no-lonely-if
-      if (permissionsAllow) next()
-      else {
-        const destination = Permission.findFirstPermissionRoute(appRoutes, userStore.role) || NOT_FOUND
-        next(destination)
+        return true
       }
+      return Permission.findFirstPermissionRoute(appRoutes, userStore.role) || NOT_FOUND
+    } finally {
+      NProgress.done()
     }
-    NProgress.done()
   })
 }

src/router/guard/userLoginInfo.ts

@@ -8,40 +8,39 @@ import { isLogin } from '@/utils/auth'
 const whiteList = ['login', 'home']
 
 export default function setupUserLoginInfoGuard(router: Router) {
-  router.beforeEach(async (to, from, next) => {
+  router.beforeEach(async (to) => {
     NProgress.start()
     const userStore = useUserStore()
     if (isLogin()) {
       if (userStore.role) {
-        next()
+        return true
       } else {
         try {
           await userStore.info()
-          next()
+          return true
         } catch (error) {
           await userStore.logout()
-          next({
+          return {
             name: 'login',
             query: {
               redirect: to.name,
               ...to.query,
             } as LocationQueryRaw,
-          })
+          }
         }
       }
     } else {
       // 在白名单中的路由不需要登录验证
       if (whiteList.includes(to.name as string)) {
-        next()
-        return
+        return true
       }
-      next({
+      return {
         name: 'login',
         query: {
           redirect: to.name,
           ...to.query,
         } as LocationQueryRaw,
-      })
+      }
     }
   })
 }