fix: 对接

zhengyiming

2025-02-24 58c6417603cc9e4c1012ba4fc4c6306dcb0e2324

fix: 对接

 apps/taro/packages/components/assets/icon-back-top.png

 apps/taro/packages/components/assets/icon-free-dian.png

 apps/taro/src/subpackages/recharge/selectPayType/InnerPage.vue

@@ -1,6 +1,11 @@
<template>
  <ContentScrollView>
    <SelectPayTypeView style="margin-top: 40px" @paySuccess="handePaySuccess" />
    <SelectPayTypeView
      style="margin-top: 40px"
      :orderNo="orderNo"
      :lifePayOrderType="lifePayOrderType"
      @paySuccess="handePaySuccess"
    />
  </ContentScrollView>
</template>

@@ -12,6 +17,10 @@
  name: 'selectPayType',
});

const router = Taro.useRouter();
const orderNo = router.params?.orderNo ?? '';
const lifePayOrderType = Number(router.params?.lifePayOrderType ?? '');

function handePaySuccess(
  orderNo: string,
  lifePayOrderType: LifeRechargeConstants.LifePayOrderTypeEnum

 packages/components/src/components/Input/ChooseInput.vue

@@ -19,6 +19,7 @@

<script setup lang="ts">
import { RectRight } from '@nutui/icons-vue-taro';
import { Input as NutInput } from '@nutui/nutui-taro';

defineOptions({
  name: 'ChooseInput',

 packages/components/src/views/Order/Order.vue

File was deleted

 packages/components/src/views/RechargeResultView/RechargeResultView.vue

@@ -14,8 +14,7 @@
</template>

<script setup lang="ts">
import Taro from '@tarojs/taro';
import { BlLifeRecharge } from '@life-payment/components';
import { LifeRechargeConstants } from '../../utils';

defineOptions({
  name: 'RechargeResultView',
@@ -23,15 +22,13 @@

type Props = {
  title?: string;
  orderNo?: string;
  lifePayOrderType?: LifeRechargeConstants.LifePayOrderTypeEnum;
};

const props = withDefaults(defineProps<Props>(), {
  title: '支付成功，充值款将在0-24小时内到账',
});

const router = Taro.useRouter();
const orderNo = router.params?.orderNo ?? '';
const lifePayOrderType = Number(router.params?.lifePayOrderType ?? '');

const emit = defineEmits<{
  (e: 'goBackHome'): void;

 packages/components/src/views/SelectPayTypeView/SelectPayTypeView.vue

@@ -14,7 +14,6 @@
<script setup lang="ts">
import IconWeixin from '../../../assets/icon-weixin-pay.png';
import IconAliPay from '../../../assets/icon-alipay.png';
import Taro from '@tarojs/taro';
import {
  useLifeRechargeContext,
  SetLifePayOrderPayTypeInput,
@@ -26,9 +25,12 @@
  name: 'SelectPayTypeView',
});

// type Props = {};
type Props = {
  orderNo?: string;
  lifePayOrderType?: LifeRechargeConstants.LifePayOrderTypeEnum;
};

// const props = withDefaults(defineProps<Props>(), {});
const props = withDefaults(defineProps<Props>(), {});

const emit = defineEmits<{
  (
@@ -37,10 +39,6 @@
    lifePayOrderType: LifeRechargeConstants.LifePayOrderTypeEnum
  ): void;
}>();

const router = Taro.useRouter();
const orderNo = router.params?.orderNo ?? '';
const lifePayOrderType = Number(router.params?.lifePayOrderType ?? '');

const { blLifeRecharge } = useLifeRechargeContext();

@@ -56,7 +54,7 @@
async function setLifePayOrderPayType(lifePayType: LifeRechargeConstants.LifePayTypeEnum) {
  try {
    let params: SetLifePayOrderPayTypeInput = {
      orderNo: orderNo,
      orderNo: props.orderNo,
      lifePayType: lifePayType,
    };
    return await blLifeRecharge.services.setLifePayOrderPayType(params);
@@ -64,11 +62,11 @@
}

useQuery({
  queryKey: ['platformServicePayServices/getPayStatusByOrderNo', orderNo],
  queryKey: ['platformServicePayServices/getPayStatusByOrderNo', props.orderNo],
  queryFn: async () => {
    return await blLifeRecharge.services.getPayStatusByOrderNo(
      {
        orderNo,
        orderNo: props.orderNo,
      },
      {
        showLoading: false,
@@ -77,7 +75,7 @@
  },
  onSuccess(data) {
    if (data === blLifeRecharge.constants.LifePayStatusEnum.已支付) {
      emit('paySuccess', orderNo, lifePayOrderType);
      emit('paySuccess', props.orderNo, props.lifePayOrderType);
    }
  },
  refetchInterval: 1000 * 3,