From 0f1afe1a941aae65c024e87df060af077be128d2 Mon Sep 17 00:00:00 2001
From: pany <939630029@qq.com>
Date: Tue, 6 Feb 2024 16:21:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=A6=81=E7=94=A8?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E8=B7=AF=E7=94=B1=E5=90=8E=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=90=8D=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/permission.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/router/permission.ts b/src/router/permission.ts
index aeba45c..1cf2c2a 100644
--- a/src/router/permission.ts
+++ b/src/router/permission.ts
@@ -45,15 +45,14 @@ router.beforeEach(async (to, _from, next) => {
 
   // 否则要重新获取权限角色
   try {
+    await userStore.getInfo()
     if (routeSettings.async) {
       // 注意：角色必须是一个数组！ 例如: ['admin'] 或 ['developer', 'editor']
-      await userStore.getInfo()
       const roles = userStore.roles
       // 根据角色生成可访问的 Routes（可访问路由 = 常驻路由 + 有访问权限的动态路由）
       permissionStore.setRoutes(roles)
     } else {
-      // 没有开启动态路由功能，则启用默认角色
-      userStore.setRoles(routeSettings.defaultRoles)
+      // 没有开启动态路由功能，则启用默认角色来生成
       permissionStore.setRoutes(routeSettings.defaultRoles)
     }
     // 将'有访问权限的动态路由' 添加到 Router 中