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/GasOrder.vue | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/packages/components/src/views/Order/components/GasOrder.vue b/packages/components/src/views/Order/components/GasOrder.vue index d8f3aa6..2c225aa 100644 --- a/packages/components/src/views/Order/components/GasOrder.vue +++ b/packages/components/src/views/Order/components/GasOrder.vue @@ -6,8 +6,9 @@ <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)" @goRefundDetail="emit('goRefundDetail', $event)" > @@ -19,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)}`" @@ -33,7 +39,10 @@ :value="item?.payTime && dayjs(item?.payTime).format('YYYY-MM-DD HH:mm:ss')" /> <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')" /> @@ -68,7 +77,7 @@ // const props = withDefaults(defineProps<Props>(), {}); const emit = defineEmits<{ - (e: 'goApplyRefund', orderNo: string): void; + (e: 'goApplyRefund', id: string): void; (e: 'goRefundDetail', orderNo: string): void; }>(); -- Gitblit v1.9.1