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 | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/packages/components/src/components/Card/OrderCard.vue b/packages/components/src/components/Card/OrderCard.vue
index d8f2a47..f252c3e 100644
--- a/packages/components/src/components/Card/OrderCard.vue
+++ b/packages/components/src/components/Card/OrderCard.vue
@@ -2,20 +2,22 @@
<div class="order-card">
<div class="order-card-title">
<div class="order-card-title-left">
- <div class="order-card-title-text">{{ title }}</div>
+ <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 class="order-card-title-ordernum">
{{ `璁㈠崟缂栧彿锛�${orderNo}` }}
</div>
- </div>
- <div class="order-card-title-status">
- <img :src="LifePayOrderStatusEnumImg[status]" alt="" />
</div>
</div>
<div class="order-card-content">
<slot></slot>
</div>
<slot name="actions">
- <div class="order-card-footer" v-if="shoeFooter">
+ <div class="order-card-footer" v-if="showFooter">
<div
v-if="status === LifeRechargeConstants.LifePayOrderStatusEnum.鍏呭�间腑"
class="order-card-action"
@@ -25,7 +27,7 @@
</div>
<div
class="order-card-action"
- v-if="status === LifeRechargeConstants.LifePayOrderStatusEnum.閫�娆惧け璐�"
+ v-if="frontStatus === LifeRechargeConstants.LifePayOrderFrontStatusEnum.閫�娆惧け璐�"
@click="emit('goRefundDetail', orderNo)"
>
璇︽儏
@@ -47,6 +49,7 @@
type Props = {
title: string;
status?: LifeRechargeConstants.LifePayOrderStatusEnum;
+ frontStatus?: LifeRechargeConstants.LifePayOrderFrontStatusEnum;
orderNo: string;
id: string;
};
@@ -68,10 +71,19 @@
[LifeRechargeConstants.LifePayOrderStatusEnum.閫�娆句腑]: OssAssets.card.Refund,
};
-const shoeFooter = computed(() => {
+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.status === LifeRechargeConstants.LifePayOrderStatusEnum.閫�娆惧け璐� ||
+ props.frontStatus === LifeRechargeConstants.LifePayOrderFrontStatusEnum.閫�娆惧け璐�
);
});
</script>
--
Gitblit v1.9.1