From 9752b78da2f4afba58955b7c46a2700f72c8ab34 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期日, 19 十月 2025 14:39:29 +0800
Subject: [PATCH] Merge branch 'dev-1.2.0.1' of http://120.26.58.240:8888/r/flexJobMiniApp into dev-1.2.0.1
---
apps/bMiniApp/src/custom-tab-bar/index.tsx | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/apps/bMiniApp/src/custom-tab-bar/index.tsx b/apps/bMiniApp/src/custom-tab-bar/index.tsx
index 72aab82..dd8bbec 100644
--- a/apps/bMiniApp/src/custom-tab-bar/index.tsx
+++ b/apps/bMiniApp/src/custom-tab-bar/index.tsx
@@ -29,7 +29,8 @@
const TarBarItem = function (props: TarBarItemProps, context: SetupContext<TarBarItemEvents>) {
const _badge = props.badge > 99 ? '99+' : props.badge;
- const isActive = props.currentPath.toLowerCase().includes(props.pagePath.toLowerCase());
+ // const isActive = props.currentPath.toLowerCase().includes(props.pagePath.toLowerCase());
+ const isActive = props.active;
return (
<div
class={['bottom-tab-item', { active: isActive }, props.className]}
@@ -112,6 +113,7 @@
}
return () => {
+ const _router = Taro.useRouter();
return (
<View
class="bottom-tab"
@@ -124,7 +126,7 @@
icon="../assets/tabbar/icon-home.png"
activeIcon="../assets/tabbar/icon-home-active.png"
pagePath={TabBarPageRouter.Home}
- currentPath={router.path}
+ currentPath={_router.path}
index={0}
active={system.activeTab === 0}
className="home"
@@ -135,7 +137,7 @@
icon="../assets/tabbar/icon-task.png"
activeIcon="../assets/tabbar/icon-task-active.png"
pagePath={TabBarPageRouter.Workbenches}
- currentPath={router.path}
+ currentPath={_router.path}
active={system.activeTab === 1}
className="task"
onClick={switchTab}
@@ -146,7 +148,7 @@
icon="../assets/tabbar/icon-mine.png"
activeIcon="../assets/tabbar/icon-mine-active.png"
pagePath={TabBarPageRouter.Mine}
- currentPath={router.path}
+ currentPath={_router.path}
active={system.activeTab === 2}
className="mine"
onClick={switchTab}
--
Gitblit v1.9.1