From 915424730f27445da2e8de13b62e77179cc1a15a Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 18 八月 2025 17:07:39 +0800
Subject: [PATCH] fix: 关闭移动充值渠道,打开电信充值渠道
---
packages/components/src/views/Order/components/ElectricOrder.vue | 67 +++++++++++++++++++++++++++++----
1 files changed, 59 insertions(+), 8 deletions(-)
diff --git a/packages/components/src/views/Order/components/ElectricOrder.vue b/packages/components/src/views/Order/components/ElectricOrder.vue
index 9e45312..adabbe8 100644
--- a/packages/components/src/views/Order/components/ElectricOrder.vue
+++ b/packages/components/src/views/Order/components/ElectricOrder.vue
@@ -1,34 +1,79 @@
<template>
- <InfiniteLoading scrollViewClassName="common-infinite-scroll-list" v-bind="infiniteLoadingProps">
+ <InfiniteLoading
+ scrollViewClassName="life-page-infinite-scroll-list"
+ v-bind="infiniteLoadingProps"
+ >
<template #renderItem="{ item }">
<OrderCard
title="鐢佃垂鍏呭��"
- :status="orderStatusEnum(item?.payStatus, item?.lifePayOrderStatus)"
+ :status="item?.lifePayOrderStatus"
+ :frontStatus="item?.frontStatus"
:order-no="item?.orderNo"
+ :id="item?.id"
+ @goApplyRefund="emit('goApplyRefund', $event)"
+ @goRefundDetail="emit('goRefundDetail', $event)"
>
<OrderCardItem
label="鍏呭�煎湴鍖�:"
- :value="JSON.parse(item?.orderParamDetailJsonStr)?.phone"
+ :value="`${JSON.parse(item?.orderParamDetailJsonStr)?.Province ?? ''} ${
+ JSON.parse(item?.orderParamDetailJsonStr)?.City ?? ''
+ }`"
/>
<OrderCardItem
label="鍏呭�兼埛鍙�:"
- :value="JSON.parse(item?.orderParamDetailJsonStr)?.phone"
+ :value="JSON.parse(item?.orderParamDetailJsonStr)?.ElectricAccount"
/>
<OrderCardItem
label="涓嬪崟鏃堕棿:"
:value="item?.creationTime && dayjs(item?.creationTime).format('YYYY-MM-DD HH:mm:ss')"
/>
- <OrderCardItem label="鍏呭�奸噾棰�:" :value="`锟�${toThousand(item?.rechargeAmount)}`" />
- <OrderCardItem label="浼樻儬閲戦:" :value="`锟�${toThousand(item?.discountAmount)}`" />
- <OrderCardItem label="瀹炰粯閲戦:" :value="`锟�${toThousand(item?.payAmount)}`" />
+ <template
+ v-if="
+ item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.鍏呭�兼垚鍔� ||
+ item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.鏀粯鎴愬姛
+ "
+ >
+ <OrderCardItem
+ label="鍏呭�奸噾棰�:"
+ :value="`锟�${toThousand(item?.rechargeAmount)}`"
+ danger
+ />
+ <OrderCardItem label="浼樻儬閲戦:" :value="`锟�${toThousand(item?.discountAmount)}`" />
+ </template>
+
+ <OrderCardItem label="瀹炰粯閲戦:" :value="`锟�${toThousand(item?.payAmount)}`" danger />
<OrderCardItem
label="鏀粯鏃堕棿:"
:value="item?.payTime && dayjs(item?.payTime).format('YYYY-MM-DD HH:mm:ss')"
/>
+
<OrderCardItem
+ v-if="
+ item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.鍏呭�兼垚鍔� ||
+ item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.鏀粯鎴愬姛
+ "
label="瀹屾垚鏃堕棿:"
:value="item?.finishTime && dayjs(item?.finishTime).format('YYYY-MM-DD HH:mm:ss')"
/>
+ <OrderCardItem
+ v-else-if="
+ item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.閫�娆惧緟瀹℃牳 ||
+ item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.閫�娆惧け璐�
+ "
+ label="閫�娆惧彂璧锋椂闂�:"
+ :labelWidth="200"
+ :value="
+ item?.refundApplyTime && dayjs(item?.refundApplyTime).format('YYYY-MM-DD HH:mm:ss')
+ "
+ />
+ <template v-else>
+ <OrderCardItem label="閫�娆鹃噾棰�:" :value="`锟�${toThousand(item?.payAmount)}`" danger />
+ <OrderCardItem
+ label="閫�娆炬椂闂�:"
+ :value="item?.refundTime && dayjs(item?.refundTime).format('YYYY-MM-DD HH:mm:ss')"
+ >
+ </OrderCardItem>
+ </template>
</OrderCard>
</template>
</InfiniteLoading>
@@ -41,7 +86,8 @@
import { useGetUserLifePayOrderPage } from '../../../hooks';
import { BlLifeRecharge } from '@life-payment/core-vue';
import dayjs from 'dayjs';
-import { toThousand, orderStatusEnum } from '../../../utils';
+import { toThousand, convertOrderFrontStatus } from '../../../utils';
+import Taro from '@tarojs/taro';
defineOptions({
name: 'ElectricOrder',
@@ -51,6 +97,11 @@
// const props = withDefaults(defineProps<Props>(), {});
+const emit = defineEmits<{
+ (e: 'goApplyRefund', id: string): void;
+ (e: 'goRefundDetail', orderNo: string): void;
+}>();
+
const { infiniteLoadingProps } = useGetUserLifePayOrderPage({
lifePayOrderType: BlLifeRecharge.constants.LifePayOrderTypeEnum.鐢佃垂璁㈠崟,
});
--
Gitblit v1.9.1