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

pages/AggregateOrders/components/orders.vue

@@ -207,14 +207,14 @@
 			goDetails(item) {
 				let url = null
 				let msg = null
-				
+
 				// #ifdef MP-DI
-				console.log(item.goodsType,'===========')
+				console.log(item.goodsType, '===========')
 				msg = `OrderNo=${item.orderNo}`
 				if (item.goodsType > 0 && item.goodsType < 4) url = `jiuzhai/jz_SureOrder?` //线路
 				else if (item.goodsType > 3 && item.goodsType < 8) { //景点门票
 				} else if (item.goodsType > 7 && item.goodsType < 12) { //酒店住宿
-					url = `hotel/orderdetails?`
+					url = `hotel/orderdetails?orderId=` + item.erpOrderId;
 				} else if (item.goodsType > 11 && item.goodsType < 15) { //目的地用车
 				} else if (item.goodsType == 15) url = `visa/visa_SureOrder?` //签证  
 				else if (item.goodsType == 16) url = `airTicket/airTicketOrderDetail?` //机票
@@ -224,10 +224,9 @@
 				if (item.goodsType == 2) url = `jiuzhai/jz_SureOrder?` //线路
 				else if (item.goodsType == 4) { //景点门票
 				} else if (item.goodsType == 3) { //酒店住宿
-					
-				} else if (item.goodsType == 7) { //酒店住宿
-					url = `hotel/orderdetails?`
-					
+
+				} else if (item.goodsType == 9) { //酒店住宿
+					url = `hotel/orderdetails?orderId=` + item.erpOrderId;
 				} else if (item.goodsType == 5) { //目的地用车
 				} else if (item.goodsType == 6) url = `visa/visa_SureOrder?` //签证  
 				else if (item.goodsType == 1) { //机票

pages/hotel/order.vue

@@ -487,7 +487,7 @@
 							icon: 'none',
 							title: '订单创建成功'
 						})
-						this.goPayHandler(res.data.OrderNo);
+						this.goPayHandler(res.data);
 					} else {
 						uni.showToast({
 							title: res.message,
@@ -498,7 +498,8 @@
 					}
 				});
 			},
-			goPayHandler(OrderNo) {
+			goPayHandler(item) {
+				let OrderNo=item.OrderNo;
 				let that = this;
 				uni.requestPayment({
 					provider: "wxpay",
@@ -529,7 +530,7 @@
 						});
 						setTimeout(() => {
 							uni.redirectTo({
-								url: "/pages/hotel/orderdetails?OrderNo=" + OrderNo,
+								url: "/pages/hotel/orderdetails?orderId=" + item.ErpOrderId,
 							});
 						}, 100);
 					},