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/GasBillRechargeStep3.vue | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/packages/components/src/views/GasBillRecharge/GasBillRechargeStep3.vue b/packages/components/src/views/GasBillRecharge/GasBillRechargeStep3.vue
index 6525540..5314fe3 100644
--- a/packages/components/src/views/GasBillRecharge/GasBillRechargeStep3.vue
+++ b/packages/components/src/views/GasBillRecharge/GasBillRechargeStep3.vue
@@ -155,6 +155,7 @@
remark: '',
areaList: [] as string[],
lifePayType: initLifePayType(props.isInWeChat, props.isInAlipay),
+ name: '',
});
const { userAccountAllList, handleUserAccountChange } = useSetUserAccountBySelect({
@@ -169,6 +170,7 @@
form.gasOrgType = currentUserAccount.operators;
form.remark = currentUserAccount.remark;
+ form.name = currentUserAccountExtraProperties.name ?? '';
const gasParValueItem = gasParValueList.value.find((x) => x.gasOrgCode === form.gasOrgType);
if (gasParValueItem && gasParValueItem.parValue.every((x) => Number(x) !== form.parValue)) {
form.parValue = 0;
@@ -205,6 +207,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) {
@@ -239,6 +246,7 @@
gasAccount: form.gasAccount,
province: form.areaList?.[0] ?? '',
city: form.areaList?.[1] ?? '',
+ name: form.name,
},
};
let res = await blLifeRecharge.services.createLifePayGasOrder(params);
--
Gitblit v1.9.1