From 15fd5c0039fe74798046be15b7089af13f4aa1bf Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Sun, 12 Jul 2026 17:53:58 +0800
Subject: [PATCH] 1

---
 package1/order/orderDetail.vue | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/package1/order/orderDetail.vue b/package1/order/orderDetail.vue
index bd491b5..19d142f 100644
--- a/package1/order/orderDetail.vue
+++ b/package1/order/orderDetail.vue
@@ -274,7 +274,7 @@
 									金额
 								</view>
 								<view style="color: #000;font-weight:700;">
-									￥{{item2.refundAmount}}
+									￥{{getDisplayRefundAmount(item2)}}
 								</view>
 							</view>
 							<view class="refund-goods-card" v-for="(item3,index3) in item2.items" :key="index3"
@@ -881,7 +881,7 @@
 			</view>
 		</uni-popup>
 
-		<uni-popup ref="addFeePopup" type="center" background-color="transparent">
+		<uni-popup ref="addFeePopup" type="center" background-color="transparent" @change="onCancelPopupChange">
 			<view class="commission-popup">
 				<view class="commission-popup-title">增加配送佣金</view>
 				<view class="commission-popup-desc">最低 0.1 元，最高 200 元，最多输入 2 位小数</view>
@@ -898,7 +898,7 @@
 		</uni-popup>
 
 		<!-- 增加佣金支付弹出层 -->
-		<uni-popup ref="addFeePayPopup" background-color="#fff">
+		<uni-popup ref="addFeePayPopup" background-color="#fff" @change="onCancelPopupChange">
 			<view class="pay-popup">
 				<view class="pay-popup-content">
 					<view class="box1">
@@ -980,7 +980,8 @@
 				payCountdownText: '60:00',
 				payCountdownSeconds: 0,
 				payCountdownTimer: null,
-				isExpanded: false
+				isExpanded: false,
+				refundAmountMode: 'user'
 			}
 		},
 		computed: {
@@ -1081,6 +1082,9 @@
 			if (option.id) {
 				this.orderId = option.id
 			}
+			if (option.refundAmountMode) {
+				this.refundAmountMode = option.refundAmountMode
+			}
 			// 监听配送员选择事件（在onLoad中注册一次，确保事件不会丢失）
 			uni.$on('updateDeliveryWorker', (worker) => {
 				this.handleWorkerSelected(worker);
@@ -1134,6 +1138,13 @@
 		},
 
 		methods: {
+			getDisplayRefundAmount(item) {
+				if (!item) return 0;
+				if (this.refundAmountMode == 'settlement') {
+					return item.settlementAmount != null ? item.settlementAmount : item.refundAmount;
+				}
+				return item.refundAmount;
+			},
 			startPayCountdown() {
 				this.stopPayCountdown();
 				if (this.orderDetail.status != 0 || !this.orderDetail.createTime) {