From 57857a130a6a0e32c7898477f5407286d13ffe15 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 26 二月 2025 15:39:44 +0800
Subject: [PATCH] fix: 对接
---
packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue | 161 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 119 insertions(+), 42 deletions(-)
diff --git a/packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue b/packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue
index f3d2d56..1e4764e 100644
--- a/packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue
+++ b/packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue
@@ -1,28 +1,47 @@
<template>
- <Form
+ <NutForm
:model-value="form"
ref="formRef"
:rules="rules"
label-position="top"
- class="phone-bill-recharge"
+ class="order-bill-recharge phone"
>
- <FormItem label="閫夋嫨杩愯惀鍟�:" class="bole-form-item" prop="ispCode" required>
- <RadioGroup v-model="form.ispCode" direction="horizontal">
- <BlRadio :label="key" v-for="(val, key) in IspCodeText" :key="key">{{ val }}</BlRadio>
- </RadioGroup>
- </FormItem>
- <FormItem label="鍏呭�兼墜鏈哄彿" class="bole-form-item" prop="phone" required>
- <Input
+ <NutFormItem label="閫夋嫨杩愯惀鍟�:" class="bole-form-item" prop="ispCode" required>
+ <NutRadioGroup v-model="form.ispCode" direction="horizontal" @change="changeIspCode">
+ <BlRadio
+ :label="key"
+ v-for="(val, key) in BlLifeRecharge.constants.IspCodeText"
+ :key="key"
+ >{{ val }}</BlRadio
+ >
+ </NutRadioGroup>
+ </NutFormItem>
+ <NutFormItem label="鍏呭�兼墜鏈哄彿" class="bole-form-item" prop="phone" required>
+ <NutInput
v-model.trim="form.phone"
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
- :label="item"
+ </NutFormItem>
+ <NutFormItem
+ label="濮撳悕"
+ class="bole-form-item"
+ prop="name"
+ required
+ v-if="form.ispCode === BlLifeRecharge.constants.IspCode.dianxin"
+ >
+ <NutInput
+ v-model.trim="form.name"
+ class="bole-input-text"
+ placeholder="璇峰～鍐欐偍鐨勫鍚�"
+ type="text"
+ />
+ </NutFormItem>
+ <NutFormItem 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"
@@ -35,17 +54,19 @@
</div>
<div class="price-wrapper">
<div class="price-text">鎶樺悗</div>
- <div class="price">{{ blLifeRecharge.getRechargeParValue(item, rate) }}鍏�</div>
+ <div class="price">
+ {{ blLifeRecharge.getRechargeParValue(item, lifePayPhoneRate) }}鍏�
+ </div>
</div>
- <div class="discountTag">{{ rate * 100 }}鎶�</div>
+ <div class="discountTag">{{ lifePayPhoneRate * 100 }}鎶�</div>
</div>
- </Radio>
- </RadioGroup>
- </FormItem>
+ </NutRadio>
+ </NutRadioGroup>
+ </NutFormItem>
<div class="common-content">
- <nut-button class="recharge-button" type="primary" @click="recharge">
+ <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>
@@ -53,50 +74,94 @@
</div>
<ConfirmDialog v-model:visible="confirmDialogVisible" @ok="goPay">
<template #info>
- <ConfirmDialogInfoItem label="鍏呭�艰处鍙�" content="18858418480" />
- <ConfirmDialogInfoItem label="鍏呭�奸噾棰�" :content="`锟�${form.parValue}`" danger />
- <ConfirmDialogInfoItem label="浼樻儬閲戦" :content="`锟�${discountParValue}`" />
+ <ConfirmDialogInfoItem label="鍏呭�艰处鍙�" :content="form.phone" />
+ <ConfirmDialogInfoItem label="鍏呭�奸噾棰�" :content="`锟�${form.parValue.toFixed(2)}`" danger />
+ <ConfirmDialogInfoItem label="浼樻儬閲戦" :content="`锟�${discountParValue.toFixed(2)}`" />
<ConfirmDialogInfoItem label="瀹炰粯閲戦" :content="`锟�${realParValue}`" danger />
</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 as NutFormItem,
+ 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 } from 'vue';
import BlRadio from '../../components/Radio/Radio.vue';
-import { IspCodeText, IspCode } from '../../constants';
-import { useLifeRechargeContext } from '../../utils';
+import { FormValidator } from '../../utils';
+import {
+ useLifeRechargeContext,
+ BlLifeRecharge,
+ LifePhoneDataCreateLifePayOrderInput,
+ LifeRechargeConstants,
+} 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 { useGetRate, useGetPhoneParValue } from '../../hooks';
defineOptions({
name: 'PhoneBillRecharge',
});
-const emit = defineEmits<{
- (e: 'goPay'): void;
-}>();
+type Props = {
+ isDev?: boolean;
+};
-const form = reactive({
- ispCode: IspCode.yidong,
- phone: '',
- parValue: 100,
+const props = withDefaults(defineProps<Props>(), {
+ isDev: false,
});
-const rate = 0.96;
+const form = reactive({
+ ispCode: '',
+ phone: '',
+ parValue: 0,
+ name: '',
+});
-const parValueList = [50, 100, 200];
+const emit = defineEmits<{
+ (e: 'goPay', orderNo: string): void;
+}>();
-const realParValue = computed(() => blLifeRecharge.getRechargeParValue(form.parValue, rate));
+const { lifePayPhoneRate } = useGetRate();
+const { phoneParValueList } = useGetPhoneParValue();
+
+const parValueList = computed(
+ () => phoneParValueList.value.find((x) => x.ispCode === form.ispCode)?.parValue ?? []
+);
+
+function changeIspCode(val: LifeRechargeConstants.IspCode) {
+ const phoneParValueItem = phoneParValueList.value.find((x) => x.ispCode === val);
+ if (phoneParValueItem.parValue.every((x) => Number(x) !== form.parValue)) {
+ form.parValue = 0;
+ }
+}
+
+const realParValue = computed(() =>
+ blLifeRecharge.getRechargeParValue(form.parValue, lifePayPhoneRate.value)
+);
const discountParValue = computed(() => form.parValue - Number(realParValue.value));
const { blLifeRecharge } = useLifeRechargeContext();
-const rules = reactive<FormRules>({});
+const rules = reactive<FormRules>({
+ ispCode: [{ required: true, message: '璇烽�夋嫨杩愯惀鍟�' }],
+ phone: [
+ { required: true, message: '璇疯緭鍏ュ厖鍊兼墜鏈哄彿' },
+ { validator: FormValidator.validatorPhoneNumber, message: '璇疯緭鍏ユ纭殑鎵嬫満鍙�' },
+ ],
+ name: [{ required: true, message: '璇疯緭鍏ュ鍚�' }],
+ parValue: [
+ { required: true, message: '璇烽�夋嫨鍏呭�奸噾棰�', validator: FormValidator.validatorNumberNotNull },
+ ],
+});
const formRef = ref<any>(null);
@@ -104,6 +169,7 @@
if (!formRef.value) return;
formRef.value.validate().then(({ valid, errors }: any) => {
if (valid) {
+ recharge();
}
});
}
@@ -113,7 +179,6 @@
'鍏呭�兼湡闂达紝鑻ュ悓涓�鍙风爜娆鹃」鏈埌璐︼紝璇峰嬁鍦ㄥ叾浠栧钩鍙伴噸澶嶅厖鍊硷紱涓诲壇鍗′笉鍙悓鏃跺厖鍊笺�傚洜涓婅堪鎿嶄綔瀵艰嚧鐨勮祫閲戞崯澶憋紝鐢辩敤鎴疯嚜琛屾壙鎷呫��',
'鏈钩鍙拌瘽璐瑰厖鍊兼湇鍔′笉閫傜敤浜庡凡鍋滄満鍙风爜銆傜數淇″彿鐮佽嫢鏈夋瑺璐癸紝涔熸棤娉曞畬鎴愬厖鍊笺�傜數淇″凡瀹屾垚缁存姢鐨勫尯鍩熷寘鎷細骞夸笢銆佹睙鑻忋�佹箹鍖椼�佸洓宸濄�佹睙瑗裤�佹渤鍖椼�佹渤鍗椼�佺寤恒�佽窘瀹併�傚叾瀹冨尯鍩熸鍦ㄥ垎鎵规杩涜缁存姢涓紝鍦ㄦ鏈熼棿鍙兘浼氬嚭鐜板厖鍊间笉鎴愬姛骞惰嚜鍔ㄩ��娆剧殑鎯呭喌锛岃鎮ㄨ皡瑙ｃ��',
'濡傛帴鍒伴檶鐢熸潵鐢碉紝瀵规柟浠ョ即璐规垨璇搷浣滅瓑鐞嗙敱瑕佹眰澶勭悊娆鹃」锛屽姟蹇呯珛鍗虫媺榛戯紝璋ㄩ槻璇堥獥銆�',
- '鍞悗鏈嶅姟鏈熶负鍏呭�煎畬鎴愪箣鏃ヨ捣3澶┿�傜敵璇峰敭鍚庢湇鍔℃椂锛岄渶鎻愪緵褰曞睆璇佹嵁锛岃纭鎺ュ彈姝よ姹傚悗鍐嶄笅鍗曪紝閫炬湡骞冲彴涓嶅啀鍙楃悊鍞悗鐢宠銆�',
'鍏呭�煎彂绁ㄧ敱杩愯惀鍟嗘彁渚涳紝鎮ㄥ彲鐧诲綍缃戜笂钀ヤ笟鍘呬笅杞界數瀛愬彂绁ㄣ��',
];
@@ -123,7 +188,19 @@
confirmDialogVisible.value = true;
}
-function goPay() {
- emit('goPay');
+async function goPay() {
+ try {
+ let params: LifePhoneDataCreateLifePayOrderInput = {
+ userId: blLifeRecharge.accountModel.userId,
+ productData: {
+ ispCode: form.ispCode,
+ parValue: props.isDev ? 0.1 : form.parValue,
+ phone: form.phone,
+ name: form.ispCode === BlLifeRecharge.constants.IspCode.dianxin ? form.name : '',
+ },
+ };
+ let res = await blLifeRecharge.services.createLifePayPhoneOrder(params);
+ emit('goPay', res.orderNo);
+ } catch (error) {}
}
</script>
--
Gitblit v1.9.1