1

package1/order/orderDetail.vue

@@ -685,12 +685,18 @@
 
 		<uni-popup ref="returnPopupBuy" background-color="#fff" style="height: 1600rpx !important;">
 
-			<view class="guize-list">
+			<view class="guize-list" style="height: 600rpx;width:300rpx;padding: 20rpx;background: #fff;">
 				<view style="height: 80rpx;line-height: 80rpx;font-size: 36rpx;font-weight: 700;text-align: center;">
 					确定要取消拼团吗
 				</view>
+				
+				<view style="display:flex;margin-top:80px;">
+					<view class="btn" @tap="returnOrderBuy()" style="background: #777;color:#eee;">
+						取消
+					</view>
 					<view class="btn" @tap="returnOrderBuy()">
-					确认取消
+						确认
+					</view>
 				</view>
 			</view>
 		</uni-popup>
@@ -1084,7 +1090,12 @@
 
 					this.peisongTime = `${fmt(hours1)}时${fmt(minutes1)}分${fmt(seconds1)}秒`;
 				}
+				if(this.orderDetail.status != 10){
 					this.$refs.returnPopup.open('bottom');
+				}else{
+					this.$refs.returnPopupBuy.open()
+				}
+				
 			},
 			returnPopupPropBuy(item) {
 				this.payData = item;

package1/runErrand/runErrand.vue

@@ -1238,7 +1238,7 @@
 		height: 150rpx;
 		display: flex;
 		background: #fff;
-		z-index: 9999;
+		z-index: 99;
 		box-shadow: 0 -20rpx 30rpx rgba(0, 0, 0, 0.3);
 	}