From e6730c74cefa50c6af4611b6789e5b06533912c0 Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Thu, 16 Jul 2026 14:01:58 +0800
Subject: [PATCH] 1
---
pages/shop/orderDetail.vue | 1076 +++++++++++++++++++++++++++++++++---
1 file changed, 986 insertions(+), 90 deletions(-)
diff --git a/pages/shop/orderDetail.vue b/pages/shop/orderDetail.vue
index 20be61e..84fa3ce 100644
--- a/pages/shop/orderDetail.vue
+++ b/pages/shop/orderDetail.vue
@@ -11,53 +11,66 @@
+
-
- {{'#'+data.numberCode}}
- 期望送达
- {{formattedMustFinishTime}}
-
+
- {{data.deliveryType == 1?'配送订单':data.isPack == 1?'自取-打包':data.isPack == 0?'自取-堂食':'自取'}}
+ {{(data.deliveryType == 1 && data.orderType != 3)?'普通配送单':(data.deliveryType == 1 && data.orderType == 3)?'面对面配送单':(data.isPack == 1 && data.otherOrder == null)?'自取-打包':(data.isPack == 0 && data.otherOrder == null)?'自取-堂食':'到店消费'}}
- 配送员:{{data.deliveryInfo.workerName}}
-
+ {{data.shopDelivery == 1 ? '商家配送员' : '配送员'}}:{{getWorkerName(data)}}
+
-
+
收货人:{{data.deliveryInfo.receiverName}}
-
+
{{data.deliveryInfo.receiverAddress}}
+
+ 预计{{data.deliveryInfo.mustFinishTime | formatHourMinute}}送达
+
-
+
+
商品 共{{data.goodsNum}}件
-
+
- {{item.productName}}
+ {{item.productName}}
+ {{item.specs | delNode}}
{{'x'+ item.quantity}}
- {{'¥'+ item.price == undefined ? 0 : item.price}}
+ ¥{{formatAmount(item.price)}}
@@ -67,15 +80,39 @@
商品金额
- {{'¥' + data.goodsAmount == undefined ? 0 : data.goodsAmount}}
+ ¥{{formatAmount(data.goodsAmount)}}
-
+
+
+ 打包/餐盒费
+
+
+ ¥{{formatAmount(data.packageFee)}}
+
+
+
配送费
- {{'¥' + data.deliveryFee == undefined ? 0 : data.deliveryFee}}
+ ¥{{formatAmount(data.deliveryFee)}}
+
+
+
+
+ 锦鲤免单
+
+
+ -¥{{formatAmount(data.freeAmount)}}
+
+
+
+
+ 优惠券
+
+
+ -¥{{formatAmount(data.userCoupon[0].discountAmount)}}
@@ -83,10 +120,10 @@
客户实际支付
- {{'¥'+ data.totalAmount == undefined ? 0 : data.totalAmount}}
+ ¥{{formatAmount(data.totalAmount)}}
-
+
平台服务费
@@ -96,6 +133,112 @@
+
+
+ 退款/售后
+
+ 平台介入
+
+
+
+
+ 申请时间
+ {{item.createTime | formatISOTime}}
+
+
+ 金额
+ ¥{{formatMoney(getMerchantRefundDisplayAmount(item))}}
+
+
+
+
+
+
+ {{goods.productName}}
+ {{goods.specs | delNode}}
+
+ X{{goods.quantity}}
+ ¥{{formatAmount(goods.price)}}
+
+
+ 餐盒费
+ ¥{{formatAmount(goods.packageFee)}}
+
+
+
+
+ 原因
+ {{item.reason != null ? item.reason : ''}}
+
+
+ 图片
+
+
+
+
+
+ 退款/售后类型
+ {{getRefundTypeText(item)}} | {{getRefundReasonTypeText(item)}}
+
+
+ 退款/售后状态
+ {{getRefundStatusText(item)}}
+
+
+ 拒绝原因
+ {{item.rejectReason}}
+
+
+ {{getAutoRefundTime(item.createTime)}} 之前对方未处理系统会自动退款
+
+
+ 处理退款/售后时间
+ {{item.successTime | formatISOTime}}
+
+
+
+
+
+
+ 结算基数
+ ¥{{formatMoney(data.incomeSummary.baseAmount)}}
+
+ 商品金额 ¥{{formatMoney(data.goodsAmount)}} + 餐盒/打包费 ¥{{formatMoney(data.packageFee)}}
+
+ 抽佣比例
+ {{formatMoney(data.incomeSummary.commissionRate)}}%
+
+
+ 正常结算
+ ¥{{formatMoney(data.incomeSummary.normalSettlementAmount)}}
+
+
+ ¥{{formatMoney(data.incomeSummary.normalBaseAmount)}} - 平台服务费 ¥{{formatMoney(data.incomeSummary.normalCommissionAmount)}}
+
+
+ 退款/售后责任扣款
+ -¥{{formatMoney(data.incomeSummary.deductionSettlementAmount)}}
+
+
+ 责任金额 ¥{{formatMoney(data.incomeSummary.deductionBaseAmount)}} - 返还服务费 ¥{{formatMoney(data.incomeSummary.deductionCommissionAmount)}}
+
+
+ 商家预计收入
+ ¥{{formatMoney(data.incomeSummary.expectedIncome)}}
+
+ 正常结算 - 退款/售后责任扣款
+ {{data.incomeSummary.remark}}
+
+
+
+ {{line.name}}
+ {{line.amount < 0 ? '-' : ''}}¥{{formatMoney(absAmount(line.amount))}}
+
+
+
@@ -114,15 +257,95 @@
{{data.createTime | formatISOTime}}
-
+
+
+ 支付时间
+
+
+ {{data.payTime | formatISOTime}}
+
+
+
+
+ 成团时间
+
+
+ {{data.groupInfo.successTime | formatISOTime}}
+
+
+
+
+ 核销时间
+
+
+ {{data.shopMakeTime | formatISOTime}}
+
+
+
+
+ 接单时间
+
+
+ {{data.deliveryInfo.acceptTime | formatISOTime}}
+
+
+
+
+ 商家出餐时间
+
+
+ {{data.shopMakeTime | formatISOTime}}
+
+
+
+
+ 到店时间
+
+
+ {{data.deliveryInfo.arriveTime | formatISOTime}}
+
+
+
+
+ 取货时间
+
+
+ {{data.deliveryInfo.getTime | formatISOTime}}
+
+
+
+
+ {{data.deliveryInfo.finishTime ? '送达时间' : '预计送达'}}
+
+
+ {{(data.deliveryInfo.finishTime || data.deliveryInfo.mustFinishTime || '尽快送达') | formatISOTime}}
+
+
+
+
+ 中转配送
+
+
+ {{data.deliveryInfo.transferAddressName || data.transferAddressName || '是'}}
+
+
+
+
+ 送达中转点
+
+
+ {{data.deliveryInfo.transferArriveTime ? formatTimeText(data.deliveryInfo.transferArriveTime) : '未送达'}}
+
+
+
+
团购信息
@@ -133,19 +356,21 @@
-
-
+
+
预计收入
- ¥{{data.yujishouru?data.yujishouru:0}}
+ ¥{{data.incomeSummary ? formatMoney(data.incomeSummary.expectedIncome) : (data.yujishouru?data.yujishouru:0)}}
-
+
打印小票
+
+
已出餐
@@ -153,16 +378,16 @@
-
+
- {{data.groupInfo?data.groupInfo.targetMembers:0}}人团/已拼{{data.groupInfo?data.groupInfo.currentMembers:0}}人
+ {{data.groupInfo.targetMembers}}人团/已拼{{data.groupInfo.currentMembers}}人
-
-
+
+
-
+
{{item | lastFour}}
@@ -171,7 +396,7 @@
-
+
+
@@ -186,15 +411,30 @@