From 60b9c62a3165f304a933cbac304ac3d43a24f722 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 17 四月 2025 09:25:09 +0800
Subject: [PATCH] fix: 优化
---
packages/components/src/views/electricBillRecharge/electricBillRecharge.vue | 241 ++++-------------------------------------------
1 files changed, 22 insertions(+), 219 deletions(-)
diff --git a/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue b/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
index 55fc42a..83e9ab9 100644
--- a/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
+++ b/packages/components/src/views/electricBillRecharge/electricBillRecharge.vue
@@ -1,237 +1,40 @@
<template>
- <NutForm
- :model-value="form"
- ref="formRef"
- :rules="rules"
- label-position="top"
- class="order-bill-recharge electric"
- >
- <FormItem label="鎵�鍦ㄥ煄甯�" class="bole-form-item" prop="province" required>
- <ChooseInputWithPicker
- v-model="form.province"
- placeholder="璇烽�夋嫨鍩庡競"
- :value-enum="electricParValueList"
- enum-label-key="areaName"
- enum-value-key="areaName"
- />
- </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>
- <NutInput
- 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
- >
- <NutInput
- v-model.trim="form.sixID"
- class="bole-input-text"
- placeholder="璇疯緭鍏ヨ韩浠借瘉鍚庡叚浣�"
- type="text"
- />
- </FormItem>
- <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"
- v-for="item in parValueList"
- class="parValue-item"
- >
- <div class="parValue-item-inner">
- <div class="amount-wrapper">
- <div class="amount">{{ item }}</div>
- <div class="unit">鍏�</div>
- </div>
- <div class="price-wrapper">
- <div class="price-text">鎶樺悗</div>
- <div class="price">
- {{ blLifeRecharge.getRechargeParValue(item, lifePayElectricRate) }}鍏�
- </div>
- </div>
- <div class="discountTag">{{ lifePayElectricRate * 100 }}鎶�</div>
- </div>
- </NutRadio>
- </NutRadioGroup>
- </FormItem>
- <div class="common-content">
- <nut-button class="recharge-button" type="primary" @click="handleSubmit">
- <div class="recharge-button-inner">
- <div>锟{ form.parValue }}</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="鍥藉鐢电綉" />
- <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>
- </NutForm>
+ <ElectricBillRechargeStep1 v-if="current === 'step1'" />
+ <ElectricBillRechargeStep2
+ v-else-if="current === 'step2'"
+ v-bind="props"
+ @go-pay="emit('goPay', $event)"
+ @paySuccess="emit('paySuccess', $event)"
+ @missName="emit('missName', $event)"
+ />
</template>
<script setup lang="ts">
-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 {
- useLifeRechargeContext,
- BlLifeRecharge,
- LifeElectricDataCreateLifePayOrderInput,
-} 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';
-import { FormValidator } from '../../utils';
+import { computed, provide } from 'vue';
+import { useStepper } from 'senin-mini/hooks';
+import { ElectricBillRechargeContextKey } from './context';
+import ElectricBillRechargeStep1 from './ElectricBillRechargeStep1.vue';
+import ElectricBillRechargeStep2 from './ElectricBillRechargeStep2.vue';
+import { RechargeProps } from '../PhoneBillRecharge/types';
defineOptions({
name: 'electricBillRecharge',
});
-type Props = {
- isDev?: boolean;
-};
-
-const props = withDefaults(defineProps<Props>(), {
+const props = withDefaults(defineProps<RechargeProps>(), {
isDev: false,
});
const emit = defineEmits<{
(e: 'goPay', orderNo: string): void;
+ (e: 'paySuccess', orderNo: string): void;
+ (e: 'missName', userAccountId: string): void;
}>();
-const form = reactive({
- parValue: 0,
- electricAccount: '',
- electricType: '',
- electricAccountType: '',
- province: '',
- sixID: '',
+const stepperInfo = useStepper(['step1', 'step2'], 'step2');
+const current = computed(() => stepperInfo.current.value);
+
+provide(ElectricBillRechargeContextKey, {
+ ...stepperInfo,
});
-
-const { lifePayElectricRate } = useGetRate();
-const { electricParValueList } = useGetElectricParValue();
-
-const parValueList = computed(
- () => electricParValueList.value.find((x) => x.areaName === form.province)?.parValue ?? []
-);
-
-watch(
- () => form.province,
- (provinceName) => {
- const electricParValue = electricParValueList.value.find(
- (item) => item.areaName === provinceName
- );
- form.electricType = electricParValue.electricType;
- }
-);
-
-const realParValue = computed(() =>
- blLifeRecharge.getRechargeParValue(form.parValue, lifePayElectricRate.value)
-);
-const discountParValue = computed(() => form.parValue - Number(realParValue.value));
-
-const { blLifeRecharge } = useLifeRechargeContext();
-
-const rules = reactive<FormRules>({
- province: [{ required: true, message: '璇烽�夋嫨鎵�鍦ㄥ煄甯�' }],
- electricAccountType: [{ required: true, message: '璇烽�夋嫨鐢佃垂绫诲瀷' }],
- electricAccount: [{ required: true, message: '璇疯緭鍏ョ數缃戞埛鍙�' }],
- sixID: [{ required: true, message: '璇疯緭鍏ヨ韩浠借瘉鍚庡叚浣�' }],
- parValue: [
- { required: true, message: '璇烽�夋嫨鍏呭�奸噾棰�', validator: FormValidator.validatorNumberNotNull },
- ],
-});
-
-const formRef = ref<any>(null);
-
-function handleSubmit() {
- if (!formRef.value) return;
- formRef.value.validate().then(({ valid, errors }: any) => {
- if (valid) {
- recharge();
- }
- });
-}
-
-const tips = [
- '骞冲彴鎻愪緵鎱㈠厖鏈嶅姟锛岃鍗曟彁浜ゅ悗锛岀數璐瑰皢浜�0 - 72 灏忔椂鍐呭埌璐︼紝鑻ユ湭鑳芥寜鏃跺埌璐︼紝绯荤粺灏嗚嚜鍔ㄥ彂璧烽��娆俱��',
- '鍏呭�兼湡闂达紝鑻ュ悓涓�璐︽埛鐨勫厖鍊兼鏈埌璐︼紝璇峰嬁鍦ㄥ叾浠栧钩鍙伴噸澶嶅厖鍊硷紝鍥犱笂杩版搷浣滃鑷寸殑璧勯噾鎹熷け锛岀敱鐢ㄦ埛鑷鎵挎媴銆�',
- '涓虹‘淇濆厖鍊奸『鍒╄繘琛岋紝鐩墠骞冲彴涓嶆敮鎸佸娆犳閲戦瓒呰繃1000鍏冪殑璐︽埛杩涜鍏呭�硷紝涓旀瘡娆″厖鍊奸噾棰濆繀椤婚珮浜庢瑺璐规�婚銆�',
- '濡傛帴鍒伴檶鐢熸潵鐢碉紝瀵规柟浠ョ即璐规垨璇搷浣滅瓑鐞嗙敱瑕佹眰澶勭悊娆鹃」锛屽姟蹇呯珛鍗虫媺榛戯紝璋ㄩ槻璇堥獥銆�',
- '涓嬪崟鏃讹紝璇锋偍鍔″繀鍑嗙‘濉啓瀹屾暣鐨勭渷甯傚強鎴峰彿淇℃伅銆傚厖鍊煎畬鎴愬悗锛屽彂绁ㄧ敱杩愯惀鍟嗘彁渚涳紝鎮ㄥ彲鐧诲綍缃戜笂钀ヤ笟鍘呬笅杞藉搴旂殑鐢靛瓙鍙戠エ銆�',
-];
-
-const confirmDialogVisible = ref(false);
-
-function recharge() {
- confirmDialogVisible.value = true;
-}
-
-async function goPay() {
- try {
- let params: LifeElectricDataCreateLifePayOrderInput = {
- userId: blLifeRecharge.accountModel.userId,
- productData: {
- parValue: props.isDev ? 0.1 : form.parValue,
- electricType: form.electricType,
- electricAccountType: form.electricAccountType,
- electricAccount: form.electricAccount,
- province: form.province,
- city: '',
- sixID: form.sixID,
- },
- };
- let res = await blLifeRecharge.services.createLifePayElectricOrder(params);
- emit('goPay', res.orderNo);
- } catch (error) {}
-}
</script>
--
Gitblit v1.9.1