From b916fb416c25a7e11c25fb62bc83f2f3434778d0 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 07 三月 2025 15:31:15 +0800
Subject: [PATCH] fix: 对接
---
packages/components/src/views/Order/components/ElectricOrder.vue | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/packages/components/src/views/Order/components/ElectricOrder.vue b/packages/components/src/views/Order/components/ElectricOrder.vue
index a77b9f8..3d1347b 100644
--- a/packages/components/src/views/Order/components/ElectricOrder.vue
+++ b/packages/components/src/views/Order/components/ElectricOrder.vue
@@ -1,5 +1,8 @@
<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="鐢佃垂鍏呭��"
@@ -8,36 +11,46 @@
>
<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')"
/>
- <OrderCardItem label="鍏呭�奸噾棰�:" :value="`锟�${toThousand(item?.rechargeAmount)}`" />
- <OrderCardItem label="浼樻儬閲戦:" :value="`锟�${toThousand(item?.discountAmount)}`" />
- <OrderCardItem label="瀹炰粯閲戦:" :value="`锟�${toThousand(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="item?.payTime && dayjs(item?.payTime).format('YYYY-MM-DD HH:mm:ss')"
/>
+
<OrderCardItem
- v-if="item.payStatus === BlLifeRecharge.constants.LifePayStatusEnum.宸查��娆�"
- label="閫�娆炬椂闂�:"
- :value="item?.finishTime && dayjs(item?.refundTime).format('YYYY-MM-DD HH:mm:ss')"
- >
- </OrderCardItem>
- <OrderCardItem
- v-else
+ v-if="item.payStatus !== BlLifeRecharge.constants.LifePayStatusEnum.宸查��娆�"
label="瀹屾垚鏃堕棿:"
: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>
--
Gitblit v1.9.1