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

pages/airTicket/flightDetail.vue

@@ -518,9 +518,12 @@
 				})
 				let PriceNum = 0
 				var CreateBy = this.createBy.CreateBy
-				if(this.customer.salesBaseInfo&&this.customer.salesBaseInfo.employeeId){
-					CreateBy = this.customer.salesBaseInfo.employeeId
-				}
+				// #ifdef MP-DI
+					if(this.customer.salesBaseInfo&&this.customer.salesBaseInfo.employeeId){
+						CreateBy = this.customer.salesBaseInfo.employeeId
+					}
+				// #endif
+				
 				var DirectCustomerId = 0
 				var CustomerId = 0
 				//#ifdef MP-DI

pages/visa/visa_Reserve.vue

@@ -1194,9 +1194,9 @@
 				// #ifdef MP-AG
 					price = this.dataList.VisaPrice;
 				// #endif
-				let money = price * this.orderMsg.AdultPeopleNum;
+				let money = (price*100) * this.orderMsg.AdultPeopleNum;
 
-				this.price = money;
+				this.price = money/100;
 			},
 			validate(){
 				let  email = /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/
@@ -1298,9 +1298,12 @@
 					Remark: this.orderMsg.Remark,
 					CouponAllotIds: CouponAllotIds,
 				};
-				if(this.customer.salesBaseInfo&&this.customer.salesBaseInfo.employeeId){
-					msg.CreateBy = this.customer.salesBaseInfo.employeeId
-				}
+				// #ifdef MP-DI
+					if(this.customer.salesBaseInfo&&this.customer.salesBaseInfo.employeeId){
+						msg.CreateBy = this.customer.salesBaseInfo.employeeId
+					}
+				// #endif
+				
 				this.apipost(
 					"b2b_get_SetB2BVisaOrder",
 					msg,