完成水电表列表

src/permission.ts

@@ -13,58 +13,69 @@ import { ElMessage } from 'element-plus/es';
 NProgress.configure({ showSpinner: false });
 const whiteList = ['/login', '/register', '/social-callback', '/register*', '/register/*'];
 
+// ✅ 关键：防止重复添加动态路由
+let isDynamicRoutesAdded = false;
+
 const isWhiteList = (path: string) => {
   return whiteList.some((pattern) => isPathMatch(pattern, path));
 };
 
-router.beforeEach(async (to, from, next) => {
+router.beforeEach(async (to, from) => {
   NProgress.start();
   if (getToken()) {
     to.meta.title && useSettingsStore().setTitle(to.meta.title as string);
-    /* has token*/
+
     if (to.path === '/login') {
-      next({ path: '/' });
       NProgress.done();
+      return '/';
     } else if (isWhiteList(to.path)) {
-      next();
+      return;
     } else {
-      if (useUserStore().roles.length === 0) {
+      // ✅ 关键：判断是否已添加过动态路由
+      if (useUserStore().roles.length === 0 || !isDynamicRoutesAdded) {
         isRelogin.show = true;
-        // 判断当前用户是否已拉取完user_info信息
         const [err, res] = await tos(useUserStore().getInfo());
         if (err) {
           await useUserStore().logout();
           ElMessage.error(err);
-          next({ path: '/' });
+          isDynamicRoutesAdded = false; // 重置标志
+          return '/';
         } else {
           isRelogin.show = false;
           const accessRoutes = await usePermissionStore().generateRoutes();
-          // 根据roles权限生成可访问的路由表
+
           accessRoutes.forEach((route) => {
-            if (!isHttp(route.path)) {
-              router.addRoute(route); // 动态添加可访问路由表
+            if (!isHttp(route.path) && !router.hasRoute(route.name)) {
+              router.addRoute(route);
             }
           });
+
+          isDynamicRoutesAdded = true; // ✅ 标记已添加
+
           if (res.user.userId === 1 && from.path === '/login') {
-            // 管理员 → 强制跳转到社区列表
-            next('/community/communitylist');
+            // ✅ 关键：返回完整路由对象 + replace
+            return { path: '/community/communitylist', replace: true };
           } else {
-            // 普通用户 → 正常跳转目标页
-            next(to.fullPath);
+            // ✅ 终极修复：返回完整路由对象，强制 replace，防止白屏
+            return {
+              path: to.path,
+              query: to.query,
+              hash: to.hash,
+              replace: true
+            };
           }
         }
       } else {
-        next();
+        return;
       }
     }
   } else {
-    // 没有token
+    isDynamicRoutesAdded = false; // ✅ 退出时重置标志
     if (isWhiteList(to.path)) {
-      // 在免登录白名单，直接进入
-      next();
+      return;
     } else {
-      next(`/login`); // 否则全部重定向到登录页
       NProgress.done();
+      return '/login';
     }
   }
 });