From 13172e75446452388f0e4a0c4aac7e696e1b21da Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 13 三月 2025 14:53:44 +0800
Subject: [PATCH] fix: 二期需求
---
packages/components/src/views/Order/components/ElectricOrder.vue | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/packages/components/src/views/Order/components/ElectricOrder.vue b/packages/components/src/views/Order/components/ElectricOrder.vue
index 601b2b2..6391340 100644
--- a/packages/components/src/views/Order/components/ElectricOrder.vue
+++ b/packages/components/src/views/Order/components/ElectricOrder.vue
@@ -1,26 +1,37 @@
<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?.frontStatus"
:order-no="item?.orderNo"
+ :id="item?.id"
+ @goApplyRefund="emit('goApplyRefund', $event)"
+ @goRefundDetail="emit('goRefundDetail', $event)"
>
<OrderCardItem
label="鍏呭�煎湴鍖�:"
- :value="`${JSON.parse(item?.orderParamDetailJsonStr)?.province ?? ''} ${
- JSON.parse(item?.orderParamDetailJsonStr)?.city ?? ''
+ :value="`${JSON.parse(item?.orderParamDetailJsonStr)?.Province ?? ''} ${
+ JSON.parse(item?.orderParamDetailJsonStr)?.City ?? ''
}`"
/>
<OrderCardItem
label="鍏呭�兼埛鍙�:"
- :value="JSON.parse(item?.orderParamDetailJsonStr)?.electricAccount"
+ :value="JSON.parse(item?.orderParamDetailJsonStr)?.ElectricAccount"
/>
<OrderCardItem
label="涓嬪崟鏃堕棿:"
:value="item?.creationTime && dayjs(item?.creationTime).format('YYYY-MM-DD HH:mm:ss')"
/>
- <template v-if="item.payStatus !== BlLifeRecharge.constants.LifePayStatusEnum.宸查��娆�">
+ <template
+ v-if="
+ item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.鍏呭�兼垚鍔� ||
+ item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.鏀粯鎴愬姛
+ "
+ >
<OrderCardItem
label="鍏呭�奸噾棰�:"
:value="`锟�${toThousand(item?.rechargeAmount)}`"
@@ -36,7 +47,10 @@
/>
<OrderCardItem
- v-if="item.payStatus !== BlLifeRecharge.constants.LifePayStatusEnum.宸查��娆�"
+ 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')"
/>
@@ -44,7 +58,7 @@
<OrderCardItem label="閫�娆鹃噾棰�:" :value="`锟�${toThousand(item?.payAmount)}`" danger />
<OrderCardItem
label="閫�娆炬椂闂�:"
- :value="item?.finishTime && dayjs(item?.refundTime).format('YYYY-MM-DD HH:mm:ss')"
+ :value="item?.refundTime && dayjs(item?.refundTime).format('YYYY-MM-DD HH:mm:ss')"
>
</OrderCardItem>
</template>
@@ -60,7 +74,7 @@
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';
defineOptions({
name: 'ElectricOrder',
@@ -70,6 +84,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