From dca624a7e4c877dc4bfd8c496a6c2a6b29ad4b46 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期二, 25 三月 2025 10:16:37 +0800 Subject: [PATCH] fix: 四期需求 --- packages/components/src/views/electricBillRecharge/ElectricBillRechargeStep2.vue | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/components/src/views/electricBillRecharge/ElectricBillRechargeStep2.vue b/packages/components/src/views/electricBillRecharge/ElectricBillRechargeStep2.vue index 6a1a910..2426bed 100644 --- a/packages/components/src/views/electricBillRecharge/ElectricBillRechargeStep2.vue +++ b/packages/components/src/views/electricBillRecharge/ElectricBillRechargeStep2.vue @@ -153,6 +153,7 @@ currentUserAccountId: '', remark: '', lifePayType: initLifePayType(props.isInWeChat, props.isInAlipay), + name: '', }); const { userAccountAllList, handleUserAccountChange } = useSetUserAccountBySelect({ @@ -170,6 +171,7 @@ form.electricAccountType = currentUserAccountExtraProperties.electricAccountType; form.sixID = currentUserAccountExtraProperties.sixID; form.remark = currentUserAccount.remark; + form.name = currentUserAccountExtraProperties.name ?? ''; const electricParValueItem = electricParValueList.value.find( (x) => x.cityName === form.province ); @@ -213,6 +215,11 @@ const formRef = ref<any>(null); function handleSubmit() { + if (!form.name) { + state.show = true; + state.msg = '璇峰厛瀹屽杽鎵�灞炴埛涓诲鍚�'; + return; + } if (!formRef.value) return; formRef.value.validate().then(({ valid, errors }: any) => { if (valid) { @@ -228,10 +235,10 @@ } const { state, invokeAliPay, invokeWeixinPay } = useSelectPayType({ - openId: toRef(props, 'openId'), isInWeChat: toRef(props, 'isInWeChat'), isH5: toRef(props, 'isH5'), appId: toRef(props, 'appId'), + getOpenId: props.getOpenId, }); const currentOrderNo = ref(''); @@ -242,13 +249,14 @@ userId: blLifeRecharge.accountModel.userId, channelId: blLifeRecharge.accountModel.channlesNum, productData: { - parValue: props.isDev ? 0.1 : form.parValue, + parValue: form.parValue, electricType: form.electricType, electricAccountType: form.electricAccountType, electricAccount: form.electricAccount, province: form.province, city: form.city, sixID: form.sixID, + name: form.name, }, }; let res = await blLifeRecharge.services.createLifePayElectricOrder(params); -- Gitblit v1.9.1