Merge branch 'main' into rj

src/permission.js

@@ -92,8 +92,13 @@ router.beforeEach(async (to, from, next) => {
           await store.dispatch('user/getUserInfo')
           const accessRoutes = await store.dispatch('permission/generateRoutes')
           resetRouter()
-          router.addRoutes(accessRoutes)
-          next({ ...to, replace: true })
+          if (accessRoutes.length > 0) {
+            router.addRoutes(accessRoutes)
+            next({ ...to, replace: true })
+          } else {
+            next()
+          }
+
         } catch (error) {
           console.log(error)
           // 删除token并进入登录页面以重新登录