From 64c1a06bd5ea9e18a323b931635ddb4a283e167c Mon Sep 17 00:00:00 2001 From: youmengting <2080639302@qq.com> Date: Mon, 8 May 2023 14:39:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E8=BF=87?= =?UTF-8?q?=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail-popup/detail-popup.vue | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/physical-merchants/settleAccounts/detail-popup/detail-popup.vue b/physical-merchants/settleAccounts/detail-popup/detail-popup.vue index acf9fd1..3bebe11 100644 --- a/physical-merchants/settleAccounts/detail-popup/detail-popup.vue +++ b/physical-merchants/settleAccounts/detail-popup/detail-popup.vue @@ -157,21 +157,24 @@ {{item.discountName}} - 截止时间:{{item.useEndTime | formatDate }} + 截止时间:{{item.useEndTime | formatDate }} 已过期 + - - + + - - - 不可用原因 - - 使用门槛为{{item.discountCondition}}元，还差{{ parseFloat((item.discountCondition-totalPrice).toFixed(2)) }}元才能使用 + + From 4a0fff847944b8bf8fe608a375f0353fcd99186a Mon Sep 17 00:00:00 2001 From: youmengting <2080639302@qq.com> Date: Mon, 8 May 2023 14:50:09 +0800 Subject: [PATCH 2/2] update --- physical-merchants/settleAccounts/detail-popup/detail-popup.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/physical-merchants/settleAccounts/detail-popup/detail-popup.vue b/physical-merchants/settleAccounts/detail-popup/detail-popup.vue index 3bebe11..8121e8d 100644 --- a/physical-merchants/settleAccounts/detail-popup/detail-popup.vue +++ b/physical-merchants/settleAccounts/detail-popup/detail-popup.vue @@ -162,7 +162,7 @@ - +