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/PhoneOrder.vue | 86 +++++++++++++++++++++++++++++++++++-------- 1 files changed, 70 insertions(+), 16 deletions(-) diff --git a/packages/components/src/views/Order/components/PhoneOrder.vue b/packages/components/src/views/Order/components/PhoneOrder.vue index 530a7cf..e938035 100644 --- a/packages/components/src/views/Order/components/PhoneOrder.vue +++ b/packages/components/src/views/Order/components/PhoneOrder.vue @@ -1,23 +1,72 @@ <template> - <!-- <InfiniteLoading scrollViewClassName="common-infinite-scroll-list" v-bind="infiniteLoadingProps"> - <template #renderItem="{ item }"> --> - <OrderCard title="璇濊垂鍏呭��" status="寰呮敮浠�"> - <OrderCardItem label="鍏呭�艰处鍙�:" :value="'18888888888'" /> - <OrderCardItem label="涓嬪崟鏃堕棿:" :value="'18888888888'" /> - <OrderCardItem label="鍏呭�奸噾棰�:" :value="'18888888888'" /> - <OrderCardItem label="浼樻儬閲戦:" :value="'18888888888'" /> - <OrderCardItem label="瀹炰粯閲戦:" :value="'18888888888'" /> - <OrderCardItem label="鏀粯鏃堕棿:" :value="'2025-02-19 17:15:54'" /> - <OrderCardItem label="瀹屾垚鏃堕棿:" :value="'2025-02-19 17:15:54'" /> - </OrderCard> - <!-- </template> - </InfiniteLoading> --> + <InfiniteLoading + scrollViewClassName="life-page-infinite-scroll-list" + v-bind="infiniteLoadingProps" + > + <template #renderItem="{ item }"> + <OrderCard + title="璇濊垂鍏呭��" + :status="item?.frontStatus" + :order-no="item?.orderNo" + :id="item?.id" + @goApplyRefund="emit('goApplyRefund', $event)" + @goRefundDetail="emit('goRefundDetail', $event)" + > + <OrderCardItem + label="鍏呭�艰处鍙�:" + :value="JSON.parse(item?.orderParamDetailJsonStr)?.phone" + /> + <OrderCardItem + label="涓嬪崟鏃堕棿:" + :value="item?.creationTime && dayjs(item?.creationTime).format('YYYY-MM-DD HH:mm:ss')" + /> + <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.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.鍏呭�兼垚鍔� || + item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.鏀粯鎴愬姛 + " + label="瀹屾垚鏃堕棿:" + :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?.refundTime && dayjs(item?.refundTime).format('YYYY-MM-DD HH:mm:ss')" + > + </OrderCardItem> + </template> + </OrderCard> + </template> + </InfiniteLoading> </template> <script setup lang="ts"> import InfiniteLoading from '../../../components/InfiniteLoading/InfiniteLoading.vue'; import OrderCard from '../../../components/Card/OrderCard.vue'; import OrderCardItem from '../../../components/Card/OrderCardItem.vue'; +import { useGetUserLifePayOrderPage } from '../../../hooks'; +import dayjs from 'dayjs'; +import { BlLifeRecharge } from '@life-payment/core-vue'; +import { toThousand, convertOrderFrontStatus } from '../../../utils'; defineOptions({ name: 'PhoneOrder', @@ -27,7 +76,12 @@ // const props = withDefaults(defineProps<Props>(), {}); -const infiniteLoadingProps = {}; -</script> +const emit = defineEmits<{ + (e: 'goApplyRefund', id: string): void; + (e: 'goRefundDetail', orderNo: string): void; +}>(); -<style lang="scss"></style> +const { infiniteLoadingProps } = useGetUserLifePayOrderPage({ + lifePayOrderType: BlLifeRecharge.constants.LifePayOrderTypeEnum.璇濊垂璁㈠崟, +}); +</script> -- Gitblit v1.9.1