From ddddcf83e7deb9d0a674d2bbead300089530d87e Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期三, 21 五月 2025 13:24:07 +0800 Subject: [PATCH] feat: UI --- packages/components/src/views/Order/components/ElectricOrder.vue | 72 ++++++++++++++++++++++++++++-------- 1 files changed, 56 insertions(+), 16 deletions(-) diff --git a/packages/components/src/views/Order/components/ElectricOrder.vue b/packages/components/src/views/Order/components/ElectricOrder.vue index a77b9f8..eac8a9e 100644 --- a/packages/components/src/views/Order/components/ElectricOrder.vue +++ b/packages/components/src/views/Order/components/ElectricOrder.vue @@ -1,43 +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="orderStatusEnum(item?.payStatus, item?.lifePayOrderStatus)" + :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 ?? '' + :value="`${JSON.parse(item?.orderParamDetailJsonStr)?.Province ?? ''} ${ + JSON.parse(item?.orderParamDetailJsonStr)?.City ?? '' }`" /> <OrderCardItem label="鍏呭�兼埛鍙�:" - :value="JSON.parse(item?.orderParamDetailJsonStr)?.electricAccount" + :value="JSON.parse(item?.orderParamDetailJsonStr)?.ElectricAccount" /> <OrderCardItem label="涓嬪崟鏃堕棿:" :value="item?.creationTime && dayjs(item?.creationTime).format('YYYY-MM-DD HH:mm:ss')" /> - <OrderCardItem label="鍏呭�奸噾棰�:" :value="`锟�${toThousand(item?.rechargeAmount)}`" /> - <OrderCardItem label="浼樻儬閲戦:" :value="`锟�${toThousand(item?.discountAmount)}`" /> - <OrderCardItem label="瀹炰粯閲戦:" :value="`锟�${toThousand(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="item?.payTime && dayjs(item?.payTime).format('YYYY-MM-DD HH:mm:ss')" /> + <OrderCardItem - v-if="item.payStatus === BlLifeRecharge.constants.LifePayStatusEnum.宸查��娆�" - label="閫�娆炬椂闂�:" - :value="item?.finishTime && dayjs(item?.refundTime).format('YYYY-MM-DD HH:mm:ss')" - > - </OrderCardItem> - <OrderCardItem - v-else + 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 + 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> @@ -50,7 +85,7 @@ import { useGetUserLifePayOrderPage } from '../../../hooks'; import { BlLifeRecharge } from '@life-payment/core-vue'; import dayjs from 'dayjs'; -import { toThousand, orderStatusEnum } from '../../../utils'; +import { toThousand, convertOrderFrontStatus } from '../../../utils'; defineOptions({ name: 'ElectricOrder', @@ -60,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