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/GasBillRecharge/GasBillRecharge.vue | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/components/src/views/GasBillRecharge/GasBillRecharge.vue b/packages/components/src/views/GasBillRecharge/GasBillRecharge.vue index b3cd21d..4068c98 100644 --- a/packages/components/src/views/GasBillRecharge/GasBillRecharge.vue +++ b/packages/components/src/views/GasBillRecharge/GasBillRecharge.vue @@ -5,6 +5,7 @@ v-else-if="current === 'step3'" v-bind="props" @go-pay="emit('goPay', $event)" + @paySuccess="emit('paySuccess', $event)" /> </template> @@ -16,16 +17,13 @@ import GasBillRechargeStep2 from './GasBillRechargeStep2.vue'; import GasBillRechargeStep3 from './GasBillRechargeStep3.vue'; import { LifeRechargeConstants } from '@life-payment/core-vue'; +import { RechargeProps } from '../PhoneBillRecharge/types'; defineOptions({ name: 'GasBillRecharge', }); -type Props = { - isDev?: boolean; -}; - -const props = withDefaults(defineProps<Props>(), { +const props = withDefaults(defineProps<RechargeProps>(), { isDev: false, }); @@ -34,6 +32,7 @@ const emit = defineEmits<{ (e: 'goPay', orderNo: string): void; + (e: 'paySuccess', orderNo: string): void; }>(); const preSetForm = reactive({ -- Gitblit v1.9.1