From 58c6417603cc9e4c1012ba4fc4c6306dcb0e2324 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期一, 24 二月 2025 09:34:53 +0800 Subject: [PATCH] fix: 对接 --- packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue | 56 ++++++++++++++++++++++++++++++-------------------------- 1 files changed, 30 insertions(+), 26 deletions(-) diff --git a/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue b/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue index 6df3a0e..9561582 100644 --- a/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue +++ b/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue @@ -14,7 +14,6 @@ <script setup lang="ts"> import IconWeixin from '../../../assets/icon-weixin-pay.png'; import IconAliPay from '../../../assets/icon-alipay.png'; -import Taro from '@tarojs/taro'; import { useLifeRechargeContext, SetLifePayOrderPayTypeInput, @@ -26,16 +25,20 @@ name: 'SelectPayTypeView', }); -// type Props = {}; +type Props = { + orderNo?: string; + lifePayOrderType?: LifeRechargeConstants.LifePayOrderTypeEnum; +}; -// const props = withDefaults(defineProps<Props>(), {}); +const props = withDefaults(defineProps<Props>(), {}); const emit = defineEmits<{ - (e: 'paySuccess', id: number): void; + ( + e: 'paySuccess', + orderNo: string, + lifePayOrderType: LifeRechargeConstants.LifePayOrderTypeEnum + ): void; }>(); - -const router = Taro.useRouter(); -const orderNo = router.params?.orderNo ?? ''; const { blLifeRecharge } = useLifeRechargeContext(); @@ -51,29 +54,30 @@ async function setLifePayOrderPayType(lifePayType: LifeRechargeConstants.LifePayTypeEnum) { try { let params: SetLifePayOrderPayTypeInput = { - orderNo: orderNo, + orderNo: props.orderNo, lifePayType: lifePayType, }; return await blLifeRecharge.services.setLifePayOrderPayType(params); } catch (error) {} } -// useQuery({ -// queryKey: ['platformServicePayServices/getPlaformServicePayQRCode', orderNo], -// queryFn: async () => { -// return await blLifeRecharge.services.getPayStatusByOrderNo( -// { -// orderNo, -// }, -// { -// showLoading: false, -// } -// ); -// }, -// onSuccess(data) { -// if (data === blLifeRecharge.constants.LifePayStatusEnum.宸叉敮浠�) { -// } -// }, -// refetchInterval: 1000 * 3, -// }); +useQuery({ + queryKey: ['platformServicePayServices/getPayStatusByOrderNo', props.orderNo], + queryFn: async () => { + return await blLifeRecharge.services.getPayStatusByOrderNo( + { + orderNo: props.orderNo, + }, + { + showLoading: false, + } + ); + }, + onSuccess(data) { + if (data === blLifeRecharge.constants.LifePayStatusEnum.宸叉敮浠�) { + emit('paySuccess', props.orderNo, props.lifePayOrderType); + } + }, + refetchInterval: 1000 * 3, +}); </script> -- Gitblit v1.9.1