1

package1/order/orderDetail.vue

@@ -102,7 +102,7 @@
 			</view>
 		</view>
 		<view class="" v-else>
-			<view class="order-detail-fixed-header">
+			<view class="order-detail-fixed-header" :class="{'order-detail-fixed-header-lower': popupPageStyle}">
 				<view class="title">
 					<view class="title-sreach">
 						<view class="back-btn" @tap="back" :style="{'top': menuButtonInfo.top +'px'}">
@@ -205,10 +205,10 @@
 						<view class="flow-dot"></view>
 						<view class="flow-name">{{orderDetail.deliveryType == 1 ? '配送中' : '核销中'}}</view>
 					</view>
-					<view class="flow-line" :class="{'active': orderDetail.status == 5 || orderDetail.status == 8 || orderDetail.status == 12}"></view>
-					<view class="flow-item" :class="{'active': orderDetail.status == 5 || orderDetail.status == 8 || orderDetail.status == 12}">
+					<view class="flow-line" :class="{'active': isOrderFlowFinalActive}"></view>
+					<view class="flow-item" :class="{'active': isOrderFlowFinalActive}">
 						<view class="flow-dot"></view>
-						<view class="flow-name">已完成</view>
+						<view class="flow-name">{{orderFlowFinalName}}</view>
 					</view>
 				</view>
 				<view class="btn-box">
@@ -702,10 +702,10 @@
 			</view>
 		</uni-popup>
 
-		<uni-popup ref="returnPopup" background-color="#fff" @change="onCancelPopupChange">
+		<uni-popup ref="returnPopup" type="bottom" background-color="#fff" @change="onCancelPopupChange">
 			<view class="car-content cancel-popup">
 				<view class="car-close" @tap="$refs.returnPopup.close()">
-					<uni-icons type="close" size="30" color="#fff"></uni-icons>
+					<uni-icons type="close" size="24" color="#243f38"></uni-icons>
 				</view>
 				<view class="car-title" style="padding: 0 20rpx;">
 					选择退款原因
@@ -993,6 +993,18 @@
 					? this.orderDetail.deliveryInfo.receiverAddress
 					: '';
 				return String(address).length > 20;
+			},
+			orderFlowFinalName() {
+				const statusNameMap = {
+					7: '待同意退款',
+					8: '已退款',
+					11: '售后中',
+					12: '已售后'
+				};
+				return statusNameMap[Number(this.orderDetail.status)] || '已完成';
+			},
+			isOrderFlowFinalActive() {
+				return [5, 7, 8, 11, 12].includes(Number(this.orderDetail.status));
 			}
 		},
 		components: {
@@ -2252,7 +2264,7 @@
 		top: 0;
 		left: 0;
 		right: 0;
-		height: 430rpx;
+		height: 380rpx;
 		z-index: 999;
 		background:
 			radial-gradient(circle at 12% 8%, rgba(166, 255, 234, 0.48) 0, rgba(166, 255, 234, 0) 260rpx),
@@ -2261,9 +2273,13 @@
 		overflow: visible;
 	}
 
+	.order-detail-fixed-header-lower {
+		z-index: 1;
+	}
+
 	.order-detail-header-content {
 		position: absolute;
-		top: 190rpx;
+		top: 170rpx;
 		left: 0;
 		width: 100%;
 		z-index: 2;
@@ -2276,13 +2292,13 @@
 	}
 
 	.order-detail-content {
-		padding-top: 430rpx;
+		padding-top: 390rpx;
 		box-sizing: border-box;
 		z-index: 1;
 	}
 
 	.order-detail-content-address-long {
-		padding-top: 490rpx;
+		padding-top: 450rpx;
 	}
 
 	.title-sreach {
@@ -2711,7 +2727,7 @@
 
 	.pay-popup {
 		width: 100vw;
-		min-height: 580rpx;
+		min-height: 560rpx;
 		padding: 30rpx 0 calc(28rpx + env(safe-area-inset-bottom));
 		box-sizing: border-box;
 		background: #fff;
@@ -2779,9 +2795,10 @@
 	}
 
 	.cancel-popup {
+		position: relative;
 		max-height: 86vh;
-		padding: 20rpx 20rpx 0 !important;
-		overflow: hidden;
+		padding: 20rpx 20rpx calc(8rpx + env(safe-area-inset-bottom)) !important;
+		overflow: visible;
 		box-sizing: border-box;
 		background: #fff;
 	}
@@ -2912,7 +2929,7 @@
 
 	.cancel-confirm-btn {
 		width: 95%;
-		margin: 18rpx auto 20rpx;
+		margin: 18rpx auto 0;
 	}
 
 	.evaluate-content {
@@ -3577,8 +3594,14 @@
 		width: 60rpx;
 		height: 60rpx;
 		position: absolute;
-		top: -80rpx;
-		right: 20rpx;
+		top: 18rpx;
+		right: 28rpx;
+		z-index: 2;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		border-radius: 50%;
+		background: rgba(0, 35, 28, 0.06);
 	}
 
 	.car-title {