Merge branch 'dev' into ats

pages/user/historyDetail.vue

@@ -46,12 +46,38 @@
 
 
 			</view>
-           
+            <view class="shopBox2">
+            	<view class="newboxTop">
+            		<view class="newline1">{{orderData.billsheet.CustomerName}}</view>
+					<view class="newline1" style="padding-left: 20rpx;">{{orderData.billsheet.PlateNumber}}</view>
+            	</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">
+						{{orderData.billsheet.NextCareMilage}}km
+					</view>
+				</view>
+				<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="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>
@@ -74,31 +100,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">
@@ -111,6 +135,14 @@
 						{{orderData.billsheet.RepairDescription}}
 					</view>
 				</view>
+				
+				
+				<!-- <view class="informationLine" >
+					<view class="informationTxt">保养技师：</view>
+					<view class="informationNum" v-if="orderData.billsheet.workNames">
+						{{orderData.billsheet.workNames}}
+					</view>
+				</view> -->
 				<view class="informationLine" v-if="Comment">
 					<view class="informationTxt">备注：</view>
 					<view class="informationNum" v-if="orderData.billsheet.Comment">{{orderData.billsheet.Comment}}
@@ -152,7 +184,7 @@
 
 						<view class="goodTop">
 							<view class="detailedName"><span v-if="item.CardDetailID"
-									class="kaColor">卡</span>{{item.GoodsName}}</view>
+									class="kaColor">卡</span>{{item.Brand}} {{item.GoodsName}}</view>
 							<view class="qty">x{{item.SaleQty}}</view>
 						</view>
 						<view class="secondBox" :class="{noLine:index == orderData.listParts.length-1}">
@@ -195,6 +227,10 @@
 					<view class="goodscostTxt">支付金额</view>
 					<view class="goodsCostNum">￥{{orderData.billsheet.money?orderData.billsheet.money:0}}</view>
 				</view>
+				<view class="goodscostLine" >
+					<view class="goodscostTxt">结算方式</view>
+					<view class="goodsCostNum" style="color: #333333;">{{orderData.billsheet.lastPayMethod?orderData.billsheet.lastPayMethod:''}}</view>
+				</view>
 			</view>
 
 			<!-- 手机号授权 -->
@@ -385,6 +421,21 @@
 					openId: this.wxOpenData.openid
 				}, 'POST').then(res => {
 					var data = res.data;
+					if(data.newCustomer){
+						uni.showModal({
+							title: '提示',
+							content: data.newCustomerMsg,
+							success: function(resTK) {
+								
+							}
+						});
+						
+						var token=res.data.token
+						data.loginInfo={}
+						data.loginInfo.token=token
+						this.$store.commit('mutationswxOpenData', data);
+						return false;
+					}
 					if (data.loginInfo) {
 						this.userInfo = data.loginInfo.openUser;
 						this.wxOpenData = data.loginInfo;
@@ -508,6 +559,15 @@
 </script>
 
 <style scoped>
+	.newboxTop{
+		display: flex;
+		padding-left: 20rpx;
+		font-size: 30rpx;
+	}
+	.baoyangtis{
+		font-size: 26rpx;
+		padding-left: 20rpx;
+	}
 	.box {
 		min-height: 100vh;
 		background: #F4F5F7;
@@ -575,13 +635,23 @@
 		margin-top: 30rpx;
 		margin-left: 28rpx;
 	}
-
+    .shopBox2{
+		padding: 30rpx 20rpx;
+		margin: 0rpx 24rpx;
+		margin-top: -60rpx;
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+	}
+	.shopBox2 .informationTxt {
+		width: 350rpx;
+	}
+	
 	.shopBox {
 
 		display: flex;
 		padding: 30rpx 20rpx;
 		margin: 0rpx 24rpx;
-		margin-top: -60rpx;
+		margin-top: 20rpx;
 		background-color: #FFFFFF;
 		border-radius: 10rpx;
 
@@ -847,13 +917,13 @@
 	}
 
 	.informationTxt {
-		width: 190rpx;
+		width: 200rpx;
 		color: #999999;
 	}
 
 	.informationNum {
 		color: #333333;
-		width: calc(100vw - 190rpx);
+		width: calc(100vw - 200rpx);
 	}
 
 	.copyBtn {