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

pages/airTicket/components/TicketOrderList.vue

@@ -223,38 +223,49 @@
                 if(this.DataLists[this.i].loading){
                     return
                 }
-                //未付款-调用后台取消
-                uni.showLoading({
-                    title: "请稍等片刻...",
-                })
-                this.DataLists[this.i].loading = true
                 if (
                     (item.paymentTime == null || item.paymentTime == "") &&
                     (item.orderState == 1||item.orderState == 2)
                 ) {
-                    this.apipost(
-                    "GetCancelOrder_post",
-                    {
-                        OrderNo: '',
-                        ErpOrderId: item.orderId,
-					    OrderTypeStr: 'DMC',
-                    },
-                    (res) => {
-                        if (res.resultCode == 1) {
-                            uni.showToast({
-                                title: "操作成功",
-                                icon: "success",
-                            });
-                            that.$emit('research',that.dataMsg.orderState)
+                    wx.showModal({
+					title: '提示',
+					content: '确定取消订单？',
+					success: (tip) => {
+						if (tip.confirm) {
+                            uni.showLoading({
+                                title: "请稍等片刻...",
+                            })
+                            that.DataLists[that.i].loading = true
+                            that.apipost(
+                                "GetCancelOrder_post",
+                                {
+                                    OrderNo: '',
+                                    ErpOrderId: item.orderId,
+                                    OrderTypeStr: 'DMC',
+                                },
+                                (res) => {
+                                    if (res.resultCode == 1) {
+                                        uni.showToast({
+                                            title: "操作成功",
+                                            icon: "success",
+                                        });
+                                        that.$emit('research',that.dataMsg.orderState)
+                                    }
+                                    uni.hideLoading()
+                                    that.DataLists[that.i].loading = false
+                                },
+                                (err) => {
+                                    uni.hideLoading()
+                                    that.DataLists[that.i].loading = false
+                                }
+                                );
+                            }else {
+                                this.DataLists[this.i].loading = false
+                                uni.hideLoading()
+                            }
                         }
-                        uni.hideLoading()
-                        this.DataLists[this.i].loading = false
-                    },
-                    (err) => {
-                        uni.hideLoading()
-                        this.DataLists[this.i].loading = false
-                    }
-                    );
+                    })
+                    
                 }
             },
             getDetail(orderId,s){

pages/airTicket/flightDetail.vue

@@ -517,7 +517,7 @@
 					return n
 				})
 				let PriceNum = 0
-				var CreateBy = 0
+				var CreateBy = this.createBy.CreateBy
 				var DirectCustomerId = 0
 				var CustomerId = 0
 				//#ifdef MP-DI
@@ -526,9 +526,8 @@
 				//#endif
 				//#ifdef MP-AG
 					PriceNum = this.flight.B2CPrice
-					CreateBy = this.createBy.CreateBy
 					CustomerId = this.customer.customerId
-				//#endif
+				//#endif 
 				const p = {
 					OrderId:0,
 					TCID:this.id,
@@ -570,8 +569,8 @@
 					// #ifdef MP-AG
 					ClientType: 1,
 					// #endif
-					CreateBy: CreateBy, //同行联系人创建人  CustomerCreateBy
 					DirectCustomerId: DirectCustomerId, //直客Id
+					orderForm: 4,// 订单来源 4-小程序
 				}
 				return p
 			},

pages/jiuzhai/jz_MyOrder.vue

@@ -409,24 +409,33 @@
 				if (
 					(item.paymentTime == null || item.paymentTime == "") &&
 					(item.orderState == 2 || item.orderState == 3)
-				) {
-					this.apipost(
-						"GetCancelOrder_post", {
-							OrderNo: '',
-							ErpOrderId: item.orderId,
-							OrderTypeStr: 'DMC',
-						},
-						(res) => {
-							if (res.resultCode == 1) {
-								uni.showToast({
-									title: "操作成功",
-									icon: "success",
-								});
-								that.research();
-							}
-						},
-						(err) => {}
-					);
+				) { 
+					wx.showModal({
+						title: '提示',
+						content: '确定取消订单？',
+						success: (tip) => {
+							if (tip.confirm) {
+								that.apipost(
+									"GetCancelOrder_post", {
+										OrderNo: '',
+										ErpOrderId: item.orderId,
+										OrderTypeStr: 'DMC',
+									},
+									(res) => {
+										if (res.resultCode == 1) {
+											uni.showToast({
+												title: "操作成功",
+												icon: "success",
+											});
+											that.research();
+										}
+										that.submitCancel = false
+									},
+									(err) => {}
+								);
+							}else that.submitCancel = false
+						}
+					})
 				} 
 			},
 			//付款

pages/jiuzhai/jz_Reserve.vue

@@ -1182,6 +1182,7 @@
 					// #ifdef MP-AG
 					ClientType: 1,
 					// #endif
+					orderForm: 4,// 订单来源 4-小程序
 				};
 				if (this.realCurrentPriceInfo.priceUnion) {
 					msg.DepartureCityId = this.realCurrentPriceInfo.priceUnion.unionCityId