From 6aa4bc347288a35681e9b8ab50c844d32b02b70a Mon Sep 17 00:00:00 2001
From: feige996 <1020102647@qq.com>
Date: Mon, 18 Aug 2025 22:01:55 +0800
Subject: [PATCH] =?UTF-8?q?feat(login):=20wip=20=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue               | 5 -----
 src/pages/about/about.vue | 9 +++++++++
 src/router/interceptor.ts | 9 +++++++--
 src/tabbar/config.ts      | 2 +-
 src/tabbar/store.ts       | 4 ++--
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 275a071..becd39f 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,8 +1,6 @@
 <script setup lang="ts">
 import { onHide, onLaunch, onShow } from '@dcloudio/uni-app'
 import { navigateToInterceptor } from '@/router/interceptor'
-
-import { tabbarStore } from './tabbar/store'
 import 'abortcontroller-polyfill/dist/abortcontroller-polyfill-only'
 
 onLaunch((options) => {
@@ -12,9 +10,6 @@ onLaunch((options) => {
   const gotoPath = options?.path || ''
 
   navigateToInterceptor.invoke({ url: gotoPath })
-
-  // 处理直接进入路由非首页时，tabbarIndex 不正确的问题
-  tabbarStore.setAutoCurIdx(gotoPath)
 })
 onShow((options) => {
   console.log('App Show', options)
diff --git a/src/pages/about/about.vue b/src/pages/about/about.vue
index 809ed18..0307140 100644
--- a/src/pages/about/about.vue
+++ b/src/pages/about/about.vue
@@ -17,6 +17,12 @@ import RequestComp from './components/request.vue'
 // testOxlint('oxlint')
 console.log('about')
 
+function toLogin() {
+  uni.navigateTo({
+    url: `/pages/login/login?redirect=${encodeURIComponent('/pages/about/about')}`,
+  })
+}
+
 function gotoAlova() {
   uni.navigateTo({
     url: '/pages/about/alova',
@@ -51,6 +57,9 @@ onReady(() => {
     <view class="my-2 text-center">
       <image src="/static/images/avatar.jpg" class="h-100px w-100px" />
     </view>
+    <button class="mt-4 w-40 text-center" @click="toLogin">
+      点击去登录页
+    </button>
     <RequestComp />
     <view class="mb-6 h-1px bg-#eee" />
     <view class="text-center">
diff --git a/src/router/interceptor.ts b/src/router/interceptor.ts
index 3291fde..0b84068 100644
--- a/src/router/interceptor.ts
+++ b/src/router/interceptor.ts
@@ -5,6 +5,7 @@
  * 我这里应为大部分都可以随便进入，所以使用黑名单
  */
 import { useUserStore } from '@/store'
+import { tabbarStore } from '@/tabbar/store'
 import { getLastPage } from '@/utils'
 import { EXCLUDE_LIST, LOGIN_PAGE_LIST } from '../login/config'
 
@@ -14,6 +15,9 @@ export const navigateToInterceptor = {
   // 增加对相对路径的处理，BY 网友 @ideal
   invoke({ url }: { url: string }) {
     console.log(url) // /pages/route-interceptor/index?name=feige&age=30
+    if (url === undefined) {
+      return
+    }
     let path = url.split('?')[0]
 
     // 处理相对路径
@@ -24,6 +28,9 @@ export const navigateToInterceptor = {
       path = `${baseDir}/${path}`
     }
 
+    // 处理直接进入路由非首页时，tabbarIndex 不正确的问题
+    tabbarStore.setAutoCurIdx(path)
+
     if (LOGIN_PAGE_LIST.includes(path)) {
       console.log('000')
       return
@@ -34,8 +41,6 @@ export const navigateToInterceptor = {
       return
     }
 
-    // tabbarStore.restorePrevIdx()
-
     console.log('拦截器中得到的 path:', path, userStore.hasLogin)
 
     if ([...EXCLUDE_LIST, ...LOGIN_PAGE_LIST].includes(path)) {
diff --git a/src/tabbar/config.ts b/src/tabbar/config.ts
index d56785e..0153146 100644
--- a/src/tabbar/config.ts
+++ b/src/tabbar/config.ts
@@ -20,7 +20,7 @@ export const TABBAR_STRATEGY_MAP = {
 // 如果是使用 NO_TABBAR(0)，nativeTabbarList 和 customTabbarList 都不生效(里面的配置不用管)
 // 如果是使用 NATIVE_TABBAR(1)，只需要配置 nativeTabbarList，customTabbarList 不生效
 // 如果是使用 CUSTOM_TABBAR(2,3)，只需要配置 customTabbarList，nativeTabbarList 不生效
-export const selectedTabbarStrategy = TABBAR_STRATEGY_MAP.NATIVE_TABBAR
+export const selectedTabbarStrategy = TABBAR_STRATEGY_MAP.CUSTOM_TABBAR_WITH_CACHE
 
 type NativeTabBarItem = TabBar['list'][0]
 // TODO: 2/3. 使用 NATIVE_TABBAR 时，更新下面的 tabbar 配置
diff --git a/src/tabbar/store.ts b/src/tabbar/store.ts
index 7225118..2b72f32 100644
--- a/src/tabbar/store.ts
+++ b/src/tabbar/store.ts
@@ -33,8 +33,8 @@ export const tabbarStore = reactive({
     uni.setStorageSync('app-tabbar-index', idx)
   },
   setAutoCurIdx(path: string) {
-    const index = tabbarList.findIndex(item => item.pagePath === path)
-    // console.log('index:', index, path)
+    const index = tabbarList.findIndex(item => item.path === path)
+    console.log('index:', index, path)
     // console.log('tabbarList:', tabbarList)
     if (index === -1) {
       this.setCurIdx(0)