From e47c70d32e6fa7c9cb16ca19a79338ea36a83e94 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期二, 10 六月 2025 16:38:37 +0800 Subject: [PATCH] fix: v1.4 --- apps/taro/src/hooks/router.ts | 37 +++++++++++++++++++++++-------------- 1 files changed, 23 insertions(+), 14 deletions(-) diff --git a/apps/taro/src/hooks/router.ts b/apps/taro/src/hooks/router.ts index d8f82a8..a7400ce 100644 --- a/apps/taro/src/hooks/router.ts +++ b/apps/taro/src/hooks/router.ts @@ -51,30 +51,39 @@ const appStore = useAppStore(); const { latestRoute } = storeToRefs(appStore); const { blLifeRecharge } = useLifeRechargeContext(); + const system = useSystemStore(); const router = Taro.useRouter(); const channelId = router.params?.channelId ?? ''; console.log('router: params', router, blLifeRecharge.accountModel.channlesNum); + Taro.useTabItemTap((item) => { + system.setTabIndex(item.index as any); + Taro.reLaunch({ + url: pathAddExtraParam(item.pagePath, { channelId: blLifeRecharge.accountModel.channlesNum }), + success() { + appStore.setLatestRoute(''); + }, + }); + }); + Taro.useDidShow(() => { - console.log('latestRoute.value: ', latestRoute.value); const isTabbarPage = Object.values(TabBarPageRouterForCheck).some((x) => latestRoute.value.toLowerCase().includes(x.toLowerCase()) ); - const currentIsTabbarPage = Object.values(TabBarPageRouterForCheck).some((x) => - getRouterPath(router.path).toLowerCase().includes(x.toLowerCase()) - ); - console.log('currentIsTabbarPage: ', currentIsTabbarPage); - if (currentIsTabbarPage && blLifeRecharge.accountModel.channlesNum && !channelId) { - Taro.reLaunch({ - url: pathAddExtraParam(router.path, { channelId: blLifeRecharge.accountModel.channlesNum }), - success() { - appStore.setLatestRoute(''); - }, - }); - return; - } + // const currentIsTabbarPage = Object.values(TabBarPageRouterForCheck).some((x) => + // getRouterPath(router.path).toLowerCase().includes(x.toLowerCase()) + // ); + // if (currentIsTabbarPage && blLifeRecharge.accountModel.channlesNum && !channelId) { + // Taro.reLaunch({ + // url: pathAddExtraParam(router.path, { channelId: blLifeRecharge.accountModel.channlesNum }), + // success() { + // appStore.setLatestRoute(''); + // }, + // }); + // return; + // } if (isTabbarPage && isInAlipay) { Taro.reLaunch({ url: router.path, -- Gitblit v1.9.1