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/PhoneOrder.vue | 39 +++++++++++++++++++++++++++++++-------- 1 files changed, 31 insertions(+), 8 deletions(-) diff --git a/packages/components/src/views/Order/components/PhoneOrder.vue b/packages/components/src/views/Order/components/PhoneOrder.vue index babe217..126dbf5 100644 --- a/packages/components/src/views/Order/components/PhoneOrder.vue +++ b/packages/components/src/views/Order/components/PhoneOrder.vue @@ -1,23 +1,45 @@ <template> <InfiniteLoading scrollViewClassName="common-infinite-scroll-list" v-bind="infiniteLoadingProps"> <template #renderItem="{ item }"> - <OrderCard title="璇濊垂鍏呭��" status="寰呮敮浠�" :order-no="item?.orderNo"> - <OrderCardItem label="鍏呭�艰处鍙�:" :value="'18888888888'" /> + <OrderCard + title="璇濊垂鍏呭��" + :status="orderStatusEnum(item?.payStatus, item?.lifePayOrderStatus)" + :order-no="item?.orderNo" + > + <OrderCardItem + label="鍏呭�艰处鍙�:" + :value="JSON.parse(item?.orderParamDetailJsonStr)?.phone" + /> <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.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="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.payStatus !== BlLifeRecharge.constants.LifePayStatusEnum.宸查��娆�" label="瀹屾垚鏃堕棿:" - :value="dayjs(item?.finishTime).format('YYYY-MM-DD HH:mm:ss')" + :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> @@ -30,6 +52,7 @@ import { useGetUserLifePayOrderPage } from '../../../hooks'; import dayjs from 'dayjs'; import { BlLifeRecharge } from '@life-payment/core-vue'; +import { toThousand, orderStatusEnum } from '../../../utils'; defineOptions({ name: 'PhoneOrder', -- Gitblit v1.9.1