From 3d6e0ce70fb2267576ddba9d586eef20a52be31b Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 25 二月 2025 17:35:03 +0800
Subject: [PATCH] fix: bug

---
 packages/components/src/views/Order/components/ElectricOrder.vue |   28 +++++++++++++++++++---------
 packages/components/src/views/Order/components/PhoneOrder.vue    |   26 +++++++++++++++++---------
 2 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/packages/components/src/views/Order/components/ElectricOrder.vue b/packages/components/src/views/Order/components/ElectricOrder.vue
index 3ad6dcb..601b2b2 100644
--- a/packages/components/src/views/Order/components/ElectricOrder.vue
+++ b/packages/components/src/views/Order/components/ElectricOrder.vue
@@ -20,24 +20,34 @@
           label="涓嬪崟鏃堕棿:"
           :value="item?.creationTime && dayjs(item?.creationTime).format('YYYY-MM-DD HH:mm:ss')"
         />
-        <OrderCardItem label="鍏呭�奸噾棰�:" :value="`锟�${toThousand(item?.rechargeAmount)}`" danger />
-        <OrderCardItem label="浼樻儬閲戦:" :value="`锟�${toThousand(item?.discountAmount)}`" />
+        <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?.finishTime && dayjs(item?.refundTime).format('YYYY-MM-DD HH:mm:ss')"
+          >
+          </OrderCardItem>
+        </template>
       </OrderCard>
     </template>
   </InfiniteLoading>
diff --git a/packages/components/src/views/Order/components/PhoneOrder.vue b/packages/components/src/views/Order/components/PhoneOrder.vue
index 62f38b1..126dbf5 100644
--- a/packages/components/src/views/Order/components/PhoneOrder.vue
+++ b/packages/components/src/views/Order/components/PhoneOrder.vue
@@ -14,24 +14,32 @@
           label="涓嬪崟鏃堕棿:"
           :value="item?.creationTime && dayjs(item?.creationTime).format('YYYY-MM-DD HH:mm:ss')"
         />
-        <OrderCardItem label="鍏呭�奸噾棰�:" :value="`锟�${toThousand(item?.rechargeAmount)}`" danger />
-        <OrderCardItem label="浼樻儬閲戦:" :value="`锟�${toThousand(item?.discountAmount)}`" />
+        <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?.finishTime && dayjs(item?.refundTime).format('YYYY-MM-DD HH:mm:ss')"
+          >
+          </OrderCardItem>
+        </template>
       </OrderCard>
     </template>
   </InfiniteLoading>

--
Gitblit v1.9.1