From f32357c9f9a2c1e62ff8512d6cce65f4e65e7754 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期日, 19 十月 2025 17:11:55 +0800
Subject: [PATCH] fix: bug

---
 apps/bMiniApp/src/hooks/router.ts                  |    4 ++--
 apps/bMiniApp/src/constants/tabBar.ts              |    6 ++++++
 apps/cMiniApp/src/constants/tabBar.ts              |    6 ++++++
 apps/cMiniApp/src/utils/page.ts                    |    4 ++--
 apps/bMiniApp/src/components/Layout/PageLayout.vue |    4 ++--
 apps/bMiniApp/src/utils/page.ts                    |    4 ++--
 apps/cMiniApp/src/hooks/router.ts                  |    4 ++--
 7 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/apps/bMiniApp/src/components/Layout/PageLayout.vue b/apps/bMiniApp/src/components/Layout/PageLayout.vue
index 53b0ee6..24bff3f 100644
--- a/apps/bMiniApp/src/components/Layout/PageLayout.vue
+++ b/apps/bMiniApp/src/components/Layout/PageLayout.vue
@@ -44,7 +44,7 @@
 import { commonNavigationBarProps } from '../NavigationBar/commonNavigationBar';
 import { useSystemStore } from '@/stores/modules/system';
 import Taro from '@tarojs/taro';
-import { TabBarPageRouter } from '@/constants';
+import { TabBarPageRouterList } from '@/constants';
 import { useAuth } from '@/hooks';
 import { Portal } from 'senin-mini/components';
 import { usePickProps } from 'senin-mini/hooks';
@@ -89,7 +89,7 @@
 const router = Taro.useRouter();
 
 const pageHeightWithTabBar = computed(() =>
-  Object.values(TabBarPageRouter).some((x) => x.toLowerCase() === router.path.toLowerCase())
+  TabBarPageRouterList.some((x) => x.toLowerCase() === router.path.toLowerCase())
 );
 
 const navigationBarHeight = computed(
diff --git a/apps/bMiniApp/src/constants/tabBar.ts b/apps/bMiniApp/src/constants/tabBar.ts
index 977f397..e000eb7 100644
--- a/apps/bMiniApp/src/constants/tabBar.ts
+++ b/apps/bMiniApp/src/constants/tabBar.ts
@@ -3,3 +3,9 @@
   Workbenches: '/pages/workbenches/workbenches',
   Mine: '/pages/mine/index',
 };
+
+export const TabBarPageRouterList = [
+  TabBarPageRouter.Home,
+  TabBarPageRouter.Workbenches,
+  TabBarPageRouter.Mine,
+];
diff --git a/apps/bMiniApp/src/hooks/router.ts b/apps/bMiniApp/src/hooks/router.ts
index a0ac30f..73d32c1 100644
--- a/apps/bMiniApp/src/hooks/router.ts
+++ b/apps/bMiniApp/src/hooks/router.ts
@@ -1,5 +1,5 @@
 import Taro from '@tarojs/taro';
-import { TabBarPageRouter } from '@/constants';
+import { TabBarPageRouter, TabBarPageRouterList } from '@/constants';
 import { useSystemStore } from '@/stores/modules/system';
 import { httpLoggerRecord } from '@12333/utils';
 
@@ -7,7 +7,7 @@
   const systemStore = useSystemStore();
 
   const switchTab = (option: Taro.switchTab.Option) => {
-    const index = Object.values(TabBarPageRouter).findIndex((x) => option.url.includes(x));
+    const index = TabBarPageRouterList.findIndex((x) => option.url.includes(x));
     console.log('index: ', index);
     systemStore.setTabIndex(index);
     Taro.switchTab(option);
diff --git a/apps/bMiniApp/src/utils/page.ts b/apps/bMiniApp/src/utils/page.ts
index 9538688..067f334 100644
--- a/apps/bMiniApp/src/utils/page.ts
+++ b/apps/bMiniApp/src/utils/page.ts
@@ -1,4 +1,4 @@
-import { TabBarPageRouter } from '@/constants';
+import { TabBarPageRouterList } from '@/constants';
 import Taro from '@tarojs/taro';
 import { useSystemStoreWithOut } from '@/stores/modules/system';
 
@@ -11,7 +11,7 @@
     Taro.navigateBack({ delta: delta });
   } else {
     Taro.switchTab({
-      url: Object.values(TabBarPageRouter)[systemStore.activeTab],
+      url: TabBarPageRouterList[systemStore.activeTab],
     });
   }
 }
diff --git a/apps/cMiniApp/src/constants/tabBar.ts b/apps/cMiniApp/src/constants/tabBar.ts
index 49092b8..aec3007 100644
--- a/apps/cMiniApp/src/constants/tabBar.ts
+++ b/apps/cMiniApp/src/constants/tabBar.ts
@@ -3,3 +3,9 @@
   Task: '/pages/task/task',
   Mine: '/pages/mine/index',
 };
+
+export const TabBarPageRouterList = [
+  TabBarPageRouter.Home,
+  TabBarPageRouter.Task,
+  TabBarPageRouter.Mine,
+];
diff --git a/apps/cMiniApp/src/hooks/router.ts b/apps/cMiniApp/src/hooks/router.ts
index 59447e7..29f1050 100644
--- a/apps/cMiniApp/src/hooks/router.ts
+++ b/apps/cMiniApp/src/hooks/router.ts
@@ -1,12 +1,12 @@
 import Taro from '@tarojs/taro';
-import { TabBarPageRouter } from '@/constants';
+import { TabBarPageRouter, TabBarPageRouterList } from '@/constants';
 import { useSystemStore } from '@/stores/modules/system';
 
 export function useSwitchTab() {
   const systemStore = useSystemStore();
 
   const switchTab = (option: Taro.switchTab.Option) => {
-    const index = Object.values(TabBarPageRouter).findIndex((x) => option.url.includes(x));
+    const index = TabBarPageRouterList.findIndex((x) => option.url.includes(x));
     console.log('index: ', index);
     systemStore.setTabIndex(index);
     Taro.switchTab(option);
diff --git a/apps/cMiniApp/src/utils/page.ts b/apps/cMiniApp/src/utils/page.ts
index 9538688..067f334 100644
--- a/apps/cMiniApp/src/utils/page.ts
+++ b/apps/cMiniApp/src/utils/page.ts
@@ -1,4 +1,4 @@
-import { TabBarPageRouter } from '@/constants';
+import { TabBarPageRouterList } from '@/constants';
 import Taro from '@tarojs/taro';
 import { useSystemStoreWithOut } from '@/stores/modules/system';
 
@@ -11,7 +11,7 @@
     Taro.navigateBack({ delta: delta });
   } else {
     Taro.switchTab({
-      url: Object.values(TabBarPageRouter)[systemStore.activeTab],
+      url: TabBarPageRouterList[systemStore.activeTab],
     });
   }
 }

--
Gitblit v1.9.1