Merge branch 'dev-lhf' into 'dev'

fix: 未登录时，先跳转到首页进行登录

See merge request product-group-fe/sfy-safety-group/sfy-safety!276

src/components/Nav.vue

@@ -69,7 +69,6 @@
       // ElMessage.warning({ message: `${item.name}功能建设中，暂无法访问`, offset: 100, grouping: true });
       return;
     }
-    activeNav.value = item.name;
     router.push(item.path);
   };
 

src/router/router-guards.ts

@@ -49,7 +49,8 @@ export function createRouterGuards(router: Router) {
         try {
           await setDynamicRoute(router);
         } catch {
-          next();
+          console.log('设置路由失败');
+          // next({ name: 'HomePage' });
         }
       }
       next();
@@ -76,9 +77,7 @@ export function createRouterGuards(router: Router) {
       }
       // ElMessage.error('请先登录2');
       userStore.showLogin = true;
-      // next(redirectData);
-      // window.location.href = getRedirectUrl();
-      next();
+      next({ name: 'HomePage' });
       return;
     }
 
@@ -90,7 +89,7 @@ export function createRouterGuards(router: Router) {
       await setDynamicRoute(router);
     } catch (err) {
       userStore.showLogin = true;
-      next();
+      next({ name: 'HomePage' });
       return;
     }
     NProgress.done();