From c7ab8c4fca1c690f3e5536dff520eaa9c4010fd1 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 24 三月 2025 19:52:35 +0800
Subject: [PATCH] fix: 三期bug
---
packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue | 2 +-
apps/taro/src/hooks/user.ts | 22 ++++++++++++++++++----
packages/components/src/views/GasBillRecharge/GasBillRechargeStep3.vue | 2 +-
packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue | 2 +-
packages/components/src/hooks/selectPayType.ts | 5 +++--
packages/components/src/views/electricBillRecharge/ElectricBillRechargeStep2.vue | 2 +-
6 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/apps/taro/src/hooks/user.ts b/apps/taro/src/hooks/user.ts
index dfabcc6..b6523b1 100644
--- a/apps/taro/src/hooks/user.ts
+++ b/apps/taro/src/hooks/user.ts
@@ -6,7 +6,11 @@
import { useRefeshDidShow } from './infiniteLoading';
import { LoginFormTabs } from '@/subpackages/login/constants';
import { useLoginedJump } from './login';
-import { useLifeRechargeContext, APIgetLifePayWxIndentityParams } from '@life-payment/core-vue';
+import {
+ useLifeRechargeContext,
+ APIgetLifePayWxIndentityParams,
+ WxMiniAppIndentityInfo,
+} from '@life-payment/core-vue';
import { isInWeChat } from '@/utils/env';
export function useUser() {
@@ -101,6 +105,8 @@
});
}
+let wxIndentityPromise: Promise<WxMiniAppIndentityInfo>;
+
export function useLifePayWxIndentity() {
const { blLifeRecharge } = useLifeRechargeContext();
const userStore = useUserStore();
@@ -110,9 +116,17 @@
let params: APIgetLifePayWxIndentityParams = {
code: code,
};
- let res = await blLifeRecharge.services.getLifePayWxIndentity(params, {
- showLoading: false,
- });
+ if (!wxIndentityPromise) {
+ wxIndentityPromise = blLifeRecharge.services
+ .getLifePayWxIndentity(params, {
+ showLoading: false,
+ })
+ .finally(() => {
+ wxIndentityPromise = undefined;
+ });
+ }
+
+ let res = await wxIndentityPromise;
if (res.openId) {
userStore.setWxOpenId(res.openId);
}
diff --git a/packages/components/src/hooks/selectPayType.ts b/packages/components/src/hooks/selectPayType.ts
index ad03530..5a729ab 100644
--- a/packages/components/src/hooks/selectPayType.ts
+++ b/packages/components/src/hooks/selectPayType.ts
@@ -12,7 +12,7 @@
isInWeChat?: MaybeRef<boolean>;
isH5?: MaybeRef<boolean>;
appId?: MaybeRef<string>;
- getOpenId?: () => Promise<string>;
+ getOpenId?: MaybeRef<() => Promise<string>>;
};
export function useSelectPayType(options: UseSelectPayTypeOptions = {}) {
@@ -98,7 +98,8 @@
async function getPayOrderForJsAPI(orderNo: string) {
try {
- const openId = await getOpenId();
+ const _getOpenId = unref(getOpenId);
+ const openId = await _getOpenId();
let params: GetPayOrderForJsAPIInput = {
orderNo: orderNo,
lifePayType: blLifeRecharge.constants.LifePayTypeEnum.WxPay,
diff --git a/packages/components/src/views/GasBillRecharge/GasBillRechargeStep3.vue b/packages/components/src/views/GasBillRecharge/GasBillRechargeStep3.vue
index 4a4c43f..6525540 100644
--- a/packages/components/src/views/GasBillRecharge/GasBillRechargeStep3.vue
+++ b/packages/components/src/views/GasBillRecharge/GasBillRechargeStep3.vue
@@ -220,7 +220,7 @@
}
const { state, invokeAliPay, invokeWeixinPay } = useSelectPayType({
- getOpenId: props.getOpenId,
+ getOpenId: toRef(props, 'getOpenId'),
isInWeChat: toRef(props, 'isInWeChat'),
isH5: toRef(props, 'isH5'),
appId: toRef(props, 'appId'),
diff --git a/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue b/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue
index 89f670a..433e3ab 100644
--- a/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue
+++ b/packages/components/src/views/PhoneBillRecharge/PhoneBillRechargeStep2.vue
@@ -216,7 +216,7 @@
}
const { state, invokeAliPay, invokeWeixinPay } = useSelectPayType({
- getOpenId: props.getOpenId,
+ getOpenId: toRef(props, 'getOpenId'),
isInWeChat: toRef(props, 'isInWeChat'),
isH5: toRef(props, 'isH5'),
appId: toRef(props, 'appId'),
diff --git a/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue b/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue
index 57cc4e3..2b50807 100644
--- a/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue
+++ b/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue
@@ -51,7 +51,7 @@
}>();
const { state, invokeAliPay, invokeWeixinPay } = useSelectPayType({
- getOpenId: props.getOpenId,
+ getOpenId: toRef(props, 'getOpenId'),
isInWeChat: toRef(props, 'isInWeChat'),
isH5: toRef(props, 'isH5'),
appId: toRef(props, 'appId'),
diff --git a/packages/components/src/views/electricBillRecharge/ElectricBillRechargeStep2.vue b/packages/components/src/views/electricBillRecharge/ElectricBillRechargeStep2.vue
index b2cf93b..ce6c1ee 100644
--- a/packages/components/src/views/electricBillRecharge/ElectricBillRechargeStep2.vue
+++ b/packages/components/src/views/electricBillRecharge/ElectricBillRechargeStep2.vue
@@ -231,7 +231,7 @@
isInWeChat: toRef(props, 'isInWeChat'),
isH5: toRef(props, 'isH5'),
appId: toRef(props, 'appId'),
- getOpenId: props.getOpenId,
+ getOpenId: toRef(props, 'getOpenId'),
});
const currentOrderNo = ref('');
--
Gitblit v1.9.1