1.检测报告

pages.json

@@ -429,7 +429,7 @@
 		{
 			"path": "pages/user/reportUni",
 			"style": {
-				"navigationBarTitleText": "车检报告",
+				"navigationBarTitleText": "检测报告",
 				"enablePullDownRefresh": true
 			}
 		},

pages/index/onlineBooking.vue

@@ -17,18 +17,25 @@
 				<view class="newshopDstop">
 					<view class="newshopDname">{{shopInfo.shopName}}</view>
 
-					<view v-if="(data.isShowScore == 1) || (data.isShowEvaluate == 1)" class="appraiseBox">
-						<view v-if="data.isShowScore == 1" class="appraise">{{data.shopInfo.miniV2ShopScore?data.shopInfo.miniV2ShopScore:0}}
-							<span style='font-size: 26rpx; margin-left: 3rpx;'>分</span>
-						</view>
-						<view v-if="data.isShowScore == 1" class="line"></view>
-						<view @click="goShopAppraiseList()" v-if="data.isShowEvaluate == 1" class="appraiseCount">评价数
-							{{data.evaluateCount?data.evaluateCount:0}}
-
+					<view v-if="data.isShowScore == 1 && data.isShowEvaluate == 1" class="appraiseBg">
+						<view class="appraiseBox">
+							<view v-if="data.isShowScore == 1 && data.shopInfo.miniV2ShopScore" class="appraise">
+								{{data.shopInfo.miniV2ShopScore}}
+								<span style='font-size: 26rpx; margin-left: 3rpx;'>分</span>
+							</view>
+							<view v-if="data.isShowScore == 1 && !data.shopInfo.miniV2ShopScore" class="appraise"
+								style='font-size: 26rpx;'>暂无评分</span>
+							</view>
+							<view class="line"></view>
+							<view @click="goShopAppraiseList()" v-if="data.isShowEvaluate == 1 && data.evaluateCount"
+								class="appraiseCount">评价数
+								{{data.evaluateCount}}
+								<image class="rightArrow" src="../../static/timg/icon_arrow_right.png" mode=""></image>
+							</view>
+							<view  v-if="data.isShowEvaluate == 1 && !data.evaluateCount"
+								class="appraiseCount">暂无评价</view>
 						</view>
-						<image v-if="data.isShowEvaluate == 1" class="rightArrow" src="../../static/timg/icon_arrow_right.png" mode=""></image>
 					</view>
-
 					<view class="newshopDtime">
 						营业时间： <span>{{shopInfo.startTime}} - {{shopInfo.endTime}}</span>
 					</view>
@@ -76,9 +83,9 @@
 					:class="{leftActive:leftIndex==index}">{{item.Name}}</view>
 			</view>
 			<view class="yuyueRight">
-				<view class="yuyueRightTitle">{{rightTitle}}</view>
+				<!-- <view class="yuyueRightTitle">{{rightTitle}}</view> -->
 				<view v-for="(item,index) in rightData" @click="checkItem(item)"
-					style="padding-top: 10rpx;padding-left: 24rpx;padding-right: 24rpx;">
+					style="padding-left: 24rpx;padding-right: 24rpx;">
 					<view class="yrTop">
 						<view class="ItemName">{{item.ItemName}}</view>
 						<image src="../../static/timg/ickno.png" v-if="selectedItems.findIndex(i=>i.ID===item.ID)==-1"
@@ -204,8 +211,9 @@
 					shopId: this.naShopId,
 				}, 'GET').then(res => {
 					this.shopInfo = res.data.shopInfo;
-					this.data = res.data;
+					this.data = res.data;
 					
+
 					uni.setStorage({
 						key: 'yyshopInfo',
 						data: that.shopInfo,
@@ -213,8 +221,8 @@
 
 						}
 					});
-					
-					
+
+
 					this.listBigTags()
 				})
 			},
@@ -509,15 +517,15 @@
 	}
 
 	.yuyueleftLine {
-		font-size: 26rpx;
+		font-size: 24rpx;
 		padding: 30rpx 24rpx;
 		color: #3C3C3C;
-		font-weight: 400;
+		
 	}
 
 	.leftActive {
 		background: #FFFFFF;
-		font-weight: 500;
+		font-weight: bold;
 	}
 
 	.yuyueRightTitle {
@@ -530,19 +538,23 @@
 
 	.yrTop {
 		display: flex;
-		justify-content: space-between;
+		justify-content: space-between;
+		align-items: center;
 	}
 
 	.ItemName {
 		color: #3C3C3C;
 		font-size: 28rpx;
-		width: 480rpx;
+		width: 480rpx;
+		font-weight: bold;
+		margin-top: 20rpx;
+		margin-bottom: 10rpx;
 	}
 
 	.itemSm {
 		color: #999999;
 		line-height: 33rpx;
-		font-size: 24rpx;
+		font-size: 22rpx;
 		text-overflow: -o-ellipsis-lastline;
 		overflow: hidden;
 		text-overflow: ellipsis;
@@ -725,14 +737,17 @@
 		color: #FF3B30;
 		font-size: 32rpx;
 	}
-
+	.appraiseBg{
+		display: flex;
+		align-items: center;
+	}
 	.appraiseBox {
-		padding: 5rpx 40rpx 5rpx 20rpx;
+		padding: 5rpx 20rpx;
+		padding-right: 30rpx;
 		margin-top: 10rpx;
 		height: 62rpx;
 		background: rgba(255, 0, 0, 0.08);
-		border-radius: 0 25rpx 70rpx 0;
-		width: 320rpx;
+		border-radius: 0 15rpx 15rpx 0;
 		display: flex;
 		align-items: center;
 	}
@@ -767,6 +782,6 @@
 
 		width: 7rpx;
 		height: 15rpx;
-		margin-left: 32rpx;
+		margin-left: 16rpx;
 	}
 </style>

pages/user/historySpend.vue

@@ -41,8 +41,9 @@
 			
 			
 			<view class="carPlate">
-				<view class="">
+				<view class="plateBox">
 					<view class="plate">{{item.PlateNumber}}</view>
+					
 					<view class="mileage" v-if="item.CurrentMileage>0">{{item.CurrentMileage}}km</view>
 				</view>
 				<view v-if="ReceiptsMoney" class="price"><span style="font-size: 22rpx;">￥</span>{{item.money?item.money:0}}</view>
@@ -296,7 +297,10 @@
 		align-items: center;
 		justify-content: space-between;
 	}
-
+	
+	.plateBox {
+		display: flex;
+	}
 	.plate {
 		font-size: 30rpx;
 		color: #3C3C3C;
@@ -310,7 +314,7 @@
 		padding: 0rpx 10rpx;
 		border: 1rpx solid #F19D01;
 		border-radius: 4rpx;
-		height: 36rpx;
+		height: 33rpx;
 	}
 	.price{
 		font-size: 32rpx;

pages/user/user.vue

@@ -92,15 +92,24 @@
 				</view>
 
 			</view>
-			<view v-if="(numList.isShowScore == 1) || (numList.isShowEvaluate == 1)" class="appraiseBox">
-				<view v-if="numList.isShowScore == 1" class="appraise">{{numList.shopInfo.miniV2ShopScore?numList.shopInfo.miniV2ShopScore:0}}
+			<view v-if="numList.isShowScore == 1 && numList.isShowEvaluate == 1" class="appraiseBox">
+				<view v-if="numList.isShowScore == 1 && numList.shopInfo.miniV2ShopScore" class="appraise">
+					{{numList.shopInfo.miniV2ShopScore}}
 					<span style='font-size: 26rpx; margin-left: 3rpx;'>分</span>
 				</view>
-				<view  v-if="numList.isShowScore == 1" class="line"></view>
-				<view @click="goShopAppraiseList()" v-if="numList.isShowEvaluate == 1" class="appraiseCount">评价数
-					{{numList.evaluateCount?numList.evaluateCount:0}}
+				<view v-if="numList.isShowScore == 1 && !numList.shopInfo.miniV2ShopScore" class="appraise"
+					style='font-size: 26rpx;'>暂无评分</span>
 				</view>
-				<image v-if="numList.isShowEvaluate == 1" class="rightArrow" src="../../static/timg/icon_arrow_right.png" mode=""></image>
+				<view v-if="numList.isShowScore == 1" class="line"></view>
+				<view @click="goShopAppraiseList()" v-if="numList.isShowEvaluate == 1 && numList.evaluateCount "
+					class="appraiseCount">评价数
+					{{numList.evaluateCount}}
+					<image v-if="numList.isShowEvaluate == 1" class="rightArrow"
+						src="../../static/timg/icon_arrow_right.png" mode=""></image>
+				</view>
+				<view v-if="numList.isShowEvaluate == 1 && !numList.evaluateCount " class="appraiseCount">暂无评价
+				</view>
+
 			</view>
 
 
@@ -259,8 +268,8 @@
 				release_version: '',
 			}
 		},
-		onLoad(opt) {
-			
+		onLoad(opt) {
+
 
 			this.ext = this.$common.getExtStoreId();
 			this.themeColor = uni.getStorageSync("themeColor");
@@ -428,9 +437,9 @@
 					this.numList = res.data
 					this.headImg = res.data.openUser.headImg;
 					this.nickName = res.data.openUser.nickName;
-					this.phone = res.data.openUser.mobilePhone;
-					
-					
+					this.phone = res.data.openUser.mobilePhone;
+
+
 				})
 			},
 			gonavigateTo(url) {
@@ -760,17 +769,18 @@
 		line-height: 42rpx;
 	}
 
+
+
 	.appraiseBox {
-		padding: 5rpx 40rpx 5rpx 20rpx;
-		margin: 10rpx 0 0 -20rpx;
+		padding: 5rpx 0;
+		margin-top: 10rpx;
 		height: 62rpx;
-		background: rgba(255, 0, 0, 0.08);
-		border-radius: 0 25rpx 70rpx 0;
-		width: 300rpx;
+
 		display: flex;
 		align-items: center;
 	}
 
+
 	.appraise {
 		color: #FF0000;
 		font-size: 38rpx;
@@ -778,13 +788,13 @@
 
 	}
 
-	.line {
-		
-		margin: 0 20rpx;
-		width: 1rpx;
-		height: 30rpx;
-		background: #E9E8E8;
-		
+	.line {
+
+		margin: 0 12rpx;
+		width: 1rpx;
+		height: 30rpx;
+
+
 	}
 
 	.appraiseCount {
@@ -793,6 +803,7 @@
 		font-weight: 400;
 		color: #666666;
 		flex-grow: 1;
+		margin-top: 10rpx;
 
 	}
 
@@ -800,7 +811,7 @@
 
 		width: 7rpx;
 		height: 15rpx;
-		margin-left: 32rpx;
+		margin-left: 16rpx;
 	}
 
 	.shopRightBox {