Merge branch 'B2C' of http://gitlab.oytour.com/zk123/jz_travel into B2C

pages/airTicket/airTicketOrderDetail.vue

@@ -536,11 +536,6 @@
 			goCancelZK() {
 				let that = this
 				uni.showLoading()
-				wx.showModal({
-					title: '提示',
-					content: '确定取消订单？',
-					success: (tip) => {
-						if (tip.confirm) {
 				that.apipost(
 					"GetCancelOrder_post", {
 						OrderNo: that.OrderNo,
@@ -556,11 +551,10 @@
 						}
 						uni.hideLoading()
 					},
-								(err) => {}
-							);
-						}else uni.hideLoading()
+					(err) => {
+						uni.hideLoading()
 					}
-				})
+				);
 				
 			},
 			requeryHandle(){