Merge remote-tracking branch 'remotes/origin/ats' into ats2

# Conflicts:
#	pages/user/addCar/addCar.vue
#	pages/user/historyDetail.vue

pages/user/historyDetail.vue

@@ -48,9 +48,16 @@
 			</view>
             <view class="shopBox2">
             	<view class="newboxTop">
-            		<view class="newline1">{{orderData.billsheet.workNames}}</view>
+            		<view class="newline1">{{orderData.billsheet.CustomerName}}</view>
 					<view class="newline1" style="padding-left: 20rpx;">{{orderData.billsheet.PlateNumber}}</view>
             	</view>
+				<view class="CarModel">{{orderData.billsheet.CarModel}}</view>
+				<view class="informationLine" >
+					<view class="informationTxt">进店里程：</view>
+					<view class="informationNum" v-if="orderData.billsheet.CurrentMileage>0">
+						{{orderData.billsheet.CurrentMileage}}km
+					</view>
+				</view>
 				<view class="informationLine" >
 					<view class="informationTxt">建议下次保养里程：</view>
 					<view class="informationNum" v-if="orderData.billsheet.NextCareMilage">
@@ -60,21 +67,18 @@
 				<view class="informationLine" v-if="orderData.billsheet.SheetType==1">
 					<view class="informationTxt">建议下次保养时间：</view>
 					<view class="informationNum" v-if="orderData.billsheet.NextCareDate">
-						{{orderData.billsheet.NextCareDate}}
-					</view>
-				</view>
-				<view class="informationLine" >
-					<view class="informationTxt">保养门店联系电话：</view>
-					<view class="informationNum" v-if="orderData.billsheet.shopMobilePhone">
-						{{orderData.billsheet.shopMobilePhone}}
+						{{orderData.billsheet.NextCareDate.slice(0,10)}}
 					</view>
 				</view>
+				<view class="baoyangtis">建议下次保养，里程或日期，先到为准</view>
+			
             </view>
 			<!-- 店铺信息 -->
 			<view class="shopBox">
 				<image src="../../static/img/icon_store.png" mode="" class="shopBoximg"></image>
 				<view class="shopCont">
 					<view class="shopName">{{orderData.billsheet.ShopName}}</view>
+					<view class="Address" v-if="orderData.billsheet.shopMobilePhone">服务电话：{{orderData.billsheet.shopMobilePhone}}</view>
 					<view class="Address">{{orderData.billsheet.Address}}</view>
 
 				</view>
@@ -97,31 +101,29 @@
 			<!-- 订单信息 -->
 			<view class="information">
 				<view class="carMes">
-					<view class="plate">{{orderData.billsheet.PlateNumber}}</view>
-					<view class="mileage" v-if="orderData.billsheet.CurrentMileage>0">
-						{{orderData.billsheet.CurrentMileage}}km
-					</view>
-				</view>
-				<view class="informationLine">
-					<view class="informationTxt">姓名：</view>
-					<view class="informationNum">{{orderData.billsheet.CustomerName}}</view>
-				</view>
-				<view class="informationLine">
-					<view class="informationTxt">手机号：</view>
-					<view class="informationNum">{{orderData.billsheet.MobilePhone}}</view>
+					<view class="plate">{{orderData.billsheet.time}}</view>
+					
 				</view>
 				<view class="informationLine">
 					<view class="informationTxt">单号：</view>
 					<view class="informationNum">{{orderData.billsheet.Code}}</view>
 				</view>
-				<view class="informationLine">
-					<view class="informationTxt">接车时间：</view>
-					<view class="informationNum">{{orderData.billsheet.time}}</view>
-				</view>
 				<view class="informationLine">
 					<view class="informationTxt">服务顾问：</view>
 					<view class="informationNum">{{orderData.billsheet.PickName}}</view>
 				</view>
+				<view class="informationLine">
+					<view class="informationTxt">技师：</view>
+					<view class="informationNum">{{orderData.billsheet.workNames}}</view>
+				</view>
+				<!-- <view class="informationLine">
+					<view class="informationTxt">手机号：</view>
+					<view class="informationNum">{{orderData.billsheet.MobilePhone}}</view>
+				</view> -->
+				<!-- <view class="informationLine">
+					<view class="informationTxt">接车时间：</view>
+					<view class="informationNum">{{orderData.billsheet.time}}</view>
+				</view> -->
 				<view class="informationLine" v-if="FaultDescription">
 					<view class="informationTxt">故障描述：</view>
 					<view class="informationNum" v-if="orderData.billsheet.FaultDescription">
@@ -228,7 +230,7 @@
 				</view>
 				<view class="goodscostLine" >
 					<view class="goodscostTxt">结算方式</view>
-					<view class="goodsCostNum">{{orderData.billsheet.lastPayMethod?orderData.billsheet.lastPayMethod:''}}</view>
+					<view class="goodsCostNum" style="color: #333333;">{{orderData.billsheet.lastPayMethod?orderData.billsheet.lastPayMethod:''}}</view>
 				</view>
 			</view>
 
@@ -563,6 +565,14 @@
 		padding-left: 20rpx;
 		font-size: 30rpx;
 	}
+	.baoyangtis{
+		font-size: 26rpx;
+		padding-left: 20rpx;
+	}
+	.CarModel{
+		font-size: 26rpx;
+		padding-left: 20rpx;
+	}
 	.box {
 		min-height: 100vh;
 		background: #F4F5F7;