From 13172e75446452388f0e4a0c4aac7e696e1b21da Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 13 三月 2025 14:53:44 +0800
Subject: [PATCH] fix: 二期需求

---
 packages/components/src/views/Order/components/ElectricOrder.vue |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/components/src/views/Order/components/ElectricOrder.vue b/packages/components/src/views/Order/components/ElectricOrder.vue
index ff68ccf..6391340 100644
--- a/packages/components/src/views/Order/components/ElectricOrder.vue
+++ b/packages/components/src/views/Order/components/ElectricOrder.vue
@@ -6,7 +6,7 @@
     <template #renderItem="{ item }">
       <OrderCard
         title="鐢佃垂鍏呭��"
-        :status="convertOrderFrontStatus(item?.payStatus, item?.lifePayOrderStatus)"
+        :status="item?.frontStatus"
         :order-no="item?.orderNo"
         :id="item?.id"
         @goApplyRefund="emit('goApplyRefund', $event)"
@@ -26,7 +26,12 @@
           label="涓嬪崟鏃堕棿:"
           :value="item?.creationTime && dayjs(item?.creationTime).format('YYYY-MM-DD HH:mm:ss')"
         />
-        <template v-if="item.payStatus !== BlLifeRecharge.constants.LifePayStatusEnum.宸查��娆�">
+        <template
+          v-if="
+            item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.鍏呭�兼垚鍔� ||
+            item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.鏀粯鎴愬姛
+          "
+        >
           <OrderCardItem
             label="鍏呭�奸噾棰�:"
             :value="`锟�${toThousand(item?.rechargeAmount)}`"
@@ -42,7 +47,10 @@
         />
 
         <OrderCardItem
-          v-if="item.payStatus !== BlLifeRecharge.constants.LifePayStatusEnum.宸查��娆�"
+          v-if="
+            item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.鍏呭�兼垚鍔� ||
+            item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.鏀粯鎴愬姛
+          "
           label="瀹屾垚鏃堕棿:"
           :value="item?.finishTime && dayjs(item?.finishTime).format('YYYY-MM-DD HH:mm:ss')"
         />

--
Gitblit v1.9.1