Merge branch 'ats2' of http://47.98.226.240:3000/twt/wxThird into ats2

# Conflicts:
#	pages/index/index.vue
#	pages/user/user.vue

pages/index/confirmRescue.vue

@@ -189,6 +189,16 @@
 					});
 					return false;
 				} */
+				var reg = /^1[3|4|5|7|8][0-9]\d{8}$/;
+				if(reg.test(this.mobilePhone) == false ){
+				    console.log("手机号码格式不正确");
+				     uni.showToast({
+				     	title: '请输入正确的手机号',
+				     	icon: 'none',
+				     	duration: 3000
+				     });
+				     return false;   
+				}
 				if(!this.mobilePhone){
 					uni.showToast({
 						title: '请输入手机号',
@@ -204,8 +214,8 @@
 				  mobilePhone: this.mobilePhone,
 				  //orderItem: this.yuyueData.map(item => item.ID).join(),
 				  shopID: this.opt.shopId,
-				  plateNumber: this.carInfo ? this.carInfo.plateNumber :'',
-				  carModel:this.carInfo?.carModel||'',
+				  //plateNumber: this.carInfo ? this.carInfo.plateNumber :'',
+				 // carModel:this.carInfo?.carModel||'',
 				  hEndAddress:this.opt.endAddress,
 				  hStartAddress:this.opt.currentAddress,
 				  orderType:this.opt.orderType,

pages/index/confirmYuyue.vue

@@ -31,7 +31,7 @@
 		  </view>
 		  <view class=" lineborderNo" >
 		  	<view class="bzline">
-		  		<view class="beiz">手机号</view>
+		  		<view class="beiz"><span class="stars">*</span>手机号</view>
 		  		<input type="number" v-model="mobilePhone" placeholder="请输入手机号" class="beizInput" placeholder-style="color:#cccccc;">
 		  	</view>
 		  	
@@ -106,6 +106,11 @@
 			this.yyshopInfo=uni.getStorageSync("yyshopInfo")
 			this.ext=this.$common.getExtStoreId();
 			//this.getOrderTimes()
+			if(this.userInfo){
+				console.log(this.userInfo)
+				//var customerInfo=uni.getStorageSync("wxOpenData").loginInfo.customerInfo;
+				this.mobilePhone=this.userInfo.mobilePhone;
+			}
 			
 		},
 		onShow() {
@@ -135,6 +140,17 @@
 					});
 					return false;
 				} */
+				var reg = /^1[3|4|5|7|8][0-9]\d{8}$/;
+				if(reg.test(this.mobilePhone) == false ){
+				    console.log("手机号码格式不正确");
+				     uni.showToast({
+				     	title: '请输入正确的手机号',
+				     	icon: 'none',
+				     	duration: 3000
+				     });
+				     return false;   
+				}
+				
 				if(!this.billDate){
 					uni.showToast({
 						title: '请选择预约时间',
@@ -143,6 +159,14 @@
 					});
 					return false;
 				}
+				if(!this.mobilePhone){
+					uni.showToast({
+						title: '请填写手机号',
+						icon: 'none',
+						duration: 3000
+					});
+					return false;
+				}
 				if(!this.isgo){
 					return false
 				}
@@ -150,7 +174,8 @@
 				this.$http('openreservation/saveOrderSheet', {
 				  billDate: this.billDate,
 				  comment: this.comment,
-				  carID: this.carInfo?.id || '',
+				//  carID: this.carInfo?.id || '',
+				  carID: '',
 				  orderItem: this.yuyueData.map(item => item.ID).join(),
 				  shopId: this.yyshopInfo.id,
 				  unionId: this.ext.unionId,

pages/subPack/rescueOrderOrderDetail.vue

@@ -120,7 +120,7 @@
 			</view>
 			<view class="informationLine">
 				<view class="informationTxt">下单人：</view>
-				<view class="informationNum" >{{orderData.openUser.nickName|| '未知'}}/{{orderData.openUser.mobilePhone}}</view>
+				<view class="informationNum" >{{orderData.openUser.nickName|| '未知'}}/{{orderData.openShopHelpSheet.mobilePhone}}</view>
 			</view>
 			
 			<view class="informationLine" v-if="orderData.openShopHelpSheet.confirmTime">

pages/user/bespeakDetail.vue

@@ -42,10 +42,10 @@
 		<!-- 订单信息 -->
 		<view class="information">
 			<view class="detailedTitle">基本信息</view>
-			<!-- <view class="informationLine">
+		    <view class="informationLine" v-if="orderData.orderSheet.plateNumber"> 
 				<view class="informationTxt">车牌号：</view>
 				<view class="informationNum">{{orderData.orderSheet.plateNumber}}</view>
-			</view> -->
+			</view> 
 			<view class="informationLine">
 				<view class="informationTxt">手机号：</view>
 				<view class="informationNum">{{orderData.orderSheet.mobilePhone}}</view>

pages/user/historyDetail.vue

@@ -111,6 +111,30 @@
 						{{orderData.billsheet.RepairDescription}}
 					</view>
 				</view>
+				<view class="informationLine" >
+					<view class="informationTxt">下次保养里程：</view>
+					<view class="informationNum" v-if="orderData.billsheet.NextCareMilage">
+						{{orderData.billsheet.NextCareMilage}}
+					</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="informationLine" >
+					<view class="informationTxt">保养门店联系电话：</view>
+					<view class="informationNum" v-if="orderData.billsheet.shopMobilePhone">
+						{{orderData.billsheet.shopMobilePhone}}
+					</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 +176,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 +219,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">{{orderData.billsheet.lastPayMethod?orderData.billsheet.lastPayMethod:''}}</view>
+				</view>
 			</view>
 
 			<!-- 手机号授权 -->
@@ -862,13 +890,13 @@
 	}
 
 	.informationTxt {
-		width: 190rpx;
+		width: 200rpx;
 		color: #999999;
 	}
 
 	.informationNum {
 		color: #333333;
-		width: calc(100vw - 190rpx);
+		width: calc(100vw - 200rpx);
 	}
 
 	.copyBtn {

pages/user/user.vue

@@ -643,9 +643,9 @@
 							that.queryMyDetail()
                         }, 1000); */
 						that.queryMyDetail()
-						if(!data.loginInfo.customerInfo.wxMiniV2OpenID){
-							this.seeQr()
-						}
+						 if(!data.loginInfo.customerInfo.wxMiniV2OpenID){
+						 	this.seeQr()
+						 }
 						if(this.numList.customerInfo.pState==1&&this.numList.shopSettings.partnerDisabled){
 							this.kkshow=true
 						}
@@ -654,7 +654,6 @@
 						}
 						
 					}
-					
 				})
 			},
 			map() {

utils/request.js

@@ -27,8 +27,11 @@ const http = (url = '', date = {}, type = 'POST', header = {
 		//const wxOpenData = uni.getStorageSync("wxOpenData");
 		var wxOpenData=$store.state.wxOpenData
 		if(wxOpenData.token){
-			header['token']=wxOpenData.token;
+			header['token']=wxOpenData.token ;
+		}else if(wxOpenData.loginInfo?.token){
+			header['token']=wxOpenData.loginInfo.token;
 		}
+		
 		if(wxOpenData.loginInfo){
 			//header['token']=wxOpenData.loginInfo.token;
 			header['uid']=wxOpenData.loginInfo.uid;