From 3ee683d6b002f098e5b7fed11b54615126d82a3c Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 24 二月 2025 10:57:26 +0800
Subject: [PATCH] fix: 对接
---
packages/components/src/views/electricBillRecharge/electricBillRecharge.vue | 104 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 83 insertions(+), 21 deletions(-)
diff --git a/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue b/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
index b072c16..752316a 100644
--- a/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
+++ b/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
@@ -4,13 +4,48 @@
ref="formRef"
:rules="rules"
label-position="top"
- class="phone-bill-recharge"
+ class="order-bill-recharge electric"
>
- <FormItem label="鍏呭�兼墜鏈哄彿" class="bole-form-item" prop="phone" required>
+ <FormItem label="鎵�鍦ㄥ煄甯�" class="bole-form-item" prop="province" required>
+ <ChooseInputWithPicker
+ v-model="form.province"
+ placeholder="璇烽�夋嫨鍩庡競"
+ :value-enum="IspCodeText"
+ />
+ </FormItem>
+ <FormItem label="鐢电綉绫诲瀷" class="bole-form-item" prop="electricType" required>
+ <ChooseInputWithPicker
+ v-model="form.electricType"
+ placeholder="璇烽�夋嫨鐢电綉绫诲瀷"
+ :value-enum="blLifeRecharge.constants.ElectricTypeText"
+ />
+ </FormItem>
+ <FormItem label="鐢佃垂绫诲瀷" class="bole-form-item" prop="electricAccountType" required>
+ <ChooseInputWithPicker
+ v-model="form.electricAccountType"
+ placeholder="璇烽�夋嫨鐢佃垂绫诲瀷"
+ :value-enum="blLifeRecharge.constants.ElectricAccountTypeText"
+ />
+ </FormItem>
+ <FormItem label="鐢电綉鎴峰彿" class="bole-form-item" prop="electricAccount" required>
<Input
- v-model.trim="form.phone"
+ v-model.trim="form.electricAccount"
class="bole-input-text"
- placeholder="璇峰～鍐欐偍闇�瑕佸厖鍊肩殑鎵嬫満鍙风爜"
+ placeholder="璇疯緭鍏�13浣嶆暟瀛楃紪鍙�"
+ type="text"
+ />
+ </FormItem>
+ <FormItem
+ v-if="form.electricType === blLifeRecharge.constants.ElectricType.nanwang"
+ label="韬唤璇佸悗鍏綅"
+ class="bole-form-item"
+ prop="sixID"
+ required
+ >
+ <Input
+ v-model.trim="form.sixID"
+ class="bole-input-text"
+ placeholder="璇疯緭鍏ヨ韩浠借瘉鍚庡叚浣�"
type="text"
/>
</FormItem>
@@ -30,9 +65,11 @@
</div>
<div class="price-wrapper">
<div class="price-text">鎶樺悗</div>
- <div class="price">{{ blLifeRecharge.getRechargeParValue(item, rate) }}鍏�</div>
+ <div class="price">
+ {{ blLifeRecharge.getRechargeParValue(item, lifePayElectricRate) }}鍏�
+ </div>
</div>
- <div class="discountTag">{{ rate * 100 }}鎶�</div>
+ <div class="discountTag">{{ lifePayElectricRate * 100 }}鎶�</div>
</div>
</Radio>
</RadioGroup>
@@ -40,18 +77,25 @@
<div class="common-content">
<nut-button class="recharge-button" type="primary" @click="recharge">
<div class="recharge-button-inner">
- <div>锟{ form.parValue }}</div>
+ <div>锟{ realParValue }}</div>
<div class="recharge-button-text">绔嬪嵆鍏呭��</div>
</div>
</nut-button>
<RechargeTipsView :tips="tips" />
</div>
<ConfirmDialog v-model:visible="confirmDialogVisible" @ok="goPay">
+ <template #tips>
+ 璇ヤ骇鍝佷负鎱㈠厖妯″紡锛�0-72灏忔椂鍐呭埌璐︼紝浠嬫剰璇峰嬁浠樻锛佸厖鍊煎墠璇蜂粩缁嗛槄璇诲厖鍊奸』鐭ワ紒
+ </template>
<template #info>
- <ConfirmDialogInfoItem label="鍏呭�艰处鍙�" content="18858418480" />
- <ConfirmDialogInfoItem label="鍏呭�奸噾棰�" :content="`锟�${form.parValue}`" danger />
- <ConfirmDialogInfoItem label="浼樻儬閲戦" :content="`锟�${discountParValue}`" />
+ <ConfirmDialogInfoItem label="鐢电綉绫诲瀷" content="鍥藉鐢电綉" />
+ <ConfirmDialogInfoItem label="鐢佃垂绫诲瀷" content="浣忓畢" />
+ <ConfirmDialogInfoItem label="鍏呭�奸噾棰�" :content="`锟�${form.parValue.toFixed(2)}`" danger />
+ <ConfirmDialogInfoItem label="浼樻儬閲戦" :content="`锟�${discountParValue.toFixed(2)}`" />
<ConfirmDialogInfoItem label="瀹炰粯閲戦" :content="`锟�${realParValue}`" danger />
+ </template>
+ <template #warning>
+ 鍚屼竴鐢佃垂璐︽埛鍦ㄥ厖鍊兼湡闂达紝鏈埌璐﹀墠鍒囧嬁鍦ㄥ叾浠栦换浣曞钩鍙板啀娆″厖鍊笺�傚洜姝ら�犳垚鐨勮祫閲戞崯澶遍』鐢ㄦ埛鑷鎵挎媴锛侊紒锛�
</template>
</ConfirmDialog>
</Form>
@@ -61,12 +105,13 @@
import { Form, FormItem, RadioGroup, Radio, Input, Button as NutButton } from '@nutui/nutui-taro';
import { FormRules } from '@nutui/nutui-taro/dist/types/__VUE/form/types';
import { reactive, ref, computed } from 'vue';
-import BlRadio from '../../components/Radio/Radio.vue';
import { IspCodeText, IspCode } from '../../constants';
-import { useLifeRechargeContext } from '../../utils';
+import { useLifeRechargeContext } from '@life-payment/core-vue';
import RechargeTipsView from '../../components/RechargeTipsView/RechargeTipsView.vue';
import ConfirmDialog from '../../components/Dialog/ConfirmDialog.vue';
import ConfirmDialogInfoItem from '../../components/Dialog/ConfirmDialogInfoItem.vue';
+import ChooseInputWithPicker from '../../components/Input/ChooseInputWithPicker.vue';
+import { useGetRate, useGetElectricParValue } from '../../hooks';
defineOptions({
name: 'electricBillRecharge',
@@ -78,15 +123,22 @@
const form = reactive({
ispCode: IspCode.yidong,
- phone: '',
parValue: 100,
+ electricAccount: '',
+ electricType: '',
+ electricAccountType: '',
+ province: '',
+ sixID: '',
});
-const rate = 0.96;
+const { lifePayElectricRate } = useGetRate();
+const { electricParValueList } = useGetElectricParValue();
-const parValueList = [50, 100, 200];
+const parValueList = [100, 200, 300, 400, 500, 600, 700, 800, 900, 1000, 1500, 2000, 3000];
-const realParValue = computed(() => blLifeRecharge.getRechargeParValue(form.parValue, rate));
+const realParValue = computed(() =>
+ blLifeRecharge.getRechargeParValue(form.parValue, lifePayElectricRate.value)
+);
const discountParValue = computed(() => form.parValue - Number(realParValue.value));
const { blLifeRecharge } = useLifeRechargeContext();
@@ -104,12 +156,11 @@
}
const tips = [
- '骞冲彴鎻愪緵鎱㈠厖鏈嶅姟锛岃鍗曟彁浜ゅ悗锛岃瘽璐瑰皢浜�0 - 24灏忔椂鍐呭埌璐︺�傝嫢鏈兘鎸夋椂鍒拌处锛岀郴缁熷皢鑷姩鍙戣捣閫�娆俱��',
- '鍏呭�兼湡闂达紝鑻ュ悓涓�鍙风爜娆鹃」鏈埌璐︼紝璇峰嬁鍦ㄥ叾浠栧钩鍙伴噸澶嶅厖鍊硷紱涓诲壇鍗′笉鍙悓鏃跺厖鍊笺�傚洜涓婅堪鎿嶄綔瀵艰嚧鐨勮祫閲戞崯澶憋紝鐢辩敤鎴疯嚜琛屾壙鎷呫��',
- '鏈钩鍙拌瘽璐瑰厖鍊兼湇鍔′笉閫傜敤浜庡凡鍋滄満鍙风爜銆傜數淇″彿鐮佽嫢鏈夋瑺璐癸紝涔熸棤娉曞畬鎴愬厖鍊笺�傜數淇″凡瀹屾垚缁存姢鐨勫尯鍩熷寘鎷細骞夸笢銆佹睙鑻忋�佹箹鍖椼�佸洓宸濄�佹睙瑗裤�佹渤鍖椼�佹渤鍗椼�佺寤恒�佽窘瀹併�傚叾瀹冨尯鍩熸鍦ㄥ垎鎵规杩涜缁存姢涓紝鍦ㄦ鏈熼棿鍙兘浼氬嚭鐜板厖鍊间笉鎴愬姛骞惰嚜鍔ㄩ��娆剧殑鎯呭喌锛岃鎮ㄨ皡瑙ｃ��',
+ '骞冲彴鎻愪緵鎱㈠厖鏈嶅姟锛岃鍗曟彁浜ゅ悗锛岀數璐瑰皢浜�0 - 72 灏忔椂鍐呭埌璐︼紝鑻ユ湭鑳芥寜鏃跺埌璐︼紝绯荤粺灏嗚嚜鍔ㄥ彂璧烽��娆俱��',
+ '鍏呭�兼湡闂达紝鑻ュ悓涓�璐︽埛鐨勫厖鍊兼鏈埌璐︼紝璇峰嬁鍦ㄥ叾浠栧钩鍙伴噸澶嶅厖鍊硷紝鍥犱笂杩版搷浣滃鑷寸殑璧勯噾鎹熷け锛岀敱鐢ㄦ埛鑷鎵挎媴銆�',
+ '涓虹‘淇濆厖鍊奸『鍒╄繘琛岋紝鐩墠骞冲彴涓嶆敮鎸佸娆犳閲戦瓒呰繃1000鍏冪殑璐︽埛杩涜鍏呭�硷紝涓旀瘡娆″厖鍊奸噾棰濆繀椤婚珮浜庢瑺璐规�婚銆�',
'濡傛帴鍒伴檶鐢熸潵鐢碉紝瀵规柟浠ョ即璐规垨璇搷浣滅瓑鐞嗙敱瑕佹眰澶勭悊娆鹃」锛屽姟蹇呯珛鍗虫媺榛戯紝璋ㄩ槻璇堥獥銆�',
- '鍞悗鏈嶅姟鏈熶负鍏呭�煎畬鎴愪箣鏃ヨ捣3澶┿�傜敵璇峰敭鍚庢湇鍔℃椂锛岄渶鎻愪緵褰曞睆璇佹嵁锛岃纭鎺ュ彈姝よ姹傚悗鍐嶄笅鍗曪紝閫炬湡骞冲彴涓嶅啀鍙楃悊鍞悗鐢宠銆�',
- '鍏呭�煎彂绁ㄧ敱杩愯惀鍟嗘彁渚涳紝鎮ㄥ彲鐧诲綍缃戜笂钀ヤ笟鍘呬笅杞界數瀛愬彂绁ㄣ��',
+ '涓嬪崟鏃讹紝璇锋偍鍔″繀鍑嗙‘濉啓瀹屾暣鐨勭渷甯傚強鎴峰彿淇℃伅銆傚厖鍊煎畬鎴愬悗锛屽彂绁ㄧ敱杩愯惀鍟嗘彁渚涳紝鎮ㄥ彲鐧诲綍缃戜笂钀ヤ笟鍘呬笅杞藉搴旂殑鐢靛瓙鍙戠エ銆�',
];
const confirmDialogVisible = ref(false);
@@ -122,3 +173,14 @@
emit('goPay');
}
</script>
+<style lang="scss">
+.order-bill-recharge {
+ &.electric {
+ .nut-dialog {
+ .nut-dialog__content {
+ max-height: 700px;
+ }
+ }
+ }
+}
+</style>
--
Gitblit v1.9.1