Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

pages/guidecar/guidedetails.vue

 <template>
   <view class="guidedetails" >
 	  
-	  <view class="guide" v-if='type==1'>
+	  <view class="guide" :style="{'height':(windowHeight-30)+'px'}" v-if='type==1&& loading==true'>
 		  <view class="guide-top">
 					<u-avatar :src="guideModel.GuidePhoto" :size="120"></u-avatar>
 				 
@@ -13,12 +13,13 @@
 						<u-rate
 						  :current="guideModel.Score"
 						  active-color="#FF8C10"
-						  inactive-color="#b2b2b2"
+						  inactive-color="#D5D5D5"
 						  active-icon="star"
 						  inactive-icon="star-o"
-						  size="20"
+						  size="34"
 							:disabled="true"
 						></u-rate>
+						<span style='font-size: 14px;color: #A8A8A8;margin-left: 10px;'>{{guideModel.Score}}</span>
 					</view>
 					
 				 </view>
@@ -28,10 +29,10 @@
 				  <span class='info-text'>工龄：</span>
 				  <span>{{guideModel.WorkYears}}年</span>
 			  </view>
-			  <view class="guide-info-item">
+			  <!-- <view class="guide-info-item">
 				  <span class='info-text'>电话：</span>
 				  <span>{{guideModel.Telephone}}</span>
-			  </view>
+			  </view> -->
 			 <view class="guide-info-item">
 				  <span class='info-text'>服务人数：</span>
 				  <span>{{guideModel.OrderGuestNum}}人</span>
@@ -52,7 +53,7 @@
 		  	<h-parse :content="detailContent" @navigate="clickDescription"></h-parse>
 		  </view>
 	  </view>
-		<view class="guide" v-if='type==2&& loading==true'>
+		<view class="guide" v-if='type==2&& loading==true' :style="{'height':(windowHeight-30)+'px'}">
 			<view class="u-skeleton-rect">
 				<swiper
 				  indicator-dots
@@ -78,35 +79,38 @@
 				<u-rate
 				  :current="carModel.Score"
 				  active-color="#FF8C10"
-				  inactive-color="#b2b2b2"
+				  inactive-color="#D5D5D5"
 				  active-icon="star"
 				  inactive-icon="star-o"
-				  size="20"
+				  size="34"
 					:disabled="true"
 				></u-rate>
+				<span style='font-size: 14px;color: #A8A8A8;margin-left: 10px;'>{{guideModel.Score}}</span>
 			</view>
 			<view style="width: 98%;height: 1px;background: #E2E2E2;margin-top: 10px;"></view>
 			<view class="guide-info">
-			  <view class="guide-info-item">
-				  <span class='info-text'>购买年限：</span>
-				  <span>{{g.car_buyyear}}年</span>
-			  </view>
+			 
 			 <view class="guide-info-item">
 				  <span class='info-text'>颜色：</span>
 				  <span>{{guidecar.ColorName}}</span>
 			  </view>
-			  <view class="guide-info-item">
-				  <span class='info-text'>座位数：</span>
-				  <span>{{carModel.GuestNum}}座</span>
-			  </view>
 			  <view class="guide-info-item">
 				  <span class='info-text'>分类：</span>
 				  <span>{{carModel.CarClassStr}}</span>
 			  </view>
+			  <view class="guide-info-item">
+				  <span class='info-text'>座位数：</span>
+				  <span>{{carModel.GuestNum}}座</span>
+			  </view>
 			  <view class="guide-info-item">
 				  <span class='info-text'>型号：</span>
 				  <span>{{carModel.CarType}}</span>
 			  </view>
+			 
+			  <view class="guide-info-item" style="width: 100%;">
+				  <span class='info-text'>购买年限：</span>
+				  <span>{{g.car_buyyear}}年</span>
+			  </view>
 			</view>
 		</view>
   </view>
@@ -133,6 +137,7 @@ export default {
 	  carModel:{},
 	  guideModel:{},
 	  guidecar:{},
+	  windowHeight:0,
     };
   },
 
@@ -174,6 +179,7 @@ export default {
 	uni.setNavigationBarTitle({
 	  title: this.pageTitle,
 	});
+	this.windowHeight = this.$utils.SystemInfo().windowHeight
 	
 	
   },
@@ -193,7 +199,7 @@ export default {
 	  (res) => {
 		this.guideModel = res.data;
 		uni.hideLoading();
-		// this.loading=true
+		this.loading=true
 		
 		
 	  }
@@ -232,7 +238,7 @@ getGuideCarModel(){
    },
    previewImage(i) {
      uni.previewImage({
-       urls: this.imgs,
+       urls: this.guidecar.PicList,
        current: i,
        longPressActions: {
          itemList: ["发送给朋友", "保存图片", "收藏"],
@@ -259,19 +265,22 @@ getGuideCarModel(){
 
 .guidedetails {
 	 height: 100%;
-	 background: #f5f5f5;
-	 padding: 20px 0;
+	 height: 100%;
+	 background: #FAF8F9;
+	 padding: 15px;
+	 font-family: aa;
 }
 .guidedetails .guide{
-	width: 94%;
-	margin-left: 3%;
-	
+	width: 100%;
+	/* height: 96%; */
 	border-radius: 10px;
 	background: #FFF;
 	display: flex;
 	flex-direction: column;
 	align-items: center;
 	padding: 15px;
+	overflow-y: auto;
+	box-shadow:0 2px 2px 2px #E9E7E8;
 	
 }
 .guidedetails .guide-top{
@@ -283,8 +292,8 @@ getGuideCarModel(){
 .guidedetails .row{
 	display: flex;
 	flex-direction: row;
-	align-items: center;
-	justify-content: center;
+	align-items: center;	
+	/* justify-content: center; */
 }
 .guidedetails .column{
 	display: flex;
@@ -307,7 +316,9 @@ getGuideCarModel(){
 .guidedetails .info-text{
 	font-size: 14px;
 	color: #727272;
-	margin-right: 10px;
+	/* margin-right: 10px; */
 	padding: 10px 0;
+	width: 75px;
+	text-align: right;
 }
 </style>