From 0886e91fdfe3b5528f80d2b6742083aa11d16ebb Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 02 四月 2025 15:54:15 +0800
Subject: [PATCH] fix: 四期bug

---
 packages/components/src/views/Order/components/ElectricOrder.vue |   84 ++++++++++++++++++++++++++++++++++++------
 1 files changed, 72 insertions(+), 12 deletions(-)

diff --git a/packages/components/src/views/Order/components/ElectricOrder.vue b/packages/components/src/views/Order/components/ElectricOrder.vue
index 9f8a997..eac8a9e 100644
--- a/packages/components/src/views/Order/components/ElectricOrder.vue
+++ b/packages/components/src/views/Order/components/ElectricOrder.vue
@@ -1,24 +1,78 @@
 <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="鐢佃垂鍏呭��" status="寰呮敮浠�" :order-no="item?.orderNo">
-        <OrderCardItem label="鍏呭�煎湴鍖�:" :value="'18888888888'" />
-        <OrderCardItem label="鍏呭�兼埛鍙�:" :value="'18888888888'" />
+      <OrderCard
+        title="鐢佃垂鍏呭��"
+        :status="item?.lifePayOrderStatus"
+        :order-no="item?.orderNo"
+        :id="item?.id"
+        @goApplyRefund="emit('goApplyRefund', $event)"
+        @goRefundDetail="emit('goRefundDetail', $event)"
+      >
+        <OrderCardItem
+          label="鍏呭�煎湴鍖�:"
+          :value="`${JSON.parse(item?.orderParamDetailJsonStr)?.Province ?? ''} ${
+            JSON.parse(item?.orderParamDetailJsonStr)?.City ?? ''
+          }`"
+        />
+        <OrderCardItem
+          label="鍏呭�兼埛鍙�:"
+          :value="JSON.parse(item?.orderParamDetailJsonStr)?.ElectricAccount"
+        />
         <OrderCardItem
           label="涓嬪崟鏃堕棿:"
-          :value="dayjs(item?.creationTime).format('YYYY-MM-DD HH:mm:ss')"
+          :value="item?.creationTime && 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" />
+        <template
+          v-if="
+            item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.鍏呭�兼垚鍔� ||
+            item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.鏀粯鎴愬姛
+          "
+        >
+          <OrderCardItem
+            label="鍏呭�奸噾棰�:"
+            :value="`锟�${toThousand(item?.rechargeAmount)}`"
+            danger
+          />
+          <OrderCardItem label="浼樻儬閲戦:" :value="`锟�${toThousand(item?.discountAmount)}`" />
+        </template>
+
+        <OrderCardItem label="瀹炰粯閲戦:" :value="`锟�${toThousand(item?.payAmount)}`" danger />
         <OrderCardItem
           label="鏀粯鏃堕棿:"
-          :value="dayjs(item?.payTime).format('YYYY-MM-DD HH:mm:ss')"
+          :value="item?.payTime && dayjs(item?.payTime).format('YYYY-MM-DD HH:mm:ss')"
+        />
+
+        <OrderCardItem
+          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')"
         />
         <OrderCardItem
-          label="瀹屾垚鏃堕棿:"
-          :value="dayjs(item?.finishTime).format('YYYY-MM-DD HH:mm:ss')"
+          v-else-if="
+            item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.閫�娆惧緟瀹℃牳 ||
+            item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.閫�娆惧け璐�
+          "
+          label="閫�娆惧彂璧锋椂闂�:"
+          labelWidth="110px"
+          :value="
+            item?.refundApplyTime && dayjs(item?.refundApplyTime).format('YYYY-MM-DD HH:mm:ss')
+          "
         />
+        <template v-else>
+          <OrderCardItem label="閫�娆鹃噾棰�:" :value="`锟�${toThousand(item?.payAmount)}`" danger />
+          <OrderCardItem
+            label="閫�娆炬椂闂�:"
+            :value="item?.refundTime && dayjs(item?.refundTime).format('YYYY-MM-DD HH:mm:ss')"
+          >
+          </OrderCardItem>
+        </template>
       </OrderCard>
     </template>
   </InfiniteLoading>
@@ -29,8 +83,9 @@
 import OrderCard from '../../../components/Card/OrderCard.vue';
 import OrderCardItem from '../../../components/Card/OrderCardItem.vue';
 import { useGetUserLifePayOrderPage } from '../../../hooks';
-import { BlLifeRecharge } from '../../../utils';
+import { BlLifeRecharge } from '@life-payment/core-vue';
 import dayjs from 'dayjs';
+import { toThousand, convertOrderFrontStatus } from '../../../utils';
 
 defineOptions({
   name: 'ElectricOrder',
@@ -40,6 +95,11 @@
 
 // const props = withDefaults(defineProps<Props>(), {});
 
+const emit = defineEmits<{
+  (e: 'goApplyRefund', id: string): void;
+  (e: 'goRefundDetail', orderNo: string): void;
+}>();
+
 const { infiniteLoadingProps } = useGetUserLifePayOrderPage({
   lifePayOrderType: BlLifeRecharge.constants.LifePayOrderTypeEnum.鐢佃垂璁㈠崟,
 });

--
Gitblit v1.9.1