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

pages/hotel/components/hotel-good.vue

@@ -28,7 +28,7 @@
 				</view>
 				<view class="price">
 					<text>￥</text>
-					<text class="money">{{item.B2BPrice}}</text>
+					<text class="money">{{$utils.getretailer()==true? item.B2BPrice:item.SalesPrice}}</text>
 					<text>起</text>
 				</view>
 			</view>

pages/hotel/components/recommed-hotel.vue

@@ -27,7 +27,7 @@
 				</view>
 				<view class="price">
 					<text>￥</text>
-					<text class="money">{{item.B2BPrice}}</text>
+					<text class="money">{{$utils.getretailer()==true? item.B2BPrice:item.SalesPrice}}</text>
 					<text>起</text>
 				</view>
 			</view>

pages/hotel/components/room-good.vue

@@ -24,7 +24,7 @@
 				<view class="f11 king" style="margin-top:15rpx;">{{item.IsCancelStr}}</view>
 				<view class="price">
 					<text class="f11" style="margin-right: 10rpx;">￥</text>
-					<text>{{item.B2BPrice}}</text>
+					<text>{{$utils.getretailer()==true? item.B2BPrice:item.SalesPrice}}</text>
 				</view>
 			</view>
 			<view class="rm-opera" v-if="item.Inventory>0&&item.Inventory<5">

pages/hotel/order.vue

@@ -75,7 +75,7 @@
 							<text style="margin-right: 30rpx;">{{item.DateStr}}</text>
 							<text v-if="index!=0">{{item.BreakfastTypeStr}}</text>
 						</view>
-						<view style="text-align: right;" v-if="index!=priceList.length-1">{{orderMsg.RoomNumber}}间 × ¥{{item.B2BPrice}}</view>
+						<view style="text-align: right;" v-if="index!=priceList.length-1">{{orderMsg.RoomNumber}}间 × ¥{{$utils.getretailer()==true? item.B2BPrice:item.SalesPrice}}</view>
 					</view>
 				</view>
 				
@@ -230,7 +230,11 @@
 			CalTotalPrice(){
 				this.orderMsg.Final_Price=0;
 				this.priceList.forEach(x=>{
+					if(this.$utils.getretailer){
 						this.orderMsg.Final_Price += parseInt(this.orderMsg.RoomNumber)*x.B2BPrice;
+					}else{
+						this.orderMsg.Final_Price += parseInt(this.orderMsg.RoomNumber)*x.SalesPrice;
+					}
 				})
 				console.log(this.orderMsg.Final_Price,'this.orderMsg.Final_Price');
 			},

pages/jiuzhai/allorderList.vue

@@ -183,6 +183,7 @@
 					</view>
 		 		</view>
 		 		<u-loadmore :status="status" :load-text="loadText" :font-size="24" :margin-top="20" :margin-bottom="20" bg-color="#ECF1F4" />
+				<view style="width: 100%;height: 85px;"></view>
 		 	</scroll-view>
 		 </view>
 		 <u-popup v-model="showModal" mode="center" length="80%">
@@ -205,16 +206,17 @@
 		 	</view>
 		 </u-popup>
 		 <auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth='goback'></auth>
+		 <tabbar v-if='barshow==1'></tabbar>
 	</view>
 </template>
 
 <script>
 	import auth from "@/components/auth/index.vue";
+	import tabbar from "@/components/tabbar/index";
 	export default{
 		components: {
-			
 			auth,
-			
+			tabbar
 		},
 		data(){
 			return{
@@ -251,10 +253,14 @@
 				index:0,
 				item:{},
 				payindex:0,//支付的索引
+				barshow:0,
 			}
 		},
 		onLoad(options){
 			this.current = options.status || 0;
+			if(options.barshow){
+				this.barshow=options.barshow
+			}
 			let currentPages = getCurrentPages();
 			let u = "/" + currentPages[currentPages.length - 1].route;
 			let pages = wx.getStorageSync("basedata") ?

pages/jiuzhai/jz_Line.vue

@@ -382,16 +382,16 @@
 										{{item.productRecommend}}
 									</view>
 									<view style="margin:10px 0;display: flex;align-items: center;">
-										<view class="start-city">
+										<view class="start-city" style="margin-right: 20rpx;" v-if="item.startCityName">
 											<text>{{item.startCityName}}出发</text>
 										</view>
-										<view style="margin-left: 20rpx;">
+										<view>
 											<u-tag mode="plain" border-color="#DFBE6E" color="#DFBE6E" :text="`${item.dayNum}天`" size="mini"></u-tag>
 										</view>
 									</view>
 									<view class="price">
 										<text>￥</text>
-										<text class="money">{{item.b2BPrice}}</text>
+										<text class="money">{{$utils.getretailer()==true? item.b2BPrice:item.b2CPrice}}</text>
 										<text>起</text>
 									</view>
 								</view>

pages/jiuzhai/jz_Reserve.vue

@@ -199,14 +199,22 @@
 			//去支付
 			goPay() {
 				this.userInfo = uni.getStorageSync('mall_UserInfo');
+				this.basedataObj = uni.getStorageSync('basedata').mall;
+				var CustomerId = 0;
+				if(this.$utils.getretailer()){
+					CustomerId =  this.basedataObj.virtualB2BCustomerId
+				}else{
+					CustomerId =  this.basedataObj.virtualB2CCustomerId
+				}
+				return;
 				let msg = {
 					OrderId: 0,
 					TCID: this.currentPriceInfo.tcid,
 					CustomerType: 1,
 					GroupType: 1,
-					ContactName: '陕西中旅南二环分公司',
-					ContactMobile: '18602977416',
-					CustomerId: '49',
+					ContactName: '',
+					ContactMobile: '',
+					CustomerId: CustomerId,
 					DepartureCityId: 262,
 					IsIntermodal: 2,
 					Unit_Price: this.currentPriceInfo.b2BMemberPrice,