From c08d65c56e8b90bdef300ac45e5545c944f7eacc Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 24 二月 2025 13:41:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentFront
---
packages/components/src/views/Order/components/PhoneOrder.vue | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/packages/components/src/views/Order/components/PhoneOrder.vue b/packages/components/src/views/Order/components/PhoneOrder.vue
index 5d5a200..babe217 100644
--- a/packages/components/src/views/Order/components/PhoneOrder.vue
+++ b/packages/components/src/views/Order/components/PhoneOrder.vue
@@ -1,14 +1,23 @@
<template>
<InfiniteLoading scrollViewClassName="common-infinite-scroll-list" v-bind="infiniteLoadingProps">
<template #renderItem="{ item }">
- <OrderCard title="璇濊垂鍏呭��" status="寰呮敮浠�">
+ <OrderCard title="璇濊垂鍏呭��" status="寰呮敮浠�" :order-no="item?.orderNo">
<OrderCardItem label="鍏呭�艰处鍙�:" :value="'18888888888'" />
- <OrderCardItem label="涓嬪崟鏃堕棿:" :value="'18888888888'" />
- <OrderCardItem label="鍏呭�奸噾棰�:" :value="'18888888888'" />
- <OrderCardItem label="浼樻儬閲戦:" :value="'18888888888'" />
- <OrderCardItem label="瀹炰粯閲戦:" :value="'18888888888'" />
- <OrderCardItem label="鏀粯鏃堕棿:" :value="'2025-02-19 17:15:54'" />
- <OrderCardItem label="瀹屾垚鏃堕棿:" :value="'2025-02-19 17:15:54'" />
+ <OrderCardItem
+ label="涓嬪崟鏃堕棿:"
+ :value="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="dayjs(item?.payTime).format('YYYY-MM-DD HH:mm:ss')"
+ />
+ <OrderCardItem
+ label="瀹屾垚鏃堕棿:"
+ :value="dayjs(item?.finishTime).format('YYYY-MM-DD HH:mm:ss')"
+ />
</OrderCard>
</template>
</InfiniteLoading>
@@ -19,6 +28,7 @@
import OrderCard from '../../../components/Card/OrderCard.vue';
import OrderCardItem from '../../../components/Card/OrderCardItem.vue';
import { useGetUserLifePayOrderPage } from '../../../hooks';
+import dayjs from 'dayjs';
import { BlLifeRecharge } from '@life-payment/core-vue';
defineOptions({
--
Gitblit v1.9.1