11

package1/order/orderDetail.vue

@@ -176,9 +176,9 @@
 					<view style="width: 100%;line-height: 70rpx;font-size: 30rpx;font-weight: 700;">
 						退款/售后
 					</view>
-					<view style="display: flex;padding: 20rpx;background: #eee;border-radius: 20rpx;" v-for="(item2,index2) in orderDetail.mallRefundRecord" :key="index2">
+					<view style="display: flex;margin-top:10px;padding: 20rpx;background: #eee;border-radius: 20rpx;" v-for="(item2,index2) in orderDetail.mallRefundRecord" :key="index2">
 						
-						<view>
+						<view style="width: 100%;">
 							<view style="height: 80rpx;line-height: 80rpx;display: flex;">
 								<view style="flex: 1;color: #777;font-weight: 700;">
 									申请时间
@@ -503,40 +503,37 @@
 			</view>
 		</uni-popup>
 		
-		<uni-popup ref="returnPopup" background-color="#fff" style="height: 1600rpx !important;">
-			<view class="car-content" v-if="orderDetail.deliveryType == 1 && orderDetail.status != 10 && orderDetail.otherOrder != 1">
-				<view class="car-close">
-					<uni-icons type="close" size="30" color="#fff"></uni-icons>
-				</view>
-				<view class="car-title">
+		<uni-popup ref="returnPopup" background-color="#fff">
+			<view class="car-content" style="height: auto;padding: 20rpx;" v-if="orderDetail.deliveryType == 1 && orderDetail.status != 10 && orderDetail.otherOrder != 1">
+				<view class="car-title" style="padding: 0 20rpx;">
 					选择退款原因
 				</view>
-				<view class="">
-					<view class="">
-						全额退款（商家原因）
+				<view class="" style="padding: 0 20rpx;">
+					<view  style="height:80rpx;">
 						<radio :checked="sellTime==2" name="sellTime" @click="checkSellTime(2)" />
+						全额退款（商家原因）
 					</view>
-					<view class="">
-						全额退款（配送员原因）
+					<view  style="height:80rpx;">
 						<radio :checked="sellTime==3" name="sellTime" @click="checkSellTime(3)" />
+						全额退款（配送员原因）
 					</view>
-					<view class="">
-						全额退款（商家+配送员原因）
+					<view  style="height:80rpx;">
 						<radio :checked="sellTime==4" name="sellTime" @click="checkSellTime(4)" />
+						全额退款（商家+配送员原因）
 					</view>
 				</view>
-			</view>
-			<view class="guize-list">
-				<view style="height: 80rpx;line-height: 80rpx;font-size: 36rpx;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 class="guize-list">
+					<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>
+					</view>
+					<view class="btn" @tap="returnOrder()">
+						确认取消
 					</view>
-				</view>
-				<view class="btn" @tap="returnOrder()">
-					确认取消
 				</view>
 			</view>
 		</uni-popup>
@@ -1492,4 +1489,19 @@
 			margin-right: 20rpx;
 		}
 	}
+	.car-close {
+		width: 60rpx;
+		height: 60rpx;
+		position: absolute;
+		top: -80rpx;
+		right: 20rpx;
+	}
+	
+	.car-title {
+		height: 96rpx;
+		line-height: 60rpx;
+		margin: 0 auto;
+		font-size: 28rpx;
+		font-weight: 700;
+	}
 </style>

package1/order/orderEvaluate.vue

@@ -191,7 +191,7 @@
 				let that = this
 				that.tui.request("/mall/order/detail/"+this.shopData.id, "GET", {}, false, true).then((res) => {
 					if (res.code == 200) {
-						that.manId = res.result.deliveryInfo.id;
+						that.manId = res.result.deliveryInfo.workerId;
 					} else {
 						that.tui.toast(res.message)
 					}