From add9b3bb61fcc337b02c15e7973967d670e7d3be Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期三, 21 五月 2025 17:17:28 +0800 Subject: [PATCH] Merge branch 'dev-ui' of http://120.26.58.240:8888/r/LifePaymentFront into dev-ui --- packages/components/src/components/Card/OrderCard.vue | 75 ++++++++++++++++++++++++++----------- 1 files changed, 53 insertions(+), 22 deletions(-) diff --git a/packages/components/src/components/Card/OrderCard.vue b/packages/components/src/components/Card/OrderCard.vue index d261033..f252c3e 100644 --- a/packages/components/src/components/Card/OrderCard.vue +++ b/packages/components/src/components/Card/OrderCard.vue @@ -1,42 +1,46 @@ <template> <div class="order-card"> <div class="order-card-title"> - <div class="order-card-title-top"> - <div class="order-card-title-text">{{ title }}</div> - <div class="order-card-title-status"> - {{ LifeRechargeConstants.LifePayOrderStatusEnumText[status] }} + <div class="order-card-title-left"> + <div class="order-card-title-text-wrapper"> + <div class="order-card-title-text">{{ title }}</div> + <div class="order-card-title-status"> + <img :src="StatusEnumImg" alt="" /> + </div> </div> - </div> - <div class="order-card-title-ordernum-wrapper"> <div class="order-card-title-ordernum"> {{ `璁㈠崟缂栧彿锛�${orderNo}` }} </div> - <slot name="actions"> - <div - class="order-card-action" - v-if="status === LifeRechargeConstants.LifePayOrderStatusEnum.鍏呭�间腑" - @click="emit('goApplyRefund', id)" - > - 鐢宠閫�娆� - </div> - <div - class="order-card-action" - v-if="status === LifeRechargeConstants.LifePayOrderStatusEnum.閫�娆惧け璐�" - @click="emit('goRefundDetail', orderNo)" - > - 璇︽儏 - </div> - </slot> </div> </div> <div class="order-card-content"> <slot></slot> </div> + <slot name="actions"> + <div class="order-card-footer" v-if="showFooter"> + <div + v-if="status === LifeRechargeConstants.LifePayOrderStatusEnum.鍏呭�间腑" + class="order-card-action" + @click="emit('goApplyRefund', id)" + > + 鐢宠閫�娆� + </div> + <div + class="order-card-action" + v-if="frontStatus === LifeRechargeConstants.LifePayOrderFrontStatusEnum.閫�娆惧け璐�" + @click="emit('goRefundDetail', orderNo)" + > + 璇︽儏 + </div> + </div> + </slot> </div> </template> <script setup lang="ts"> import { LifeRechargeConstants } from '@life-payment/core-vue'; +import { OssAssets } from '../../constants'; +import { computed } from 'vue'; defineOptions({ name: 'OrderCard', @@ -45,6 +49,7 @@ type Props = { title: string; status?: LifeRechargeConstants.LifePayOrderStatusEnum; + frontStatus?: LifeRechargeConstants.LifePayOrderFrontStatusEnum; orderNo: string; id: string; }; @@ -55,4 +60,30 @@ (e: 'goApplyRefund', id: string): void; (e: 'goRefundDetail', orderNo: string): void; }>(); + +const LifePayOrderStatusEnumImg = { + [LifeRechargeConstants.LifePayOrderStatusEnum.鍏呭�间腑]: OssAssets.card.Recharge, + [LifeRechargeConstants.LifePayOrderStatusEnum.宸插け璐: OssAssets.card.Failed, + [LifeRechargeConstants.LifePayOrderStatusEnum.宸插畬鎴怾: OssAssets.card.Success, + [LifeRechargeConstants.LifePayOrderStatusEnum.寰呴��娆綸: OssAssets.card.WaitRefund, + [LifeRechargeConstants.LifePayOrderStatusEnum.宸查��娆綸: OssAssets.card.Refunded, + [LifeRechargeConstants.LifePayOrderStatusEnum.閫�娆惧け璐: OssAssets.card.RefundFail, + [LifeRechargeConstants.LifePayOrderStatusEnum.閫�娆句腑]: OssAssets.card.Refund, +}; + +const StatusEnumImg = computed(() => { + if (props.frontStatus === LifeRechargeConstants.LifePayOrderFrontStatusEnum.閫�娆惧け璐�) { + return OssAssets.card.RefundFail; + } else { + return LifePayOrderStatusEnumImg[props.status]; + } +}); + +const showFooter = computed(() => { + return ( + props.status === LifeRechargeConstants.LifePayOrderStatusEnum.鍏呭�间腑 || + props.status === LifeRechargeConstants.LifePayOrderStatusEnum.閫�娆惧け璐� || + props.frontStatus === LifeRechargeConstants.LifePayOrderFrontStatusEnum.閫�娆惧け璐� + ); +}); </script> -- Gitblit v1.9.1