fix: 对接

zhengyiming

2025-02-24 3ee683d6b002f098e5b7fed11b54615126d82a3c

 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();