From 9e5a47d90455c4770815d32899f660b53fc27110 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 22 五月 2025 13:26:09 +0800
Subject: [PATCH] Merge branch 'dev-ui' of http://120.26.58.240:8888/r/LifePaymentFront into dev-ui
---
packages/components/src/hooks/selectPayType.ts | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/packages/components/src/hooks/selectPayType.ts b/packages/components/src/hooks/selectPayType.ts
index c2a4931..5a729ab 100644
--- a/packages/components/src/hooks/selectPayType.ts
+++ b/packages/components/src/hooks/selectPayType.ts
@@ -9,14 +9,14 @@
import Taro from '@tarojs/taro';
type UseSelectPayTypeOptions = {
- openId?: MaybeRef<string>;
isInWeChat?: MaybeRef<boolean>;
isH5?: MaybeRef<boolean>;
appId?: MaybeRef<string>;
+ getOpenId?: MaybeRef<() => Promise<string>>;
};
export function useSelectPayType(options: UseSelectPayTypeOptions = {}) {
- const { openId, isInWeChat, isH5, appId } = options;
+ const { isInWeChat, isH5, appId, getOpenId } = options;
const { blLifeRecharge } = useLifeRechargeContext();
@@ -34,7 +34,9 @@
if (res) {
location.href = res;
}
- } catch (error) {}
+ } catch (error) {
+ throw error;
+ }
}
async function setLifePayOrderPayType(
@@ -47,7 +49,9 @@
lifePayType: lifePayType,
};
return await blLifeRecharge.services.setLifePayOrderPayType(params);
- } catch (error) {}
+ } catch (error) {
+ throw error;
+ }
}
async function invokeWeixinPay(orderNo: string) {
@@ -87,21 +91,27 @@
fail: function (res) {},
});
}
- } catch (error) {}
+ } catch (error) {
+ throw error;
+ }
}
async function getPayOrderForJsAPI(orderNo: string) {
try {
+ const _getOpenId = unref(getOpenId);
+ const openId = await _getOpenId();
let params: GetPayOrderForJsAPIInput = {
orderNo: orderNo,
lifePayType: blLifeRecharge.constants.LifePayTypeEnum.WxPay,
- openId: unref(openId),
+ openId: openId,
attach: Date.now().toString(),
payAppId: unref(appId),
};
let res = await blLifeRecharge.services.getPayOrderForJsAPI(params);
return res;
- } catch (error) {}
+ } catch (error) {
+ throw error;
+ }
}
async function handleWeixinPayByJsApi(orderNo: string) {
@@ -109,9 +119,7 @@
let res = await getPayOrderForJsAPI(orderNo);
if (res) {
- //@ts-ignore
if (WeixinJSBridge) {
- //@ts-ignore
WeixinJSBridge.invoke(
'getBrandWCPayRequest',
{
@@ -137,7 +145,9 @@
);
}
}
- } catch (error) {}
+ } catch (error) {
+ throw error;
+ }
}
return {
@@ -159,7 +169,7 @@
const { blLifeRecharge } = useLifeRechargeContext();
useQuery({
- queryKey: ['platformServicePayServices/getPayStatusByOrderNo', orderNo],
+ queryKey: ['blLifeRecharge/getPayStatusByOrderNo', orderNo],
queryFn: async () => {
return await blLifeRecharge.services.getPayStatusByOrderNo(
{
--
Gitblit v1.9.1