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

pages/airTicket/airTicketOrderDetail.vue

@@ -536,31 +536,25 @@
 			goCancelZK() {
 				let that = this
 				uni.showLoading()
-				wx.showModal({
-					title: '提示',
-					content: '确定取消订单？',
-					success: (tip) => {
-						if (tip.confirm) {
-							that.apipost(
-								"GetCancelOrder_post", {
-									OrderNo: that.OrderNo,
-								},
-								(res) => {
-									if (res.resultCode == 1) {
-										uni.showToast({
-											title: "操作成功",
-											icon: "success",
-										});
-										that.setThemeHandle();
-										that.getOrderInfoHandler()
-									}
-									uni.hideLoading()
-								},
-								(err) => {}
-							);
-						}else uni.hideLoading()
+				that.apipost(
+					"GetCancelOrder_post", {
+						OrderNo: that.OrderNo,
+					},
+					(res) => {
+						if (res.resultCode == 1) {
+							uni.showToast({
+								title: "操作成功",
+								icon: "success",
+							});
+							that.setThemeHandle();
+							that.getOrderInfoHandler()
+						}
+						uni.hideLoading()
+					},
+					(err) => {
+						uni.hideLoading()
 					}
-				})
+				);
 				
 			},
 			requeryHandle(){