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/views/SelectPayTypeView/SelectPayTypeView.vue | 109 +++++++++++-------------------------------------------
1 files changed, 23 insertions(+), 86 deletions(-)
diff --git a/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue b/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue
index 4309f0c..2b50807 100644
--- a/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue
+++ b/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue
@@ -4,23 +4,21 @@
<img class="select-pay-type-view-item-icon" :src="IconAliPay" />
<div class="select-pay-type-view-item-text">鏀粯瀹濇敮浠�</div>
</div>
- <div class="select-pay-type-view-item" v-if="showWeixinPay" @click="handleWeixinPayByJsApi">
+ <div class="select-pay-type-view-item" v-if="showWeixinPay" @click="handleWeixinPay">
<img class="select-pay-type-view-item-icon" :src="IconWeixin" />
<div class="select-pay-type-view-item-text">寰俊鏀粯</div>
</div>
+ <NutToast :msg="state.msg" v-model:visible="state.show" type="warn" cover />
</div>
</template>
<script setup lang="ts">
-import IconWeixin from '../../../assets/icon-weixin-pay.png';
-import IconAliPay from '../../../assets/icon-alipay.png';
-import {
- useLifeRechargeContext,
- SetLifePayOrderPayTypeInput,
- LifeRechargeConstants,
- GetPayOrderForJsAPIInput,
-} from '@life-payment/core-vue';
-import { useQuery } from '@tanstack/vue-query';
+import IconWeixin from '../../assets/icon-weixin-pay.png';
+import IconAliPay from '../../assets/icon-alipay.png';
+import { LifeRechargeConstants } from '@life-payment/core-vue';
+import { Toast as NutToast } from '@nutui/nutui-taro';
+import { computed, toRef } from 'vue';
+import { useSelectPayType, useGetPayStatusByOrderNo } from '../../hooks/selectPayType';
defineOptions({
name: 'SelectPayTypeView',
@@ -31,10 +29,11 @@
lifePayOrderType?: LifeRechargeConstants.LifePayOrderTypeEnum;
showAliPay?: boolean;
showWeixinPay?: boolean;
- openId?: string;
isInWeChat?: boolean;
isH5?: boolean;
appId?: string;
+ isFocus?: boolean;
+ getOpenId?: () => Promise<string>;
};
const props = withDefaults(defineProps<Props>(), {
@@ -51,92 +50,30 @@
(e: 'payOrderForJsAPISuccess'): void;
}>();
-const { blLifeRecharge } = useLifeRechargeContext();
+const { state, invokeAliPay, invokeWeixinPay } = useSelectPayType({
+ getOpenId: toRef(props, 'getOpenId'),
+ isInWeChat: toRef(props, 'isInWeChat'),
+ isH5: toRef(props, 'isH5'),
+ appId: toRef(props, 'appId'),
+});
async function handleAliPay() {
try {
- let res = await setLifePayOrderPayType(blLifeRecharge.constants.LifePayTypeEnum.AliPay);
- if (res) {
- location.href = res;
- }
+ await invokeAliPay(props.orderNo);
} catch (error) {}
}
async function handleWeixinPay() {
- if (props.isH5) {
- if (props.isInWeChat) {
- handleWeixinPayByJsApi();
- } else {
- try {
- let res = await setLifePayOrderPayType(blLifeRecharge.constants.LifePayTypeEnum.WxPay);
- if (res) {
- location.href = res;
- }
- } catch (error) {}
- }
- }
-}
-
-async function handleWeixinPayByJsApi() {
try {
- let params: GetPayOrderForJsAPIInput = {
- orderNo: props.orderNo,
- lifePayType: blLifeRecharge.constants.LifePayTypeEnum.WxPay,
- openId: props.openId,
- attach: Date.now().toString(),
- };
- let res = await blLifeRecharge.services.getPayOrderForJsAPI(params);
- //@ts-ignore
- if (res && WeixinJSBridge) {
- //@ts-ignore
- WeixinJSBridge.invoke(
- 'getBrandWCPayRequest',
- {
- appId: props.appId, //鍏紬鍙稩D锛岀敱鍟嗘埛浼犲叆
- timeStamp: res.timestamp, //鏃堕棿鎴筹紝鑷�1970骞翠互鏉ョ殑绉掓暟
- nonceStr: res.nonceStr, //闅忔満涓�
- package: res.package,
- signType: res.signType, //寰俊绛惧悕鏂瑰紡锛�
- paySign: res.paySign, //寰俊绛惧悕
- },
- function (res) {
- if (res.err_msg == 'get_brand_wcpay_request:ok') {
- // 浣跨敤浠ヤ笂鏂瑰紡鍒ゆ柇鍓嶇杩斿洖,寰俊鍥㈤槦閮戦噸鎻愮ず锛�
- //res.err_msg灏嗗湪鐢ㄦ埛鏀粯鎴愬姛鍚庤繑鍥瀘k锛屼絾骞朵笉淇濊瘉瀹冪粷瀵瑰彲闈狅紝鍟嗘埛闇�杩涗竴姝ヨ皟鐢ㄥ悗绔煡鍗曠‘璁ゆ敮浠樼粨鏋溿��
- }
- }
- );
- }
+ await invokeWeixinPay(props.orderNo);
} catch (error) {}
}
-async function setLifePayOrderPayType(lifePayType: LifeRechargeConstants.LifePayTypeEnum) {
- try {
- let params: SetLifePayOrderPayTypeInput = {
- orderNo: props.orderNo,
- lifePayType: lifePayType,
- };
- return await blLifeRecharge.services.setLifePayOrderPayType(params);
- } catch (error) {}
-}
-
-useQuery({
- queryKey: ['platformServicePayServices/getPayStatusByOrderNo', props.orderNo],
- queryFn: async () => {
- return await blLifeRecharge.services.getPayStatusByOrderNo(
- {
- orderNo: props.orderNo,
- },
- {
- showLoading: false,
- }
- );
+useGetPayStatusByOrderNo({
+ orderNo: toRef(props, 'orderNo'),
+ enabled: computed(() => props.isFocus),
+ onPaySuccess() {
+ emit('paySuccess', props.orderNo, props.lifePayOrderType);
},
- onSuccess(data) {
- if (data === blLifeRecharge.constants.LifePayStatusEnum.宸叉敮浠�) {
- emit('paySuccess', props.orderNo, props.lifePayOrderType);
- }
- },
- refetchInterval: 1000 * 3,
});
</script>
--
Gitblit v1.9.1