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

pages/guidecar/bookaCarList.vue

@@ -372,7 +372,7 @@
 									</view>
 									<view class="s-c-r prices">
 										<span style='margin-top: 3px;font-size: 11px;'>￥</span>
-										<span style='font-weight: bold;'>{{x.Price}}</span>
+										<span style='font-weight: bold;'>{{isdistributor==true? x.Price:x.B2CPrice}}</span>
 										<span style='margin-top: 3px;font-size: 11px;'>起</span>
 									</view>
 								</view>
@@ -404,7 +404,7 @@
 										</view>
 										<view class="s-c-r prices" v-if="index==0">
 											<span style='margin-top: 3px;font-size: 11px;'>￥</span>
-											<span style='font-weight: bold;'>{{x.Price}}</span>
+											<span style='font-weight: bold;'>{{isdistributor==true? x.Price:x.B2CPrice}}</span>
 											<span style='margin-top: 3px;font-size: 11px;'>起</span>
 										</view>
 										<view class="s-c-r sold" v-if="index==x.SiteList.length-1">
@@ -559,7 +559,8 @@
 					Arrive:'',
 					StartDate:'',
 					EndDate:'',
-				}
+				},
+				isdistributor:false,
 			}
 			
 			
@@ -575,6 +576,8 @@
 				this.msg.ArriveCityType = this.carMsg.ArriveCityType;
 				this.msg.Q_Date = this.carMsg.Q_Date;
 			}
+			this.isdistributor = this.$utils.getretailer()
+			
 			this.mainColor = this.$uiConfig.mainColor;
 			this.gettimeList()
 			this.init();

pages/hotel/components/hotel-good.vue

@@ -9,9 +9,8 @@
 				<view class="hotel-start">
 					<!-- TODO：判定是否为星级酒店，如果是显示星级，不是，显示另外一种方式 -->
 					<view class="rate" v-if="item.Star>=1&&item.Star<=5">
-						<u-rate active-color="#FEB969" inactive-color="#FFF" is-fill="true" :current="item.Star" active-icon="star"
-						 inactive-icon="star" disabled :count="5"></u-rate>
-						<text style="margin-left: 20rpx;vertical-align: top;">{{item.StarName}}</text>
+						<u-rate active-color="#FEB969" inactive-color="#b2b2b2" :current="item.Star" active-icon="star" inactive-icon="star" disabled></u-rate>
+						<text style="margin-left: 20rpx;vertical-align: top;">{{item.Star+'.0'}}</text>
 					</view>
 					<view class="other-rate" v-if="item.Star==9">
 						<text>温泉酒店</text>
@@ -24,8 +23,8 @@
 				</view>
 				<view class="localtion">{{item.Address}}</view>
 				<view>
-					<u-tag v-for="(subItem,subIndex) in item.TagList" :key="subIndex" style="margin-right:10rpx;" :text="subItem"
-					 bg-color="#FFF" border-color="#DFBE6E" color="#DFBE6E" size="mini"></u-tag>
+					<u-tag v-for="(subItem,subIndex) in item.TagList" :key="subIndex" style="margin-right:10rpx;" :text="subItem" bg-color="#FFF" border-color="#DFBE6E" color="#DFBE6E"
+					 size="mini"></u-tag>
 				</view>
 				<view class="price">
 					<text>￥</text>
@@ -44,13 +43,13 @@
 				type: Array,
 				default: null
 			},
-			dayObj: {
+			dayObj:{
 				type: Object,
 				default: null
 			},
-			searchObj: {
-				type: Object,
-				default: null
+			searchObj:{
+				type:Object,
+				default:null
 			}
 		},
 		data() {
@@ -61,17 +60,11 @@
 		created() {
 			console.log(this.HotelList, 'hotel');
 		},
-		methods: {
-			getStar(num) {
-				if (num) {
-					return num.toFixed(1);
-				}
-				return 0.0;
-			},
-			goHotelDetail(id) {
+		methods:{
+			goHotelDetail(id){
 				let myDayObj = JSON.stringify(this.dayObj);
 				uni.navigateTo({
-					url: "/pages/hotel/detail?id=" + id + '&dayObj=' + myDayObj + '&searchObj=' + JSON.stringify(this.searchObj)
+					url: "/pages/hotel/detail?id=" + id + '&dayObj=' + myDayObj+'&searchObj='+JSON.stringify(this.searchObj)
 				});
 			}
 		}
@@ -84,7 +77,7 @@
 		padding-bottom: 30rpx;
 		border-bottom: 1rpx solid #E2E2E2;
 		display: flex;
-		align-items: center;
+		align-items: flex-start;
 	}
 
 	.hotel-list-item .img-box {
@@ -102,6 +95,7 @@
 	.hotel-list-item .hotel-info {
 		width: 1px;
 		flex: 1;
+		margin-top:20rpx;
 	}
 
 	.hotel-list-item .hotel-info .hotel-name {
@@ -123,6 +117,8 @@
 		font-weight: 500;
 		color: #999999;
 		line-height: 30rpx;
+		display: flex;
+		align-items: center;
 	}
 
 	.hotel-list-item .hotel-info .hotel-start .other-rate {

pages/hotel/detail.vue

@@ -90,7 +90,7 @@
 								<view>{{dataList.AddressDes}}</view>
 							</view>
 						</view>
-						<view class="loc-right">
+						<view class="loc-right" @click="goMap(dataList.Address,dataList.Lng,dataList.Lat)">
 							<text style="margin-right: 20rpx;">地图详情</text>
 							<u-icon name="arrow" size="20" />
 						</view>
@@ -336,17 +336,18 @@
 				);
 			},
 			goMap(name, lon, lat) {
+				let newLon=parseFloat(lon)
+				let newLat=parseFloat(lat)
 				wx.openLocation({
-					latitude: lat,
-					longitude: lon,
+				  latitude:newLat,
+				  longitude:newLon,
 				  scale: 18,
 				  name,
-					address: "武侯区科华中路 2 号",
-					success: (res) => {
-						// console.log(res)
+				  success:(res)=>{
+				     console.log(res)
 				  },
 				  fail: (err) => {
-						// console.log(err)
+				  	 console.log(err)
 				  }
 				})
 			},

pages/hotel/list.vue

@@ -423,6 +423,7 @@
 		font-weight: 500;
 		color: #111111;
 		line-height: 29rpx;
+		margin-top:-6px;
 	}
 
 	.hotel-list .search-box .days {

plugin/utils.js

@@ -29,10 +29,18 @@ function getRect(selector){//获取元素的信息
 			}).exec();
 		})
 	}
-
+function getretailer(){//判断是否是分销商
+	let isdistributor  = false
+	let mall_UserInfo = uni.getStorageSync("mall_UserInfo")?uni.getStorageSync("mall_UserInfo"):{};
+	if(mall_UserInfo.IsDistrbutorUser && mall_UserInfo.IsDistrbutorUser ==1){
+		isdistributor = true
+	}
+	return isdistributor
+}
 
 export default {
     calcContentHeight,
 	SystemInfo,
-	getRect
+	getRect,
+	getretailer
 }
\ No newline at end of file