From de9c55f5d425903ac1fb947bf3c9eeaf9cfe9f20 Mon Sep 17 00:00:00 2001
From: tianyi <13521030702@163.com>
Date: Fri, 8 May 2026 10:22:30 +0800
Subject: [PATCH] 1

---
 package1/order/orderDetail.vue | 57 +++++++++++++++++++++++++++-------
 1 file changed, 46 insertions(+), 11 deletions(-)

diff --git a/package1/order/orderDetail.vue b/package1/order/orderDetail.vue
index 5409f12..8a1cc52 100644
--- a/package1/order/orderDetail.vue
+++ b/package1/order/orderDetail.vue
@@ -514,7 +514,7 @@
 		</uni-popup>
 		
 		<uni-popup ref="returnPopup" background-color="#fff">
-			<view class="car-content" style="height: auto;padding: 20rpx;" v-if="orderDetail.status != 10">
+			<view class="car-content" style="height: auto;padding: 20rpx 20rpx 0;" v-if="orderDetail.status != 10">
 				<view class="car-title" style="padding: 0 20rpx;">
 					选择退款原因
 				</view>
@@ -537,14 +537,14 @@
 					</view>
 				</view>
 				<view class="guize-list">
-					<view style="border-bottom: 5px solid #eee;border-top: 5px solid #eee;padding: 10px 0;">
+					<view style="border-bottom: 10rpx solid #eee;border-top: 10rpx solid #eee;padding: 20rpx 0;">
 						<view style="flex: 1;color: #777;font-weight: 700;">
 							申请说明
 						</view>
 						<view style="">
 							<textarea name="" id="" cols="30" rows="10" placeholder="请填写备注" v-model="returnData.reason"
-								style="width: 100%;height: 100px;padding: 5px;margin-top: 10px;"></textarea>
-							<view style="width: 60px;height: 60px;border: 1px solid #eee;text-align: center;line-height: 60px;">
+								style="width: 100%;height: 100rpx;padding: 10rpx;margin-top: 20rpx;"></textarea>
+							<view style="width: 120rpx;height: 120rpx;border: 1px solid #eee;text-align: center;line-height: 60px;">
 								<view class="upload-img" @tap="pictureAdd" style="">
 									<uni-icons type="camera" size="28" color="#777"></uni-icons>
 								</view>
@@ -554,14 +554,49 @@
 							</view>
 						</view>
 					</view>
-					<view style="height: 180rpx;line-height: 80rpx;font-size: 28rpx;font-weight: 700;text-align: center;">
-						<text v-if="(((payData.orderType == 2 || payData.orderType == 3) && payData.status == 2) || ((payData.orderType == 2 || payData.orderType == 3) && payData.status == 3)  || (payData.deliveryType == 1 && payData.status == 3) || payData.status == 4) && payData.otherOrder == null">取消订单需要商家同意</text>
-						<view v-if="(payData.status == 3 && payData.deliveryType ==1) || payData.status == 4">
-							<text v-if="payData.shopMakeTime == null && payData.otherOrder == null">商家还未出餐</text>
-							<text v-if="payData.shopMakeTime != null && payData.otherOrder == null">本单商家备餐时长共计{{shopTime}} 配送员配送时长共计{{peisongTime}}</text>
+					<!-- <view style="line-height: 60rpx;font-size: 24rpx;font-weight: 700;text-align: center;"> -->
+						<view style="margin-top: 20rpx; color: #ff5722; font-size: 24rpx; background: #fff5f5; padding: 10rpx 20rpx; border-radius: 10rpx;">
+							<uni-icons type="info" size="14" color="#ff5722"></uni-icons>
+							<text v-if="(((payData.orderType == 2 || payData.orderType == 3) && payData.status == 2) || ((payData.orderType == 2 || payData.orderType == 3) && payData.status == 3)  || (payData.deliveryType == 1 && payData.status == 3) || payData.status == 4) && payData.otherOrder == null">
+								取消订单需要商家同意
+							</text>
+							<view v-if="(payData.status == 3 && payData.deliveryType ==1) || payData.status == 4" style="line-height: 50rpx;margin-top: 16rpx;">
+								<view v-if="payData.shopMakeTime == null && payData.otherOrder == null" style="text-align: right;">
+									<uni-icons type="info" size="14" color="#ff5722"></uni-icons> 
+									<text style="display:inline-block;padding-left:5px;"> 
+										商家还未出餐
+									</text>
+								</view>
+								<view v-if="payData.shopMakeTime == null && payData.otherOrder == null">
+									<view style="color: #ff5722;">
+										<uni-icons type="info" size="14" color="#ff5722"></uni-icons> 
+										
+										<text style="display:inline-block;padding-left:5px;">
+											配送员到店时间：{{shopTime}}
+										</text>
+									</view>
+								</view>
+								<view v-if="payData.shopMakeTime != null && payData.otherOrder == null">
+									<view style="color: #ff5722;">
+										<uni-icons type="info" size="14" color="#ff5722"></uni-icons> 
+										<text style="display:inline-block;padding-left:5px;">
+											本单商家备餐时长：{{shopTime}}
+										</text>
+									</view>
+								</view>
+								<view v-if="payData.shopMakeTime != null && payData.otherOrder == null">
+									<view style="color: #ff5722;">
+										<uni-icons type="info" size="14" color="#ff5722"></uni-icons>
+										<text style="display:inline-block;padding-left:5px;">
+											配送员配送时长：{{peisongTime}}
+										</text>
+									</view>
+								</view>
+							</view>
 						</view>
-					</view>
-					<view class="btn" @tap="returnOrder()">
+						
+					<!-- </view> -->
+					<view class="btn" @tap="returnOrder()" style="margin-top: 20px;">
 						确认取消
 					</view>
 				</view>