Merge branch 'dev' into ats

pages/user/historyDetail.vue

@@ -51,6 +51,7 @@
             		<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">
@@ -568,6 +569,10 @@
 		font-size: 26rpx;
 		padding-left: 20rpx;
 	}
+	.CarModel{
+		font-size: 26rpx;
+		padding-left: 20rpx;
+	}
 	.box {
 		min-height: 100vh;
 		background: #F4F5F7;