From 6f958b20feba65775c8005128fff79563f795898 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 13 三月 2025 13:08:50 +0800
Subject: [PATCH] fix: 二期需求
---
packages/components/src/components/Card/OrderCard.vue | 2 +-
packages/components/src/views/Order/components/ElectricOrder.vue | 9 +++++++--
packages/components/src/views/Order/components/GasOrder.vue | 9 +++++++--
packages/components/src/views/Order/components/PhoneOrder.vue | 9 +++++++--
packages/core/src/lifeRechargeServices.ts | 1 +
packages/components/src/hooks/index.ts | 16 ++++++++++++++--
6 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/packages/components/src/components/Card/OrderCard.vue b/packages/components/src/components/Card/OrderCard.vue
index 3a6e2d4..0936df3 100644
--- a/packages/components/src/components/Card/OrderCard.vue
+++ b/packages/components/src/components/Card/OrderCard.vue
@@ -44,7 +44,7 @@
type Props = {
title: string;
- status: LifeRechargeConstants.LifePayOrderFrontStatusEnum;
+ status?: LifeRechargeConstants.LifePayOrderFrontStatusEnum;
orderNo: string;
id: string;
};
diff --git a/packages/components/src/hooks/index.ts b/packages/components/src/hooks/index.ts
index 912a1b6..ec903cc 100644
--- a/packages/components/src/hooks/index.ts
+++ b/packages/components/src/hooks/index.ts
@@ -17,6 +17,7 @@
import { computed, MaybeRef, reactive, unref } from 'vue';
import { useInfiniteLoading } from './infiniteLoading';
import { OrderInputType } from '../constants';
+import { convertOrderFrontStatus } from '../utils';
export function useGetRate() {
const { blLifeRecharge } = useLifeRechargeContext();
@@ -110,7 +111,7 @@
// });
const { infiniteLoadingProps } = useInfiniteLoading(
- ({ pageParam }) => {
+ async ({ pageParam }) => {
let params: QueryLifePayOrderListInput = {
pageModel: {
rows: 20,
@@ -121,9 +122,14 @@
userId: blLifeRecharge.accountModel.userId,
};
- return blLifeRecharge.services.getUserLifePayOrderPage(params, {
+ let res = await blLifeRecharge.services.getUserLifePayOrderPage(params, {
showLoading: false,
});
+ res.data = res.data.map((x) => ({
+ ...x,
+ frontStatus: convertOrderFrontStatus(x.payStatus, x.lifePayOrderStatus),
+ }));
+ return res;
},
{
queryKey: [
@@ -133,6 +139,12 @@
userId: blLifeRecharge.accountModel.userId,
},
],
+
+ select(data) {
+ console.log('data: ', data);
+ // data.pages.map((item) => item.data.map((x) => convertOrderFrontStatus(x)))
+ return data;
+ },
}
);
diff --git a/packages/components/src/views/Order/components/ElectricOrder.vue b/packages/components/src/views/Order/components/ElectricOrder.vue
index ff68ccf..9b842e5 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)}`"
diff --git a/packages/components/src/views/Order/components/GasOrder.vue b/packages/components/src/views/Order/components/GasOrder.vue
index 549131d..b5b3215 100644
--- a/packages/components/src/views/Order/components/GasOrder.vue
+++ b/packages/components/src/views/Order/components/GasOrder.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)"
@@ -20,7 +20,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)}`"
diff --git a/packages/components/src/views/Order/components/PhoneOrder.vue b/packages/components/src/views/Order/components/PhoneOrder.vue
index a19285a..3599309 100644
--- a/packages/components/src/views/Order/components/PhoneOrder.vue
+++ b/packages/components/src/views/Order/components/PhoneOrder.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)"
@@ -20,7 +20,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)}`"
diff --git a/packages/core/src/lifeRechargeServices.ts b/packages/core/src/lifeRechargeServices.ts
index e62802a..c7ed9f6 100644
--- a/packages/core/src/lifeRechargeServices.ts
+++ b/packages/core/src/lifeRechargeServices.ts
@@ -497,6 +497,7 @@
refundCheckRemark?: string;
/** 娓犻亾娴佹按鍙� */
acoolyOrderNo?: string;
+ frontStatus?: LifeRechargeConstants.LifePayOrderFrontStatusEnum;
}
export interface ElectricSupportAreaResponse {
--
Gitblit v1.9.1