From 9c680ea2c5938d26065232d3a658a9a615e1f827 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 13 三月 2025 16:39:14 +0800
Subject: [PATCH] fix: 修改导航 在路由上强制增加channelId
---
apps/taro/src/subpackages/login/loginByForm/accountLoginForm.vue | 2 +-
apps/taro/src/subpackages/recharge/gasBillRecharge/InnerPage.vue | 2 +-
apps/taro/src/stores/modules/user.ts | 2 +-
apps/taro/src/subpackages/recharge/electricBillRecharge/InnerPage.vue | 2 +-
apps/taro/src/hooks/router.ts | 2 +-
apps/taro/src/subpackages/login/loginByForm/verificationCodeLoginForm.vue | 2 +-
apps/taro/src/custom-tab-bar/index.tsx | 8 ++++----
apps/taro/src/subpackages/recharge/phoneBillRecharge/InnerPage.vue | 2 +-
apps/taro/src/subpackages/login/authorization/authorization.vue | 2 +-
apps/taro/src/hooks/user.ts | 6 +++---
apps/taro/src/subpackages/userAccount/userAccountList/InnerPage.vue | 6 +++---
apps/taro/src/hooks/access.ts | 2 +-
apps/taro/src/pages/home/index.vue | 6 +++---
apps/taro/src/utils/page.ts | 6 +++---
14 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/apps/taro/src/custom-tab-bar/index.tsx b/apps/taro/src/custom-tab-bar/index.tsx
index 75fffca..0fcd2a6 100644
--- a/apps/taro/src/custom-tab-bar/index.tsx
+++ b/apps/taro/src/custom-tab-bar/index.tsx
@@ -72,7 +72,7 @@
loginTipShowed.value = true;
Message.confirm({ message: '璇峰墠寰�鐧诲綍' })
.then(() => {
- Taro.navigateTo({
+ RouteHelper.navigateTo({
url: `${RouterPath.loginByForm}?redirect=${url}`,
});
})
@@ -83,7 +83,7 @@
return;
}
system.setTabIndex(index);
- Taro.switchTab({ url });
+ RouteHelper.switchTab({ url });
};
function goPublish() {
@@ -92,7 +92,7 @@
loginTipShowed.value = true;
Message.confirm({ message: '璇峰墠寰�鐧诲綍' })
.then(() => {
- Taro.navigateTo({
+ RouteHelper.navigateTo({
url: `${RouterPath.loginByForm}?redirect=${RouterPath.home}`,
});
})
@@ -103,7 +103,7 @@
return;
}
- // Taro.navigateTo({
+ // RouteHelper.navigateTo({
// url: RouterPath.pulishCircleFriend,
// });
}
diff --git a/apps/taro/src/hooks/access.ts b/apps/taro/src/hooks/access.ts
index 6154a8f..c9aed6d 100644
--- a/apps/taro/src/hooks/access.ts
+++ b/apps/taro/src/hooks/access.ts
@@ -13,7 +13,7 @@
const _fn = (...args2) => {
if (!isLogin.value) {
Message.confirm({ message: '璇峰墠寰�鐧诲綍' }).then(() => {
- Taro.navigateTo({
+ RouteHelper.navigateTo({
// url: `${RouterPath.authorization}`,
url: `${RouterPath.loginByForm}`,
});
diff --git a/apps/taro/src/hooks/router.ts b/apps/taro/src/hooks/router.ts
index 01639bb..d8f82a8 100644
--- a/apps/taro/src/hooks/router.ts
+++ b/apps/taro/src/hooks/router.ts
@@ -14,7 +14,7 @@
const index = Object.values(TabBarPageRouterForCheck).findIndex((x) => option.url.includes(x));
console.log('index: ', index);
systemStore.setTabIndex(index);
- Taro.switchTab(option);
+ RouteHelper.switchTab(option);
};
return switchTab;
}
diff --git a/apps/taro/src/hooks/user.ts b/apps/taro/src/hooks/user.ts
index d30eebd..67a64fe 100644
--- a/apps/taro/src/hooks/user.ts
+++ b/apps/taro/src/hooks/user.ts
@@ -65,7 +65,7 @@
// userStore.getCurrentUserInfo();
}
if (needAuth && !isLogin.value) {
- Taro.navigateTo({
+ RouteHelper.navigateTo({
url: `${RouterPath.loginByForm}?redirect=${router.path}&${object2query(router.params)}`,
});
}
@@ -117,11 +117,11 @@
const router = Taro.useRouter();
const { redirectParams } = useLoginedJump();
function goLoginFn() {
- // Taro.navigateTo({
+ // RouteHelper.navigateTo({
// url: `${RouterPath.authorization}?redirect=${router.path}&${object2query(router.params)}`,
// });
- Taro.navigateTo({
+ RouteHelper.navigateTo({
url: `${RouterPath.loginByForm}?redirect=${redirectParams.value}&tab=${LoginFormTabs.VerificationCodeLogin}`,
});
}
diff --git a/apps/taro/src/pages/home/index.vue b/apps/taro/src/pages/home/index.vue
index 08b103c..2c96fe7 100644
--- a/apps/taro/src/pages/home/index.vue
+++ b/apps/taro/src/pages/home/index.vue
@@ -23,17 +23,17 @@
const router = Taro.useRouter();
const goPhoneBillRecharge = useAccessLogin(() => {
- Taro.navigateTo({
+ RouteHelper.navigateTo({
url: `${RouterPath.phoneBillRecharge}`,
});
});
const goElectricityBillRecharge = useAccessLogin(() => {
- Taro.navigateTo({
+ RouteHelper.navigateTo({
url: `${RouterPath.electricBillRecharge}`,
});
});
const goGasBillRecharge = useAccessLogin(() => {
- Taro.navigateTo({
+ RouteHelper.navigateTo({
url: `${RouterPath.gasBillRecharge}`,
});
});
diff --git a/apps/taro/src/stores/modules/user.ts b/apps/taro/src/stores/modules/user.ts
index f6d8ac5..41ff362 100644
--- a/apps/taro/src/stores/modules/user.ts
+++ b/apps/taro/src/stores/modules/user.ts
@@ -45,7 +45,7 @@
() => {
const route = Taro.getCurrentInstance().router;
if (route.path !== RouterPath.authorization) {
- Taro.navigateTo({
+ RouteHelper.navigateTo({
url: RouterPath.authorization,
});
}
diff --git a/apps/taro/src/subpackages/login/authorization/authorization.vue b/apps/taro/src/subpackages/login/authorization/authorization.vue
index 0bdb4c2..e7e110d 100644
--- a/apps/taro/src/subpackages/login/authorization/authorization.vue
+++ b/apps/taro/src/subpackages/login/authorization/authorization.vue
@@ -174,7 +174,7 @@
}
function goLoginByForm(tab = LoginFormTabs.VerificationCodeLogin) {
- Taro.navigateTo({
+ RouteHelper.navigateTo({
url: `${RouterPath.loginByForm}?redirect=${redirectParams.value}&tab=${tab}`,
});
}
diff --git a/apps/taro/src/subpackages/login/loginByForm/accountLoginForm.vue b/apps/taro/src/subpackages/login/loginByForm/accountLoginForm.vue
index e502bad..f13e4a7 100644
--- a/apps/taro/src/subpackages/login/loginByForm/accountLoginForm.vue
+++ b/apps/taro/src/subpackages/login/loginByForm/accountLoginForm.vue
@@ -95,7 +95,7 @@
function goRegister() {
console.log('RouterPath.registerForm: ', RouterPath.registerForm);
- Taro.navigateTo({
+ RouteHelper.navigateTo({
url: RouterPath.registerForm,
});
}
diff --git a/apps/taro/src/subpackages/login/loginByForm/verificationCodeLoginForm.vue b/apps/taro/src/subpackages/login/loginByForm/verificationCodeLoginForm.vue
index b73ebc3..c3e6abc 100644
--- a/apps/taro/src/subpackages/login/loginByForm/verificationCodeLoginForm.vue
+++ b/apps/taro/src/subpackages/login/loginByForm/verificationCodeLoginForm.vue
@@ -122,7 +122,7 @@
}
function goRegister() {
- Taro.navigateTo({
+ RouteHelper.navigateTo({
url: RouterPath.registerForm,
});
}
diff --git a/apps/taro/src/subpackages/recharge/electricBillRecharge/InnerPage.vue b/apps/taro/src/subpackages/recharge/electricBillRecharge/InnerPage.vue
index 20db8bc..f8fb5aa 100644
--- a/apps/taro/src/subpackages/recharge/electricBillRecharge/InnerPage.vue
+++ b/apps/taro/src/subpackages/recharge/electricBillRecharge/InnerPage.vue
@@ -16,7 +16,7 @@
const isDev = process.env.NODE_ENV === 'development';
function goPay(orderNo: string) {
- Taro.navigateTo({
+ RouteHelper.navigateTo({
url: `${RouterPath.selectPayType}?orderNo=${orderNo}&lifePayOrderType=${BlLifeRecharge.constants.LifePayOrderTypeEnum.鐢佃垂璁㈠崟}`,
});
}
diff --git a/apps/taro/src/subpackages/recharge/gasBillRecharge/InnerPage.vue b/apps/taro/src/subpackages/recharge/gasBillRecharge/InnerPage.vue
index beeabad..c07d7c2 100644
--- a/apps/taro/src/subpackages/recharge/gasBillRecharge/InnerPage.vue
+++ b/apps/taro/src/subpackages/recharge/gasBillRecharge/InnerPage.vue
@@ -16,7 +16,7 @@
const isDev = process.env.NODE_ENV === 'development';
function goPay(orderNo: string) {
- Taro.navigateTo({
+ RouteHelper.navigateTo({
url: `${RouterPath.selectPayType}?orderNo=${orderNo}&lifePayOrderType=${BlLifeRecharge.constants.LifePayOrderTypeEnum.鐕冩皵璁㈠崟}`,
});
}
diff --git a/apps/taro/src/subpackages/recharge/phoneBillRecharge/InnerPage.vue b/apps/taro/src/subpackages/recharge/phoneBillRecharge/InnerPage.vue
index 0f57138..3fc234e 100644
--- a/apps/taro/src/subpackages/recharge/phoneBillRecharge/InnerPage.vue
+++ b/apps/taro/src/subpackages/recharge/phoneBillRecharge/InnerPage.vue
@@ -16,7 +16,7 @@
const isDev = process.env.NODE_ENV === 'development';
function goPay(orderNo: string) {
- Taro.navigateTo({
+ RouteHelper.navigateTo({
url: `${RouterPath.selectPayType}?orderNo=${orderNo}&lifePayOrderType=${BlLifeRecharge.constants.LifePayOrderTypeEnum.璇濊垂璁㈠崟}`,
});
}
diff --git a/apps/taro/src/subpackages/userAccount/userAccountList/InnerPage.vue b/apps/taro/src/subpackages/userAccount/userAccountList/InnerPage.vue
index d29af0f..e9fe129 100644
--- a/apps/taro/src/subpackages/userAccount/userAccountList/InnerPage.vue
+++ b/apps/taro/src/subpackages/userAccount/userAccountList/InnerPage.vue
@@ -13,15 +13,15 @@
function handleGoEdit(row: UserAccountListOutput) {
if (row.lifePayType === LifeRechargeConstants.LifePayOrderTypeEnum.璇濊垂璁㈠崟) {
- Taro.navigateTo({
+ RouteHelper.navigateTo({
url: `${RouterPath.editPhoneUserAccount}?id=${row.id}`,
});
} else if (row.lifePayType === LifeRechargeConstants.LifePayOrderTypeEnum.鐢佃垂璁㈠崟) {
- Taro.navigateTo({
+ RouteHelper.navigateTo({
url: `${RouterPath.editElectricUserAccount}?id=${row.id}`,
});
} else if (row.lifePayType === LifeRechargeConstants.LifePayOrderTypeEnum.鐕冩皵璁㈠崟) {
- Taro.navigateTo({
+ RouteHelper.navigateTo({
url: `${RouterPath.editGasUserAccount}?id=${row.id}`,
});
}
diff --git a/apps/taro/src/utils/page.ts b/apps/taro/src/utils/page.ts
index 1652ec0..5906af5 100644
--- a/apps/taro/src/utils/page.ts
+++ b/apps/taro/src/utils/page.ts
@@ -12,7 +12,7 @@
if (pages.length > 1) {
Taro.navigateBack({ delta: delta });
} else {
- Taro.switchTab({
+ RouteHelper.switchTab({
url: Object.values(TabBarPageRouter)[systemStore.activeTab],
});
}
@@ -21,7 +21,7 @@
export function goHome() {
const systemStore = useSystemStoreWithOut();
systemStore.setTabIndex(0);
- Taro.switchTab({
+ RouteHelper.switchTab({
url: TabBarPageRouter['Home'],
});
}
@@ -49,7 +49,7 @@
}
static navigateTo(option: Taro.navigateTo.Option) {
- Taro.navigateTo({
+ return Taro.navigateTo({
...option,
url: pathAddExtraParam(option.url, { channelId: blLifeRecharge.accountModel.channlesNum }),
});
--
Gitblit v1.9.1