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

pages/hotel/order.vue

@@ -451,8 +451,8 @@
 					guestInfo += `儿童${this.searchObj.childrenNumberZC}; `;
 				}
 				let msg = {
-					SurName: this.customer.SurName,
-					Name: this.customer.name,
+					SurName: this.orderMsg.SurName,
+					Name: this.orderMsg.Name,
 					ContactNumber: this.orderMsg.guestPhoneNumber,
 					Mailbox: this.orderMsg.guestEmail,
 					//GoodsId: this.orderMsg.RatePlanID,

pages/jiuzhai/jz_Reserve.vue

@@ -663,8 +663,8 @@
 				}
 				let startCityName =  this.realCurrentPriceInfo.priceUnion && this.realCurrentPriceInfo.priceUnion.startCityName?this.realCurrentPriceInfo.priceUnion.startCityName:this.currentPriceInfo.startCityName
 				let msg = {
-					SurName: this.orderMsg.SurName,
-					Name: this.orderMsg.Name,
+					SurName: this.customer.SurName,
+					Name: this.customer.name,
 					ContactNumber: this.customer.contactNumber,
 					Mailbox: this.customer.Mailbox,
 					GoodsId: this.currentPriceInfo.tcid,

pages/visa/visaDetail.vue

@@ -713,6 +713,7 @@
 				// #ifdef MP-AG
 					if(this.createBy>0||this.parametersMsg.SaleId) createBy = this.createBy>0?this.createBy:this.parametersMsg.SaleId
 				// #endif
+				console.log("createBy-------",createBy)
 				uni.navigateTo({
 					url: "/pages/visa/visa_Reserve?id=" +this.delMsg.Pid+'&CreateBy=' +createBy,
 				});