Merge branch 'master' of http://47.98.226.240:3000/twt/txCar

pages/module/confirmOrder.vue

@@ -568,7 +568,8 @@ export default {
 		color: #FFFFFF;
 	}
 	.topBox{
-		padding: 20rpx 24rpx;
+		padding: 20rpx 24rpx 0;
+		
 	}
 	.timeTop{
 		display: flex;
@@ -694,6 +695,7 @@ export default {
 		background: #FFFFFF;
 		padding: 24rpx 20rpx;
 		border-radius: 10rpx;
+		margin-top: 20rpx;
 	}
 	.mainTitle{
 		font-size: 28rpx;

pages/order/orderDetail.vue

@@ -550,7 +550,15 @@
 							}, 'POST').then(res => {
 								uni.hideLoading();
 
-								that.getData()
+								
+								uni.showModal({
+									title: '提示',
+									content: '订单取消成功',
+									showCancel:false,
+									success: function(res) {
+										that.getData()
+									}
+								});
 							})
 						} else if (res.cancel) {