From 866879aaf4b209e4820d21d11f9569e72dd6e0a5 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 10 三月 2025 18:00:26 +0800
Subject: [PATCH] fix: 二期需求
---
packages/components/src/views/electricBillRecharge/electricBillRecharge.vue | 62 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 16 deletions(-)
diff --git a/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue b/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
index 55fc42a..96ee990 100644
--- a/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
+++ b/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
@@ -6,13 +6,22 @@
label-position="top"
class="order-bill-recharge electric"
>
- <FormItem label="鎵�鍦ㄥ煄甯�" class="bole-form-item" prop="province" required>
+ <FormItem label="鎵�鍦ㄥ尯鍩�" class="bole-form-item" prop="province" required>
<ChooseInputWithPicker
v-model="form.province"
- placeholder="璇烽�夋嫨鍩庡競"
+ placeholder="璇烽�夋嫨鍖哄煙"
:value-enum="electricParValueList"
- enum-label-key="areaName"
- enum-value-key="areaName"
+ enum-label-key="cityName"
+ enum-value-key="cityName"
+ />
+ </FormItem>
+ <FormItem label="鎵�鍦ㄥ煄甯�" class="bole-form-item" prop="city" required v-if="form.province">
+ <ChooseInputWithPicker
+ v-model="form.city"
+ placeholder="璇烽�夋嫨鍩庡競"
+ :value-enum="electricCityList"
+ enum-label-key="cityName"
+ enum-value-key="cityName"
/>
</FormItem>
<!-- <FormItem label="鐢电綉绫诲瀷" class="bole-form-item" prop="electricType" required>
@@ -30,11 +39,11 @@
/>
</FormItem>
<FormItem label="鐢电綉鎴峰彿" class="bole-form-item" prop="electricAccount" required>
- <NutInput
+ <NumberInput
v-model.trim="form.electricAccount"
class="bole-input-text"
placeholder="璇疯緭鍏�13浣嶆暟瀛楃紪鍙�"
- type="text"
+ max-length="13"
/>
</FormItem>
<FormItem
@@ -49,6 +58,7 @@
class="bole-input-text"
placeholder="璇疯緭鍏ヨ韩浠借瘉鍚庡叚浣�"
type="text"
+ max-length="6"
/>
</FormItem>
<FormItem
@@ -85,7 +95,7 @@
<div class="common-content">
<nut-button class="recharge-button" type="primary" @click="handleSubmit">
<div class="recharge-button-inner">
- <div>锟{ form.parValue }}</div>
+ <div>锟{ realParValue }}</div>
<div class="recharge-button-text">绔嬪嵆鍏呭��</div>
</div>
</nut-button>
@@ -96,8 +106,11 @@
璇ヤ骇鍝佷负鎱㈠厖妯″紡锛�0-72灏忔椂鍐呭埌璐︼紝浠嬫剰璇峰嬁浠樻锛佸厖鍊煎墠璇蜂粩缁嗛槄璇诲厖鍊奸』鐭ワ紒
</template>
<template #info>
- <ConfirmDialogInfoItem label="鐢电綉绫诲瀷" content="鍥藉鐢电綉" />
- <ConfirmDialogInfoItem label="鐢佃垂绫诲瀷" content="浣忓畢" />
+ <ConfirmDialogInfoItem
+ label="鐢电綉绫诲瀷"
+ :content="blLifeRecharge.constants.ElectricTypeText[form.electricType]"
+ />
+ <ConfirmDialogInfoItem :label-width="96" label="鎴峰彿" :content="form.electricAccount" />
<ConfirmDialogInfoItem label="鍏呭�奸噾棰�" :content="`锟�${form.parValue.toFixed(2)}`" danger />
<ConfirmDialogInfoItem label="浼樻儬閲戦" :content="`锟�${discountParValue.toFixed(2)}`" />
<ConfirmDialogInfoItem label="瀹炰粯閲戦" :content="`锟�${realParValue}`" danger />
@@ -129,8 +142,10 @@
import ConfirmDialog from '../../components/Dialog/ConfirmDialog.vue';
import ConfirmDialogInfoItem from '../../components/Dialog/ConfirmDialogInfoItem.vue';
import ChooseInputWithPicker from '../../components/Input/ChooseInputWithPicker.vue';
+import NumberInput from '../../components/Input/NumberInput.vue';
import { useGetRate, useGetElectricParValue } from '../../hooks';
import { FormValidator } from '../../utils';
+import { CustomerServiceTips } from '../../constants';
defineOptions({
name: 'electricBillRecharge',
@@ -154,21 +169,28 @@
electricType: '',
electricAccountType: '',
province: '',
+ city: '',
sixID: '',
});
const { lifePayElectricRate } = useGetRate();
const { electricParValueList } = useGetElectricParValue();
-const parValueList = computed(
- () => electricParValueList.value.find((x) => x.areaName === form.province)?.parValue ?? []
+const parValueList = computed(() => {
+ const parValueList =
+ electricParValueList.value.find((x) => x.cityName === form.province)?.parValue ?? [];
+ return blLifeRecharge.filterParValueList(parValueList);
+});
+
+const electricCityList = computed(
+ () => electricParValueList.value.find((x) => x.cityName === form.province)?.childCityList ?? []
);
watch(
() => form.province,
(provinceName) => {
const electricParValue = electricParValueList.value.find(
- (item) => item.areaName === provinceName
+ (item) => item.cityName === provinceName
);
form.electricType = electricParValue.electricType;
}
@@ -182,10 +204,17 @@
const { blLifeRecharge } = useLifeRechargeContext();
const rules = reactive<FormRules>({
- province: [{ required: true, message: '璇烽�夋嫨鎵�鍦ㄥ煄甯�' }],
+ province: [{ required: true, message: '璇烽�夋嫨鎵�鍦ㄥ尯鍩�' }],
+ city: [{ required: true, message: '璇烽�夋嫨鎵�鍦ㄥ煄甯�' }],
electricAccountType: [{ required: true, message: '璇烽�夋嫨鐢佃垂绫诲瀷' }],
- electricAccount: [{ required: true, message: '璇疯緭鍏ョ數缃戞埛鍙�' }],
- sixID: [{ required: true, message: '璇疯緭鍏ヨ韩浠借瘉鍚庡叚浣�' }],
+ electricAccount: [{ required: true, message: '璇疯緭鍏ョ數缃戞埛鍙�', regex: /^\d{13}$/ }],
+ sixID: [
+ {
+ required: true,
+ message: '璇疯緭鍏ヨ韩浠借瘉鍚庡叚浣�',
+ validator: FormValidator.validatorIDNumberSix,
+ },
+ ],
parValue: [
{ required: true, message: '璇烽�夋嫨鍏呭�奸噾棰�', validator: FormValidator.validatorNumberNotNull },
],
@@ -208,6 +237,7 @@
'涓虹‘淇濆厖鍊奸『鍒╄繘琛岋紝鐩墠骞冲彴涓嶆敮鎸佸娆犳閲戦瓒呰繃1000鍏冪殑璐︽埛杩涜鍏呭�硷紝涓旀瘡娆″厖鍊奸噾棰濆繀椤婚珮浜庢瑺璐规�婚銆�',
'濡傛帴鍒伴檶鐢熸潵鐢碉紝瀵规柟浠ョ即璐规垨璇搷浣滅瓑鐞嗙敱瑕佹眰澶勭悊娆鹃」锛屽姟蹇呯珛鍗虫媺榛戯紝璋ㄩ槻璇堥獥銆�',
'涓嬪崟鏃讹紝璇锋偍鍔″繀鍑嗙‘濉啓瀹屾暣鐨勭渷甯傚強鎴峰彿淇℃伅銆傚厖鍊煎畬鎴愬悗锛屽彂绁ㄧ敱杩愯惀鍟嗘彁渚涳紝鎮ㄥ彲鐧诲綍缃戜笂钀ヤ笟鍘呬笅杞藉搴旂殑鐢靛瓙鍙戠エ銆�',
+ CustomerServiceTips,
];
const confirmDialogVisible = ref(false);
@@ -226,7 +256,7 @@
electricAccountType: form.electricAccountType,
electricAccount: form.electricAccount,
province: form.province,
- city: '',
+ city: form.city,
sixID: form.sixID,
},
};
--
Gitblit v1.9.1