From ef302550673f5dfd1f4e97599ece4b335d8a7624 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 10 三月 2025 09:48:22 +0800
Subject: [PATCH] Merge branch 'dev-1.1'
---
packages/components/src/views/Order/components/ElectricOrder.vue | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/packages/components/src/views/Order/components/ElectricOrder.vue b/packages/components/src/views/Order/components/ElectricOrder.vue
index 601b2b2..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,13 +11,13 @@
>
<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="涓嬪崟鏃堕棿:"
@@ -44,7 +47,7 @@
<OrderCardItem label="閫�娆鹃噾棰�:" :value="`锟�${toThousand(item?.payAmount)}`" danger />
<OrderCardItem
label="閫�娆炬椂闂�:"
- :value="item?.finishTime && dayjs(item?.refundTime).format('YYYY-MM-DD HH:mm:ss')"
+ :value="item?.refundTime && dayjs(item?.refundTime).format('YYYY-MM-DD HH:mm:ss')"
>
</OrderCardItem>
</template>
--
Gitblit v1.9.1