From 4cb3259a2dc953678d6d7b3961728b0e47f32fc4 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 24 二月 2025 15:26:54 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentFront
---
packages/components/src/views/Order/components/ElectricOrder.vue | 29 ++++++++++++++++++++---------
1 files changed, 20 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..9e45312 100644
--- a/packages/components/src/views/Order/components/ElectricOrder.vue
+++ b/packages/components/src/views/Order/components/ElectricOrder.vue
@@ -1,23 +1,33 @@
<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)?.phone"
+ />
+ <OrderCardItem
+ label="鍏呭�兼埛鍙�:"
+ :value="JSON.parse(item?.orderParamDetailJsonStr)?.phone"
+ />
<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" />
+ <OrderCardItem label="鍏呭�奸噾棰�:" :value="`锟�${toThousand(item?.rechargeAmount)}`" />
+ <OrderCardItem label="浼樻儬閲戦:" :value="`锟�${toThousand(item?.discountAmount)}`" />
+ <OrderCardItem label="瀹炰粯閲戦:" :value="`锟�${toThousand(item?.payAmount)}`" />
<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
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')"
/>
</OrderCard>
</template>
@@ -31,6 +41,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