From 284493e11197bce2e3dfeff7fb5c2ef93d1b5b79 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 24 二月 2025 17:52:59 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentFront
---
packages/components/src/views/Order/components/ElectricOrder.vue | 13 +++++++++++--
packages/services/api/typings.d.ts | 4 +++-
packages/components/src/views/Order/components/PhoneOrder.vue | 7 +++++++
packages/core/src/lifeRechargeServices.ts | 2 ++
4 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/packages/components/src/views/Order/components/ElectricOrder.vue b/packages/components/src/views/Order/components/ElectricOrder.vue
index 9e45312..a77b9f8 100644
--- a/packages/components/src/views/Order/components/ElectricOrder.vue
+++ b/packages/components/src/views/Order/components/ElectricOrder.vue
@@ -8,11 +8,13 @@
>
<OrderCardItem
label="鍏呭�煎湴鍖�:"
- :value="JSON.parse(item?.orderParamDetailJsonStr)?.phone"
+ :value="`${JSON.parse(item?.orderParamDetailJsonStr)?.province ?? ''} ${
+ JSON.parse(item?.orderParamDetailJsonStr)?.city ?? ''
+ }`"
/>
<OrderCardItem
label="鍏呭�兼埛鍙�:"
- :value="JSON.parse(item?.orderParamDetailJsonStr)?.phone"
+ :value="JSON.parse(item?.orderParamDetailJsonStr)?.electricAccount"
/>
<OrderCardItem
label="涓嬪崟鏃堕棿:"
@@ -26,6 +28,13 @@
: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
label="瀹屾垚鏃堕棿:"
:value="item?.finishTime && dayjs(item?.finishTime).format('YYYY-MM-DD HH:mm:ss')"
/>
diff --git a/packages/components/src/views/Order/components/PhoneOrder.vue b/packages/components/src/views/Order/components/PhoneOrder.vue
index acfb987..c48d0f7 100644
--- a/packages/components/src/views/Order/components/PhoneOrder.vue
+++ b/packages/components/src/views/Order/components/PhoneOrder.vue
@@ -22,6 +22,13 @@
: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
label="瀹屾垚鏃堕棿:"
:value="item?.finishTime && dayjs(item?.finishTime).format('YYYY-MM-DD HH:mm:ss')"
/>
diff --git a/packages/core/src/lifeRechargeServices.ts b/packages/core/src/lifeRechargeServices.ts
index f08a967..753b3b0 100644
--- a/packages/core/src/lifeRechargeServices.ts
+++ b/packages/core/src/lifeRechargeServices.ts
@@ -281,4 +281,6 @@
orderParamDetailJsonStr?: string;
/** 涓嬪崟鏃堕棿 */
creationTime?: string;
+ /** 閫�娆炬椂闂� */
+ refundTime?: string;
}
diff --git a/packages/services/api/typings.d.ts b/packages/services/api/typings.d.ts
index 2305a7a..bc3cbf5 100644
--- a/packages/services/api/typings.d.ts
+++ b/packages/services/api/typings.d.ts
@@ -12161,7 +12161,7 @@
/** 鐪佷唤銆� */
province: string;
/** 鍩庡競銆� */
- city: string;
+ city?: string;
/** 瀹㈡埛韬唤璇佸悗6浣嶏紝鍗楃綉蹇呬紶銆� */
sixID?: string;
}
@@ -20213,6 +20213,8 @@
orderParamDetailJsonStr?: string;
/** 涓嬪崟鏃堕棿 */
creationTime?: string;
+ /** 閫�娆炬椂闂� */
+ refundTime?: string;
}
interface UserLifePayOrderOutputPageOutput {
--
Gitblit v1.9.1