救援

pages/index/confirmRescue.vue

@@ -87,7 +87,7 @@
 	  </view> -->
 	  <view class="kkline">
 	  		  <view class="kklineLeft">
-	  			<span class="stars">*</span><span>手机号</span>
+	  			<span class="stars">*</span><span>联系人手机号</span>
 	  		  </view>
 	  		  <view class="kklineRight"><input type="text" placeholder="请输入" v-model="mobilePhone"></view>
 	  </view>
@@ -150,7 +150,8 @@
 			console.log("this.userInfo")
 			console.log(this.userInfo)
 			if(this.userInfo){
-				var customerInfo=uni.getStorageSync("wxOpenData").loginInfo.customerInfo;
+				//var customerInfo=uni.getStorageSync("wxOpenData").loginInfo.customerInfo;
+				var customerInfo=this.$store.state.wxOpenData.loginInfo.customerInfo
 				this.customerName=customerInfo.customerName;
 				this.mobilePhone=customerInfo.mobilePhone;
 			}

pages/subPack/rescueOrderOrderDetail.vue

@@ -118,9 +118,13 @@
 				<view class="informationTxt">下单时间：</view>
 				<view class="informationNum" >{{orderData.openShopHelpSheet.createTime}}</view>
 			</view>
+			<view class="informationLine">
+				<view class="informationTxt">联系人手机号：</view>
+				<view class="informationNum" >{{orderData.openShopHelpSheet.mobilePhone}}</view>
+			</view>
 			<view class="informationLine">
 				<view class="informationTxt">下单人：</view>
-				<view class="informationNum" >{{orderData.openUser.nickName|| '未知'}}/{{orderData.openShopHelpSheet.mobilePhone}}</view>
+				<view class="informationNum" >{{orderData.openUser.nickName|| '未知'}}/{{orderData.openUser.mobilePhone}}</view>
 			</view>
 			
 			<view class="informationLine" v-if="orderData.openShopHelpSheet.confirmTime">

pages/user/historyDetail.vue

@@ -46,7 +46,30 @@
 
 
 			</view>
-
+            <view class="shopBox2">
+            	<view class="newboxTop">
+            		<view class="newline1">{{orderData.billsheet.workNames}}</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.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="informationLine" >
+					<view class="informationTxt">保养门店联系电话：</view>
+					<view class="informationNum" v-if="orderData.billsheet.shopMobilePhone">
+						{{orderData.billsheet.shopMobilePhone}}
+					</view>
+				</view>
+            </view>
 			<!-- 店铺信息 -->
 			<view class="shopBox">
 				<image src="../../static/img/icon_store.png" mode="" class="shopBoximg"></image>
@@ -111,30 +134,14 @@
 						{{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="informationLine" >
 					<view class="informationTxt">保养技师：</view>
 					<view class="informationNum" v-if="orderData.billsheet.workNames">
 						{{orderData.billsheet.workNames}}
 					</view>
-				</view>
+				</view> -->
 				<view class="informationLine" v-if="Comment">
 					<view class="informationTxt">备注：</view>
 					<view class="informationNum" v-if="orderData.billsheet.Comment">{{orderData.billsheet.Comment}}
@@ -551,6 +558,11 @@
 </script>
 
 <style scoped>
+	.newboxTop{
+		display: flex;
+		padding-left: 20rpx;
+		font-size: 30rpx;
+	}
 	.box {
 		min-height: 100vh;
 		background: #F4F5F7;
@@ -618,13 +630,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;