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

pages/airTicket/flightDetail.vue

@@ -331,7 +331,6 @@
 		created() {
 			this.mainColor = this.$uiConfig.mainColor
 			this.customer = uni.getStorageSync("b2b_user");
-			console.log(this.customer,'----')
 			this.getUserCouponList()
 			// #ifdef MP-DI
 			let employeeId = this.customer.salesBaseInfo&&this.customer.salesBaseInfo.employeeId?this.customer.salesBaseInfo.employeeId:0
@@ -523,7 +522,7 @@
 				var CustomerId = 0
 				//#ifdef MP-DI
 					PriceNum = this.flight.B2CPrice
-					DirectCustomerId = this.createBy.CreateBy
+					DirectCustomerId = this.customer.customerId
 				//#endif
 				//#ifdef MP-AG
 					PriceNum = this.flight.B2CPrice

pages/jiuzhai/jz_Reserve.vue

@@ -1097,7 +1097,7 @@
 				var DirectCustomerId = 0
 				// #ifdef MP-DI
 					price = this.currentPriceInfo.b2CPrice;
-					DirectCustomerId = this.CreateBy
+					DirectCustomerId = this.customer.customerId
 				// #endif
 				// #ifdef MP-AG
 					price = this.currentPriceInfo.b2BPrice;