From 03047a382e6f0f1945be32e28fd65e6b31817dfa Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 24 二月 2025 17:52:47 +0800
Subject: [PATCH] fix: 对接
---
packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue | 158 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 118 insertions(+), 40 deletions(-)
diff --git a/packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue b/packages/components/src/views/PhoneBillRecharge/PhoneBillRecharge.vue
index f3d2d56..eaa5392 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,15 +54,17 @@
</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 class="recharge-button-text">绔嬪嵆鍏呭��</div>
@@ -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();
}
});
}
@@ -123,7 +189,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