From 22249b4ca35c39b61ae69d1d74909c9fc9157ee4 Mon Sep 17 00:00:00 2001
From: tk <szdot@live.com>
Date: Thu, 26 Sep 2024 15:03:35 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=20=20=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Afix=20=E8=B7=AF=E7=94=B1=E5=AE=88=E5=8D=ABbug=20?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=8F=90=20=E3=80=90=E5=8E=9F=20=20=E5=9B=A0?=
 =?UTF-8?q?=E3=80=91=EF=BC=9Anext()=20=E5=B9=B6=E4=B8=8D=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=20Promise=20=E6=89=80=E4=BB=A5=E5=AE=83?=
 =?UTF-8?q?=E5=90=8E=E9=9D=A2=E8=B0=83=E7=94=A8=20catch()=E4=BC=9A?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E9=94=99=E8=AF=AF=20=E3=80=90=E8=BF=87=20=20?=
 =?UTF-8?q?=E7=A8=8B=E3=80=91=EF=BC=9A=20=E3=80=90=E5=BD=B1=20=20=E5=93=8D?=
 =?UTF-8?q?=E3=80=91=EF=BC=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# 类型 包含:
# feat：新功能（feature）
# fix：修补bug
# docs：文档（documentation）
# style： 格式（不影响代码运行的变动）
# refactor：重构（即不是新增功能，也不是修改bug的代码变动）
# test：增加测试
# chore：构建过程或辅助工具的变动
---
 src/permission.js | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/permission.js b/src/permission.js
index d2627c8..4161ba1 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -13,31 +13,30 @@ router.beforeEach((to, from, next) => {
   NProgress.start()
   // 设置title
   document.title = getPageTitle(to.meta.title)
-  // 路由
-  store.commit('user/initUser')// 用户信息初始化 PS:token不存在 执行且执行一次
+
+  store.commit('user/initUser') // 用户信息初始化
   const power = store.state.user.power
   const token = store.state.user.token
-  if (token === null) {
+
+  if (!token) {
     if (to.path === '/login') {
       next()
-      NProgress.done()
     } else {
-      next('/login')
-      NProgress.done()
+      next('/login') // 直接调用 next('/login')
     }
   } else {
     if (to.path === '/login') {
       next('/')
-      NProgress.done()
     } else {
-      if (to.meta.roles.indexOf(power) >= 0) { // 判断 roles权限 有权限打开页面 没权限跳转到首页
+      if (to.meta.roles && to.meta.roles.indexOf(power) >= 0) { // 确保 roles 存在
         next()
       } else {
         next('/')
       }
-      NProgress.done()
     }
   }
+
+  NProgress.done()
 })
 
 /**
@@ -53,9 +52,5 @@ router.afterEach(() => {
  * @param {*} pageTitle 路由mate.tiele
  */
 function getPageTitle (pageTitle) {
-  if (pageTitle) {
-    return `${pageTitle} - ${store.state.settings.title}`
-  } else {
-    return store.state.settings.title
-  }
+  return pageTitle ? `${pageTitle} - ${store.state.settings.title}` : store.state.settings.title
 }