km

pages/europeOrder/europeOrder.vue

@@ -145,11 +145,11 @@ export default {
 				var ios = /iphone|ipod|ipad|mac/.test(userAgent)
 				var android = /android/.test(userAgent)
 				if (ios) {
-								 if ( true) {//!standalone&& !safari
-								   window.webkit.messageHandlers.goMyNav.postMessage(null)
-								 }
+						 if ( true) {//!standalone&& !safari
+						   window.webkit.messageHandlers.goMyNav.postMessage(null)
+						 }
 				} else if (android) {
-								 window.android.postMessage()
+							window.android.postMessage()
 				}
 			
 		   

pages/rescue/rescueOrder.vue

@@ -10,7 +10,7 @@
 					</image>
 		
 				</view>
-				<view class="zdyNavTitle">订单管理</view>
+				<view class="zdyNavTitle">救援订单</view>
 				<view style="width: 50px;"></view>
 			</view>
 		</view>
@@ -21,7 +21,7 @@
 			<view class="searchBox">
 			  <view class="searchInputBox">
 				  <image src="../../static/img/icon_search.png" mode="" class="iconSimg"></image>
-				  <input type="text" v-model="name" placeholder="订单号、手机号、联系人" class="searchInput" @confirm="searchCf">
+				  <input type="text" v-model="name" placeholder="订单号、手机号、联系人、车牌号" class="searchInput" @confirm="searchCf">
 			       <image v-if="name" @click="ssql" src="../../static/img/chahao.png" mode="" class="sschahao"></image>
 			  </view>
 			<!--  <image @click="screenSHowBtn" src="../../static/img/icon_shai.png" mode="" class="iconShai"></image> -->
@@ -59,7 +59,7 @@
 					</picker>
 				  </view>
 				  <view class="screenBottom">
-				  	<view class="screenCz" @click="orderTimesxSHow=false">取消</view>
+				  	<view class="screenCz" @click="closeTime">取消</view>
 				  	<view class="screenY" @click="orderTimesx">确认</view>
 				  </view>
 			  </view>
@@ -230,25 +230,32 @@
 		
 		methods: {
 			orderTimesx(){
+				this.items=[]
 				this.orderTimesxSHow=false;
 				this.getData();
 			},
 			subhelpType(){
 				this.typeSHow=false;
-				var arr=[]
+				/* var arr=[]
 				this.items=[]
 				this.tabList.forEach(item=>{
 					if(item.ck){
 						arr.push(item.sheetType)
 					}
 				})
-				this.sheetTypeList=arr.join(',');
+				this.sheetTypeList=arr.join(','); */
 				this.getData();
 			},
 			ssql(){
 				this.name='';
 				this.getData();
 			},
+			closeTime(){
+				this.orderTimesxSHow=false
+				this.date2=''
+				this.date1=''
+				this.getData();
+			},
 			sub(){
 				this.screenSHow=false;
 				/* var arr=[]
@@ -258,8 +265,9 @@
 						arr.push(item.sheetType)
 					}
 				})
-				this.sheetTypeList=arr.join(',');
-				console.log(this.sheetTypeList) */
+				this.sheetTypeList=arr.join(',');*/
+				//console.log(this.sheetTypeList) 
+				
 				this.getData();
 			},
 			resetting(){
@@ -274,6 +282,7 @@
 				this.tabList[2].ck=false
 				this.tabList[3].ck=false
 				this.tabList[4].ck=false
+				this.items=[]
 				this.getData();
 				this.typeSHow=false;
 			},
@@ -286,6 +295,8 @@
 				if(num==0){
 					this.sheetTypeList=''
 				}
+				console.log(this.sheetTypeList)
+			
 			},
 			typeLineCk2(item){
 				/* if(item.name=='全部'){
@@ -379,6 +390,7 @@
 				this.getData()
 			},
 			getData() {
+				console.log(this.sheetTypeList)
 				uni.showLoading({
 					title: '加载中'
 				});

pages/rescue/rescueOrderDetail.vue

@@ -28,6 +28,19 @@
 			</view>
 
 		</view>
+		<!-- 拖车起始点 -->
+		<view class="startPointBox" v-if="orderData.openShopHelpSheet.helpType==2">
+			<div class="hStartAddressBox">
+				<div class="hStartAddressYd"></div>
+				<div class="startPointTitle">起点</div>
+				<div class="hStartAddress">{{orderData.openShopHelpSheet.hStartAddress}}</div>
+			</div>
+			<div class="hEndAddressBox">
+				<div class="hEndAddressYd"></div>
+				<div class="startPointTitle">终点</div>
+				<div class="hStartAddress">{{orderData.openShopHelpSheet.hEndAddress}}</div>
+			</div>
+		</view>
 
 		<!-- 救援信息 -->
 		<!-- 救援信息 -->
@@ -84,7 +97,7 @@
 			</view>
 			<view class="informationLine">
 				<view class="informationTxt">下单人：</view>
-				<view class="informationNum" >{{orderData.openUser.nickName|| '未知'}}</view>
+				<view class="informationNum" >{{orderData.openUser.nickName|| '未知'}} / {{orderData.openShopHelpSheet.mobilePhone}}</view>
 			</view>
 			<view class="informationLine" v-if="orderData.openShopHelpSheet.confirmTime">
 				<view class="informationTxt">确认时间：</view>
@@ -114,6 +127,14 @@
 				<view class="informationTxt">完成备注：</view>
 				<view class="informationNum" >{{orderData.openShopHelpSheet.finishComment}}</view>
 			</view>
+			<view class="informationLine" v-if="orderData.openShopHelpSheet.evaluateTime">
+				<view class="informationTxt">评价时间：</view>
+				<view class="informationNum">{{orderData.openShopHelpSheet.evaluateTime}}</view>
+			</view>
+			<view class="informationLine" v-if="orderData.openShopHelpSheet.evaluateComment">
+				<view class="informationTxt">评价内容：</view>
+				<view class="informationNum">{{orderData.openShopHelpSheet.evaluateComment}}</view>
+			</view>
 			<view class="informationLine" v-if="orderData.openShopHelpSheet.cancelTime">
 				<view class="informationTxt">取消时间：</view>
 				<view class="informationNum">{{orderData.openShopHelpSheet.cancelTime}}</view>
@@ -736,6 +757,46 @@
 </script>
 
 <style scoped>
+	.startPointBox{
+		width: 678rpx;
+		background: #FFFFFF;
+		border-radius: 10rpx;
+		margin-top: 20rpx;
+		margin-left: 24rpx;
+		padding:30rpx 12rpx ;
+		
+	}
+	.hStartAddressBox{
+		border-bottom: 1px solid #EEEEEE;
+		display: flex;padding-bottom: 30rpx;
+	}
+	.hEndAddressBox{
+		display: flex;padding-top: 30rpx;
+	}
+	.hEndAddressYd{
+		width: 14rpx;
+		height: 14rpx;
+		background: #F03B3B;
+		border-radius: 50%;
+		margin-top: 12rpx;
+		margin-right: 20rpx;
+	}
+	.hStartAddressYd{
+		width: 14rpx;
+		height: 14rpx;
+		background: #3F90F7;
+		border-radius: 50%;
+		margin-top: 12rpx;
+		margin-right: 20rpx;
+	}
+	.hStartAddress{
+		font-weight: 400;font-size: 28rpx;
+		color: #333333;padding-left: 30rpx;
+		line-height: 40rpx;
+	}
+	.startPointTitle{
+		color: #666666;line-height: 40rpx;font-size: 28rpx;
+	}
 	.shopGhTitle{
 		font-size: 30rpx;color: #333333;padding: 24rpx;
 	}