From dd7d743197d2cbb2aa0626a55d3a8cc20cce4295 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 24 二月 2025 13:14:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentFront
---
packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue b/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue
index 1511491..4306ee6 100644
--- a/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue
+++ b/packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue
@@ -14,21 +14,23 @@
<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,
LifeRechargeConstants,
-} from '../../utils';
+} from '@life-payment/core-vue';
import { useQuery } from '@tanstack/vue-query';
defineOptions({
name: 'SelectPayTypeView',
});
-// type Props = {};
+type Props = {
+ orderNo?: string;
+ lifePayOrderType?: LifeRechargeConstants.LifePayOrderTypeEnum;
+};
-// const props = withDefaults(defineProps<Props>(), {});
+const props = withDefaults(defineProps<Props>(), {});
const emit = defineEmits<{
(
@@ -37,10 +39,6 @@
lifePayOrderType: LifeRechargeConstants.LifePayOrderTypeEnum
): void;
}>();
-
-const router = Taro.useRouter();
-const orderNo = router.params?.orderNo ?? '';
-const lifePayOrderType = Number(router.params?.lifePayOrderType ?? '');
const { blLifeRecharge } = useLifeRechargeContext();
@@ -56,7 +54,7 @@
async function setLifePayOrderPayType(lifePayType: LifeRechargeConstants.LifePayTypeEnum) {
try {
let params: SetLifePayOrderPayTypeInput = {
- orderNo: orderNo,
+ orderNo: props.orderNo,
lifePayType: lifePayType,
};
return await blLifeRecharge.services.setLifePayOrderPayType(params);
@@ -64,11 +62,11 @@
}
useQuery({
- queryKey: ['platformServicePayServices/getPayStatusByOrderNo', orderNo],
+ queryKey: ['platformServicePayServices/getPayStatusByOrderNo', props.orderNo],
queryFn: async () => {
return await blLifeRecharge.services.getPayStatusByOrderNo(
{
- orderNo,
+ orderNo: props.orderNo,
},
{
showLoading: false,
@@ -77,7 +75,7 @@
},
onSuccess(data) {
if (data === blLifeRecharge.constants.LifePayStatusEnum.宸叉敮浠�) {
- emit('paySuccess', orderNo, lifePayOrderType);
+ emit('paySuccess', props.orderNo, props.lifePayOrderType);
}
},
refetchInterval: 1000 * 3,
--
Gitblit v1.9.1