From b83de411778f6eff42e2914dd3786cc5e87f0622 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E9=B9=8F?= <fanpeng@star-lock.cn>
Date: Fri, 3 Jan 2025 15:01:22 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E6=8B=A6=E6=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/interceptors/route.ts                   | 16 +++++-----------
 src/pages.json                              |  9 ++++++---
 src/pages/get-code/get-code.vue             |  3 ++-
 src/pages/login/login.vue                   |  3 ++-
 src/pages/reset-password/reset-password.vue |  3 ++-
 src/utils/index.ts                          | 12 ++++--------
 6 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/src/interceptors/route.ts b/src/interceptors/route.ts
index 4fae647..991e5d8 100644
--- a/src/interceptors/route.ts
+++ b/src/interceptors/route.ts
@@ -6,24 +6,19 @@
 import { useUserStore } from '@/store'
 import { getNeedLoginPages, needLoginPages as _needLoginPages } from '@/utils'
 
-// TODO Check
-const loginRoute = '/pages/login/index'
+const loginRoute = '/pages/login/login'
 
-const isLogined = () => {
+const loginStatus = () => {
   const userStore = useUserStore()
-  return userStore.isLogined
+  return userStore.loginStatus
 }
 
 const isDev = import.meta.env.DEV
 
-// 黑名单登录拦截器 - （适用于大部分页面不需要登录，少部分页面需要登录）
 const navigateToInterceptor = {
-  // 注意，这里的url是 '/' 开头的，如 '/pages/index/index'，跟 'pages.json' 里面的 path 不同
   invoke({ url }: { url: string }) {
-    // console.log(url) // /pages/route-interceptor/index?name=feige&age=30
     const path = url.split('?')[0]
     let needLoginPages: string[] = []
-    // 为了防止开发时出现BUG，这里每次都获取一下。生产环境可以移到函数外，性能更好
     if (isDev) {
       needLoginPages = getNeedLoginPages()
     } else {
@@ -33,12 +28,11 @@ const navigateToInterceptor = {
     if (!isNeedLogin) {
       return true
     }
-    const hasLogin = isLogined()
+    const hasLogin = loginStatus()
     if (hasLogin) {
       return true
     }
-    const redirectRoute = `${loginRoute}?redirect=${encodeURIComponent(url)}`
-    uni.navigateTo({ url: redirectRoute })
+    uni.navigateTo({ url: loginRoute })
     return false
   }
 }
diff --git a/src/pages.json b/src/pages.json
index 830b295..e3b78f8 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -76,7 +76,8 @@
       "style": {
         "navigationStyle": "custom",
         "disableScroll": true
-      }
+      },
+      "needLogin": false
     },
     {
       "path": "pages/login/login",
@@ -84,7 +85,8 @@
       "style": {
         "navigationStyle": "custom",
         "disableScroll": true
-      }
+      },
+      "needLogin": false
     },
     {
       "path": "pages/mine/mine",
@@ -100,7 +102,8 @@
       "style": {
         "navigationStyle": "custom",
         "disableScroll": true
-      }
+      },
+      "needLogin": false
     },
     {
       "path": "pages/workbench/workbench",
diff --git a/src/pages/get-code/get-code.vue b/src/pages/get-code/get-code.vue
index f2c5e95..a071fca 100644
--- a/src/pages/get-code/get-code.vue
+++ b/src/pages/get-code/get-code.vue
@@ -3,7 +3,8 @@
   style: {
     navigationStyle: 'custom',
     disableScroll: true
-  }
+  },
+  needLogin: false
 }
 </route>
 <template>
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index 95577e3..f467381 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -3,7 +3,8 @@
   style: {
     navigationStyle: 'custom',
     disableScroll: true
-  }
+  },
+  needLogin: false
 }
 </route>
 <template>
diff --git a/src/pages/reset-password/reset-password.vue b/src/pages/reset-password/reset-password.vue
index 0cbb275..b410aa8 100644
--- a/src/pages/reset-password/reset-password.vue
+++ b/src/pages/reset-password/reset-password.vue
@@ -3,7 +3,8 @@
   style: {
     navigationStyle: 'custom',
     disableScroll: true
-  }
+  },
+  needLogin: false
 }
 </route>
 <template>
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 4f8f528..37b5c13 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -78,23 +78,21 @@ export const getUrlObj = (url: string) => {
  * 如果没有传 key，则表示所有的pages，如果传递了 key, 则表示通过 key 过滤
  */
 export const getAllPages = (key = 'needLogin') => {
-  // 这里处理主包
   const mainPages = [
     ...pages
-      .filter(page => !key || page[key])
+      .filter(page => !key || page[key] !== false)
       .map(page => ({
         ...page,
         path: `/${page.path}`
       }))
   ]
-  // 这里处理分包
+
   const subPages: any[] = []
   subPackages.forEach(subPageObj => {
-    // console.log(subPageObj)
     const { root } = subPageObj
 
     subPageObj.pages
-      .filter(page => !key || page[key])
+      .filter(page => !key || page[key] !== false)
       .forEach((page: { path: string } & Record<string, any>) => {
         subPages.push({
           ...page,
@@ -102,9 +100,7 @@ export const getAllPages = (key = 'needLogin') => {
         })
       })
   })
-  const result = [...mainPages, ...subPages]
-  // console.log(`getAllPages by ${key} result: `, result)
-  return result
+  return [...mainPages, ...subPages]
 }
 
 /**