From c5743e1072ed629d721f45db8237874ac9a5df45 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 26 二月 2025 10:16:38 +0800
Subject: [PATCH] fix: 对接
---
packages/components/src/views/Order/components/ElectricOrder.vue | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/packages/components/src/views/Order/components/ElectricOrder.vue b/packages/components/src/views/Order/components/ElectricOrder.vue
index 7484844..d398daf 100644
--- a/packages/components/src/views/Order/components/ElectricOrder.vue
+++ b/packages/components/src/views/Order/components/ElectricOrder.vue
@@ -1,24 +1,53 @@
<template>
<InfiniteLoading scrollViewClassName="common-infinite-scroll-list" v-bind="infiniteLoadingProps">
<template #renderItem="{ item }">
- <OrderCard title="鐢佃垂鍏呭��" status="寰呮敮浠�" :order-no="item?.orderNo">
- <OrderCardItem label="鍏呭�煎湴鍖�:" :value="'18888888888'" />
- <OrderCardItem label="鍏呭�兼埛鍙�:" :value="'18888888888'" />
+ <OrderCard
+ title="鐢佃垂鍏呭��"
+ :status="orderStatusEnum(item?.payStatus, item?.lifePayOrderStatus)"
+ :order-no="item?.orderNo"
+ >
+ <OrderCardItem
+ label="鍏呭�煎湴鍖�:"
+ :value="`${JSON.parse(item?.orderParamDetailJsonStr)?.province ?? ''} ${
+ JSON.parse(item?.orderParamDetailJsonStr)?.city ?? ''
+ }`"
+ />
+ <OrderCardItem
+ label="鍏呭�兼埛鍙�:"
+ :value="JSON.parse(item?.orderParamDetailJsonStr)?.electricAccount"
+ />
<OrderCardItem
label="涓嬪崟鏃堕棿:"
- :value="dayjs(item?.creationTime).format('YYYY-MM-DD HH:mm:ss')"
+ :value="item?.creationTime && dayjs(item?.creationTime).format('YYYY-MM-DD HH:mm:ss')"
/>
- <OrderCardItem label="鍏呭�奸噾棰�:" :value="item?.rechargeAmount" />
- <OrderCardItem label="浼樻儬閲戦:" :value="item?.discountAmount" />
- <OrderCardItem label="瀹炰粯閲戦:" :value="item?.payAmount" />
+ <template v-if="item.payStatus !== BlLifeRecharge.constants.LifePayStatusEnum.宸查��娆�">
+ <OrderCardItem
+ label="鍏呭�奸噾棰�:"
+ :value="`锟�${toThousand(item?.rechargeAmount)}`"
+ danger
+ />
+ <OrderCardItem label="浼樻儬閲戦:" :value="`锟�${toThousand(item?.discountAmount)}`" />
+ </template>
+
+ <OrderCardItem label="瀹炰粯閲戦:" :value="`锟�${toThousand(item?.payAmount)}`" danger />
<OrderCardItem
label="鏀粯鏃堕棿:"
- :value="dayjs(item?.payTime).format('YYYY-MM-DD HH:mm:ss')"
+ :value="item?.payTime && dayjs(item?.payTime).format('YYYY-MM-DD HH:mm:ss')"
/>
+
<OrderCardItem
+ v-if="item.payStatus !== BlLifeRecharge.constants.LifePayStatusEnum.宸查��娆�"
label="瀹屾垚鏃堕棿:"
- :value="dayjs(item?.finishTime).format('YYYY-MM-DD HH:mm:ss')"
+ :value="item?.finishTime && dayjs(item?.finishTime).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>
@@ -31,6 +60,7 @@
import { useGetUserLifePayOrderPage } from '../../../hooks';
import { BlLifeRecharge } from '@life-payment/core-vue';
import dayjs from 'dayjs';
+import { toThousand, orderStatusEnum } from '../../../utils';
defineOptions({
name: 'ElectricOrder',
--
Gitblit v1.9.1