1.调样式

pages/index/carModel.vue

@@ -813,7 +813,7 @@ export default {
 		/*  #endif  */
 	}
 	.brandList{
-		height: calc(100vh - 230rpx);
+		height: calc(100vh - 250rpx);
 	}
 	.brand-select-titleselect{
 		    color: #FF4F00 !important;

pages/me/aboutMe.vue

@@ -23,7 +23,7 @@
 				})
 				let url = 'worldKeepCar/keepCarMy/queryTAbouts',
 					params = {
-						type:1
+						type:4
 					}
 				this.$http(url, params, 'GET').then(res => {
 					uni.hideLoading();

pages/module/confirmOrder.vue

@@ -255,7 +255,7 @@ export default {
 					            //console.log('用户点击确定');
 								var payMoney=that.goodsMoney+that.itemMoney;
 								uni.navigateTo({
-									url:'usableDiscountCard?payMoney='+payMoney
+									url:'usableDiscountCard?payMoney='+payMoney+'&shopId='+that.orderShop.shopId
 								})
 					        } else if (res.cancel) {
 					           that.tosettlement()

pages/module/goodsDetail.vue

@@ -36,12 +36,12 @@
 		 			 <image src="../../static/img/icon_liuc.png" mode="" class="lcImg"></image>
 		 		 </view>
 		 		 <view class="lcLineBox">
+					 <view class="lcline">
+					 	选择商品/项目
+					 </view>
 		 			 <view class="lcline">
 		 				 选择门店
 		 			 </view>
-		 			 <view class="lcline">
-		 			 	选择商品/项目
-		 			 </view>
 		 			 <view class="lcline">
 		 			 	在线支付
 		 			 </view>

pages/module/maintain.vue

@@ -116,7 +116,7 @@
 					</view>
 				</view>
 				
-				<view class="tkMain">
+				<view class="tkMain" @click.stop>
 					<scroll-view scroll-y="true" class="tkMainSv">
 						<view class="qingdanLine" v-for="(item,index) in orderData">
 							<view class="mainTitle">{{item.name}}</view>

pages/shop/shopAppraise.vue

@@ -15,19 +15,19 @@
 						<!-- 第一行 -->
 						<view class="firstView">
 							<view class="shopName">{{item.Evaluator}}</view>
-							
+							<view class="time">{{item.CreateTime.slice(0,item.CreateTime.length-8)}}</view>
 							
 						</view>
 
 						<!-- 第2行 -->
-						<view class="secondView">
+						<view class="secondView" v-if="item.scoreState==1">
 							<!-- 星星 -->
 							<uni-rate :value="item.Overallevaluation" :max="5" color="#EEEEEE" active-color="#FF4F00"
 								:size="16" :margin="4" :readonly="true" />
-							<view class="time">{{item.CreateTime.slice(0,item.CreateTime.length-8)}}</view>
+							
 						</view>
 						
-						<view class="thirdView">
+						<view class="thirdView" v-if="item.scoreState==1">
 							<view class="count">服务态度：{{item.Serviceevaluation}}</view>
 							<view class="count">施工质量：{{item.Constructionevaluation}}</view>
 							<view class="count">店面环境：{{item.Storeevaluation}}</view>