From b11477657850db16d375f4789439a61e4cfa1a4a Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期二, 25 三月 2025 17:08:12 +0800 Subject: [PATCH] Merge branch 'master' into dev-1.3 --- packages/components/src/hooks/selectPayType.ts | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) 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, -- Gitblit v1.9.1