From c2f0ec3b3891bc177bdc58c2a111ab9c4fea911d Mon Sep 17 00:00:00 2001
From: shinnosuke <tantao@1hoper.com>
Date: 星期五, 18 九月 2026 17:13:38 +0800
Subject: [PATCH] 更新....
---
rencaika_merchant/pages/order-detail/order-detail.uvue | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/rencaika_merchant/pages/order-detail/order-detail.uvue b/rencaika_merchant/pages/order-detail/order-detail.uvue
index 4ead0dc..89aa5e3 100644
--- a/rencaika_merchant/pages/order-detail/order-detail.uvue
+++ b/rencaika_merchant/pages/order-detail/order-detail.uvue
@@ -74,7 +74,9 @@
createdAt.value = detail.createdAt.replace('T', ' ')
// 已取消/已退款：订单已经离开可核销范围，不能再说成「待核销」，也没有核销时间。
const closed = detail.status == 'cancelled' || detail.status == 'refunded'
- verificationAt.value = detail.verifyTime.length > 0 ? detail.verifyTime.replace('T', ' ') : (closed ? '—' : '待核销')
+ // 商家刚提交、等人才付款的到店消费订单同样还没核销。
+ const pendingPayment = detail.status == 'pending_payment'
+ verificationAt.value = detail.verifyTime.length > 0 ? detail.verifyTime.replace('T', ' ') : (closed || pendingPayment ? '—' : '待核销')
customerName.value = detail.customerName
customerPhone.value = detail.customerMobile
cardLevel.value = detail.cardLevel.length > 0 ? detail.cardLevel : '人才卡'
@@ -88,6 +90,10 @@
statusTitle.value = detail.statusText.length > 0 ? detail.statusText : (detail.status == 'cancelled' ? '已取消' : '已退款')
statusDesc.value = detail.status == 'cancelled' ? '订单在支付前已取消，无需核销。' : '退款已受理或完成，款项退回人才原支付账户，订单不再核销。'
statusIcon.value = '/static/icons/lucide/x.svg'
+ } else if (pendingPayment) {
+ statusTitle.value = detail.statusText.length > 0 ? detail.statusText : '待支付'
+ statusDesc.value = '订单已发送给人才，等待其完成支付。'
+ statusIcon.value = '/static/icons/lucide/clock-3.svg'
} else {
statusTitle.value = isCompleted.value ? '已完成' : '待核销'
statusDesc.value = isCompleted.value ? '订单已完成核销，相关权益已结算。' : '订单已完成支付，请确认后即可核销。'
--
Gitblit v1.7.1