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

pages/hotel/components/room-good.vue

@@ -27,7 +27,7 @@
 					<text>{{$utils.getretailer()==true? item.B2BPrice:item.SalesPrice}}</text>
 				</view>
 			</view>
-			<view class="rm-opera" v-if="item.Inventory>0&&item.Inventory<5">
+			<view class="rm-opera" v-if="item.Inventory>0">
 				<!-- 如果库存少于5显示 -->
 				<view class="warm-count">剩{{item.Inventory}}间</view>
 				<view class="buy" @click="previewOrder(item)">

pages/hotel/order.vue

@@ -201,13 +201,11 @@
 			},
 			//选择时间
 			confirm(val){
-				console.log(val,'val');
 				this.orderMsg.ArrivalTime=val.hour+':'+val.minute;
 			},
 			//改变房间数量
 			getRoomNumber(val){
 				this.orderMsg.RoomNumber = val.value;
-				console.log(val,'房间数');
 				this.CalTotalPrice();
 			},
 			//获取房型报价
@@ -218,7 +216,6 @@
 					},
 					res => {
 						if (res.resultCode == 1) {
-							console.log(res,'房型报价');
 							this.priceList = res.data;
 							this.CalTotalPrice();
 						}
@@ -229,9 +226,12 @@
 			CalTotalPrice(){
 				this.orderMsg.Final_Price=0;
 				this.priceList.forEach(x=>{
+					console.log("xx",x);
 					if(this.$utils.getretailer()){
+						console.log("1",x.B2BPrice)
 						this.orderMsg.Final_Price += parseInt(this.orderMsg.RoomNumber)*x.B2BPrice;
 					}else{
+						console.log("2",x.SalesPrice)
 						this.orderMsg.Final_Price += parseInt(this.orderMsg.RoomNumber)*x.SalesPrice;
 					}
 				})
@@ -272,7 +272,6 @@
 							},
 							res => {
 								if (res.resultCode == 1) {
-									console.log(res,'数据');
 									that.queren(res.data)
 								}
 							}
@@ -295,7 +294,6 @@
 					},
 					res => {
 						this.orderInfo = JSON.parse(res.data);
-						console.log(171,this.orderInfo)
 						this.Pay()
 					}
 				);
@@ -310,7 +308,6 @@
 					signType: this.orderInfo.signType,
 					paySign: this.orderInfo.sign,
 					success: function(res) {
-						console.log('success', res);
 						uni.showToast({
 							title: "支付成功"
 						})
@@ -321,7 +318,6 @@
 						}, 100 )
 					},
 					fail: function(err) {
-						console.log('fail:', err);
 						uni.showToast({
 							title: "支付失败"
 						})