From 9e72ccd8e8bf0362dde6e6df9410fedbf79115be Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 25 二月 2025 16:53:07 +0800
Subject: [PATCH] fix: 对接

---
 packages/components/src/views/electricBillRecharge/electricBillRecharge.vue |   39 ++++++++++++++++++++++++++++-----------
 1 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue b/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
index d7f4033..cb77357 100644
--- a/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
+++ b/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
@@ -1,5 +1,5 @@
 <template>
-  <Form
+  <NutForm
     :model-value="form"
     ref="formRef"
     :rules="rules"
@@ -30,7 +30,7 @@
       />
     </FormItem>
     <FormItem label="鐢电綉鎴峰彿" class="bole-form-item" prop="electricAccount" required>
-      <Input
+      <NutInput
         v-model.trim="form.electricAccount"
         class="bole-input-text"
         placeholder="璇疯緭鍏�13浣嶆暟瀛楃紪鍙�"
@@ -44,16 +44,22 @@
       prop="sixID"
       required
     >
-      <Input
+      <NutInput
         v-model.trim="form.sixID"
         class="bole-input-text"
         placeholder="璇疯緭鍏ヨ韩浠借瘉鍚庡叚浣�"
         type="text"
       />
     </FormItem>
-    <FormItem label="閫夋嫨鍏呭�奸噾棰�" class="bole-form-item" prop="parValue" required>
-      <RadioGroup v-model="form.parValue" direction="horizontal" class="parValue-radio-group">
-        <Radio
+    <FormItem
+      v-if="!!form.province"
+      label="閫夋嫨鍏呭�奸噾棰�"
+      class="bole-form-item"
+      prop="parValue"
+      required
+    >
+      <NutRadioGroup v-model="form.parValue" direction="horizontal" class="parValue-radio-group">
+        <NutRadio
           :label="Number(item)"
           :key="item"
           shape="button"
@@ -73,8 +79,8 @@
             </div>
             <div class="discountTag">{{ lifePayElectricRate * 100 }}鎶�</div>
           </div>
-        </Radio>
-      </RadioGroup>
+        </NutRadio>
+      </NutRadioGroup>
     </FormItem>
     <div class="common-content">
       <nut-button class="recharge-button" type="primary" @click="handleSubmit">
@@ -90,7 +96,10 @@
         璇ヤ骇鍝佷负鎱㈠厖妯″紡锛�0-72灏忔椂鍐呭埌璐︼紝浠嬫剰璇峰嬁浠樻锛佸厖鍊煎墠璇蜂粩缁嗛槄璇诲厖鍊奸』鐭ワ紒
       </template>
       <template #info>
-        <ConfirmDialogInfoItem label="鐢电綉绫诲瀷" content="鍥藉鐢电綉" />
+        <ConfirmDialogInfoItem
+          label="鐢电綉绫诲瀷"
+          :content="blLifeRecharge.constants.ElectricTypeText[form.electricType]"
+        />
         <ConfirmDialogInfoItem label="鐢佃垂绫诲瀷" content="浣忓畢" />
         <ConfirmDialogInfoItem label="鍏呭�奸噾棰�" :content="`锟�${form.parValue.toFixed(2)}`" danger />
         <ConfirmDialogInfoItem label="浼樻儬閲戦" :content="`锟�${discountParValue.toFixed(2)}`" />
@@ -100,11 +109,18 @@
         鍚屼竴鐢佃垂璐︽埛鍦ㄥ厖鍊兼湡闂达紝鏈埌璐﹀墠鍒囧嬁鍦ㄥ叾浠栦换浣曞钩鍙板啀娆″厖鍊笺�傚洜姝ら�犳垚鐨勮祫閲戞崯澶遍』鐢ㄦ埛鑷鎵挎媴锛侊紒锛�
       </template>
     </ConfirmDialog>
-  </Form>
+  </NutForm>
 </template>
 
 <script setup lang="ts">
-import { Form, FormItem, RadioGroup, Radio, Input, Button as NutButton } from '@nutui/nutui-taro';
+import {
+  Form as NutForm,
+  FormItem,
+  RadioGroup as NutRadioGroup,
+  Radio as NutRadio,
+  Input as NutInput,
+  Button as NutButton,
+} from '@nutui/nutui-taro';
 import { FormRules } from '@nutui/nutui-taro/dist/types/__VUE/form/types';
 import { reactive, ref, computed, watch } from 'vue';
 import {
@@ -169,6 +185,7 @@
 const { blLifeRecharge } = useLifeRechargeContext();
 
 const rules = reactive<FormRules>({
+  province: [{ required: true, message: '璇烽�夋嫨鎵�鍦ㄥ煄甯�' }],
   electricAccountType: [{ required: true, message: '璇烽�夋嫨鐢佃垂绫诲瀷' }],
   electricAccount: [{ required: true, message: '璇疯緭鍏ョ數缃戞埛鍙�' }],
   sixID: [{ required: true, message: '璇疯緭鍏ヨ韩浠借瘉鍚庡叚浣�' }],

--
Gitblit v1.9.1