From a1dfc1313e0bf9647c7d3a4046d62cf242177276 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 13 三月 2025 16:34:29 +0800
Subject: [PATCH] fix: 二期需求
---
apps/taro/src/hooks/router.ts | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/apps/taro/src/hooks/router.ts b/apps/taro/src/hooks/router.ts
index d571b8f..01639bb 100644
--- a/apps/taro/src/hooks/router.ts
+++ b/apps/taro/src/hooks/router.ts
@@ -5,6 +5,7 @@
import { isInAlipay } from '@/utils/env';
import { useLifeRechargeContext } from '@life-payment/core-vue';
import { getRouterPath } from '@life-payment/utils';
+import { pathAddExtraParam } from '@/utils';
export function useSwitchTab() {
const systemStore = useSystemStore();
@@ -54,21 +55,26 @@
const router = Taro.useRouter();
const channelId = router.params?.channelId ?? '';
- console.log('router.params: ', router);
+ console.log('router: params', router, blLifeRecharge.accountModel.channlesNum);
Taro.useDidShow(() => {
+ console.log('latestRoute.value: ', latestRoute.value);
const isTabbarPage = Object.values(TabBarPageRouterForCheck).some((x) =>
latestRoute.value.toLowerCase().includes(x.toLowerCase())
);
- // if (blLifeRecharge.accountModel.channlesNum && !channelId) {
- // Taro.reLaunch({
- // // url: `${getRouterPath(router.path)}?channelId=${blLifeRecharge.accountModel.channlesNum}`,
- // url: `${router.path}&channelId=${blLifeRecharge.accountModel.channlesNum}`,
- // success() {
- // appStore.setLatestRoute('');
- // },
- // });
- // }
+ 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;
+ }
if (isTabbarPage && isInAlipay) {
Taro.reLaunch({
url: router.path,
--
Gitblit v1.9.1