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/electricBillRecharge/ElectricBillRechargeStep2.vue | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/packages/components/src/views/electricBillRecharge/ElectricBillRechargeStep2.vue b/packages/components/src/views/electricBillRecharge/ElectricBillRechargeStep2.vue
index ce6c1ee..3cc9c7b 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) {
@@ -249,6 +256,7 @@
province: form.province,
city: form.city,
sixID: form.sixID,
+ name: form.name,
},
};
let res = await blLifeRecharge.services.createLifePayElectricOrder(params);
--
Gitblit v1.9.1