From fbfdd719817dc79e1a9332a641f95cdfcd0eca32 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 14 二月 2025 15:07:18 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/cMiniApp/src/custom-tab-bar/index.tsx | 44 +++++++++++++-------------------------------
1 files changed, 13 insertions(+), 31 deletions(-)
diff --git a/apps/cMiniApp/src/custom-tab-bar/index.tsx b/apps/cMiniApp/src/custom-tab-bar/index.tsx
index 00a24dd..1645110 100644
--- a/apps/cMiniApp/src/custom-tab-bar/index.tsx
+++ b/apps/cMiniApp/src/custom-tab-bar/index.tsx
@@ -7,9 +7,8 @@
import { storeToRefs } from 'pinia';
import { TabBarPageRouter } from '@/constants';
// import IconPublish from '@/assets/tabbar/icon-publish.png';
-import { useUser, useIsLogin, useMyMessageCount } from '@/hooks';
+import { useUser, useIsLogin } from '@/hooks';
import { Message } from '@12333/utils';
-import { MatchMakingIdentityEnumTitle } from '@12333/constants';
type TarBarItemProps = {
text: string;
@@ -63,8 +62,6 @@
const router = Taro.useRouter();
- const { matchMakingIdentity } = useUser();
-
const isLogin = useIsLogin();
const loginTipShowed = ref(false);
@@ -112,7 +109,6 @@
}
return () => {
- const homeTitle = MatchMakingIdentityEnumTitle[matchMakingIdentity.value];
return (
<View
class="bottom-tab"
@@ -121,7 +117,7 @@
}}
>
<TarBarItem
- text={homeTitle}
+ text={'鎵惧伐浣�'}
icon="../assets/tabbar/icon-home.png"
activeIcon="../assets/tabbar/icon-home-active.png"
pagePath={TabBarPageRouter.Home}
@@ -130,40 +126,26 @@
className="home"
onClick={switchTab}
></TarBarItem>
- {/* <TarBarItem
- text="琛屼笟鍦�"
- icon="../assets/tabbar/icon-friend.png"
- activeIcon="../assets/tabbar/icon-friend-active.png"
- pagePath={TabBarPageRouter.CircleFriend}
- index={1}
- active={system.activeTab === 1}
- className="circleFriend"
- onClick={switchTab}
- ></TarBarItem>
- <div class="bottom-tab-item publish-wrapper" onClick={goPublish}>
- <img class="bottom-tab-item-img-publish" src={IconPublish} />
- <div class="bottom-tab-item-text">鍙戝竷</div>
- </div>
+
<TarBarItem
- text="娑堟伅"
- icon="../assets/tabbar/icon-message.png"
- activeIcon="../assets/tabbar/icon-message-active.png"
- pagePath={TabBarPageRouter.Message}
- active={system.activeTab === 2}
- className="message"
+ text="浠诲姟"
+ icon="../assets/tabbar/icon-task.png"
+ activeIcon="../assets/tabbar/icon-task-active.png"
+ pagePath={TabBarPageRouter.Task}
+ active={system.activeTab === 1}
+ className="task"
onClick={switchTab}
- index={2}
- badge={(isLogin.value && myMessageCount.value?.unReadCount) ?? 0}
- ></TarBarItem> */}
+ index={1}
+ ></TarBarItem>
<TarBarItem
text="鎴戠殑"
icon="../assets/tabbar/icon-mine.png"
activeIcon="../assets/tabbar/icon-mine-active.png"
pagePath={TabBarPageRouter.Mine}
- active={system.activeTab === 3}
+ active={system.activeTab === 2}
className="mine"
onClick={switchTab}
- index={3}
+ index={2}
></TarBarItem>
</View>
);
--
Gitblit v1.9.1