From dd7d743197d2cbb2aa0626a55d3a8cc20cce4295 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 24 二月 2025 13:14:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentFront
---
packages/components/src/views/electricBillRecharge/electricBillRecharge.vue | 73 +++++++++++++++++++++---------------
1 files changed, 42 insertions(+), 31 deletions(-)
diff --git a/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue b/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
index bd6ffdc..2cc012b 100644
--- a/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
+++ b/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
@@ -6,32 +6,46 @@
label-position="top"
class="order-bill-recharge electric"
>
- <FormItem label="鎵�鍦ㄥ煄甯�" class="bole-form-item" prop="type" required>
+ <FormItem label="鎵�鍦ㄥ煄甯�" class="bole-form-item" prop="province" required>
<ChooseInputWithPicker
- v-model="form.type"
+ v-model="form.province"
placeholder="璇烽�夋嫨鍩庡競"
:value-enum="IspCodeText"
/>
</FormItem>
- <FormItem label="鐢电綉绫诲瀷" class="bole-form-item" prop="type" required>
+ <FormItem label="鐢电綉绫诲瀷" class="bole-form-item" prop="electricType" required>
<ChooseInputWithPicker
- v-model="form.type"
+ v-model="form.electricType"
placeholder="璇烽�夋嫨鐢电綉绫诲瀷"
- :value-enum="IspCodeText"
+ :value-enum="blLifeRecharge.constants.ElectricTypeText"
/>
</FormItem>
- <FormItem label="鐢佃垂绫诲瀷" class="bole-form-item" prop="type" required>
+ <FormItem label="鐢佃垂绫诲瀷" class="bole-form-item" prop="electricAccountType" required>
<ChooseInputWithPicker
- v-model="form.type"
+ v-model="form.electricAccountType"
placeholder="璇烽�夋嫨鐢佃垂绫诲瀷"
- :value-enum="IspCodeText"
+ :value-enum="blLifeRecharge.constants.ElectricAccountTypeText"
/>
</FormItem>
- <FormItem label="鐢电綉鎴峰彿" class="bole-form-item" prop="phone" required>
+ <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="璇疯緭鍏�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>
@@ -51,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>
@@ -74,8 +90,8 @@
<template #info>
<ConfirmDialogInfoItem label="鐢电綉绫诲瀷" content="鍥藉鐢电綉" />
<ConfirmDialogInfoItem label="鐢佃垂绫诲瀷" content="浣忓畢" />
- <ConfirmDialogInfoItem label="鍏呭�奸噾棰�" :content="`锟�${form.parValue}`" danger />
- <ConfirmDialogInfoItem label="浼樻儬閲戦" :content="`锟�${discountParValue}`" />
+ <ConfirmDialogInfoItem label="鍏呭�奸噾棰�" :content="`锟�${form.parValue.toFixed(2)}`" danger />
+ <ConfirmDialogInfoItem label="浼樻儬閲戦" :content="`锟�${discountParValue.toFixed(2)}`" />
<ConfirmDialogInfoItem label="瀹炰粯閲戦" :content="`锟�${realParValue}`" danger />
</template>
<template #warning>
@@ -89,13 +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',
@@ -107,16 +123,22 @@
const form = reactive({
ispCode: IspCode.yidong,
- phone: '',
parValue: 100,
- type: IspCodeText.yidong,
+ electricAccount: '',
+ electricType: '',
+ electricAccountType: '',
+ province: '',
+ sixID: '',
});
-const rate = 0.96;
+const { lifePayElectricRate } = useGetRate();
+const { electricParValueList } = useGetElectricParValue();
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();
@@ -151,14 +173,3 @@
emit('goPay');
}
</script>
-<style lang="scss">
-.order-bill-recharge {
- &.electric {
- .nut-dialog {
- .nut-dialog__content {
- max-height: 700px;
- }
- }
- }
-}
-</style>
--
Gitblit v1.9.1