bug修好

manifest.json

@@ -72,8 +72,10 @@
     "h5" : {
         "sdkConfigs" : {
             "maps" : {
-                "qqmap" : {
-                    "key" : ""
+                "amap" : {
+                    "key" : "243e8ea815a6b237bcbcf2d9f4407477",
+                    "securityJsCode" : "",
+                    "serviceHost" : ""
                 }
             }
         }

pages/rescue/rescueOrder.vue

@@ -115,7 +115,8 @@
 				<view class="itemaddress">
 				  <div class="addressDD"></div>   {{item.HStartAddress}}
 				</view>
-				<view class="itemName">救援时间：{{item.HTime}}</view>
+				<view class="itemName" v-if="item.orderType==1">救援时间：立刻</view>
+				<view class="itemName" v-else>救援时间：{{item.HTime}}</view>
 				<view style="display: flex;justify-content: space-between;">
 					<view class="itemName" >{{item.PlateNumber}}</view>
 					<view class="itemName" >{{item.CustomerName}}</view>

pages/rescue/rescueOrderDetail.vue

@@ -34,11 +34,13 @@
 				<div class="hStartAddressYd"></div>
 				<div class="startPointTitle">起点</div>
 				<div class="hStartAddress">{{orderData.openShopHelpSheet.hStartAddress}}</div>
+				<img src="../../static/img/icon_ditu.png" alt="" class="mapImg" @click="goMap"/>
 			</div>
 			<div class="hEndAddressBox">
 				<div class="hEndAddressYd"></div>
 				<div class="startPointTitle">终点</div>
 				<div class="hStartAddress">{{orderData.openShopHelpSheet.hEndAddress}}</div>
+				<img src="../../static/img/icon_ditu.png" alt="" class="mapImg"/>
 			</div>
 		</view>
 
@@ -51,12 +53,21 @@
 				<view class="informationNum">{{orderData.openShopHelpSheet.code}}<span class="codeCopy"
 						@click="copy(orderData.openShopHelpSheet.code)">复制</span></view>
 			</view>
+			<view class="informationLine">
+				<view class="informationTxt">救援时间：</view>
+				<view class="informationNum" v-if="orderData.openShopHelpSheet.orderType==1">立刻</view>
+				<view class="informationNum" v-else>{{orderData.openShopHelpSheet.hTime}}</view>
+			</view>
 			<view class="informationLine">
 				<view class="informationTxt">救援类型：</view>
-				<view class="informationNum" v-if="orderData.openShopHelpSheet.helpType==1">搭电</view>
-				<view class="informationNum" v-if="orderData.openShopHelpSheet.helpType==2">拖车</view>
-				<view class="informationNum" v-if="orderData.openShopHelpSheet.helpType==3">换胎</view>
-				<view class="informationNum" v-if="orderData.openShopHelpSheet.helpType==4">未知原因</view>
+			<view class="informationNum2" v-if="orderData.openShopHelpSheet.helpType==1">搭电</view>
+			<view class="informationNum2" v-if="orderData.openShopHelpSheet.helpType==2">拖车</view>
+			<view class="informationNum2" v-if="orderData.openShopHelpSheet.helpType==3">换胎</view>
+			<view class="informationNum2" v-if="orderData.openShopHelpSheet.helpType==4">未知原因</view>
+			<view class="informationNum2">-</view>
+			<view class="informationNum2" v-if="orderData.openShopHelpSheet.hscene==1">地面</view>
+			<view class="informationNum2" v-if="orderData.openShopHelpSheet.hscene==2">车库</view>
+			<view class="informationNum2" v-if="orderData.openShopHelpSheet.hscene==3">其他</view>
 			</view>
 			<view class="informationLine" v-if="orderData.openShopHelpSheet.plateNumber">
 				<view class="informationTxt">车牌号：</view>
@@ -68,12 +79,9 @@
 			</view>
 			<view class="informationLine">
 				<view class="informationTxt">救援联系人：</view>
-				<view class="informationNum">{{orderData.openShopHelpSheet.customerName}}</view>
-			</view>
-			<view class="informationLine" v-if="orderData.openShopHelpSheet.mobilePhone">
-				<view class="informationTxt">手机号：</view>
-				<view class="informationNum">{{orderData.openShopHelpSheet.mobilePhone}}</view>
+				<view class="informationNum">{{orderData.openShopHelpSheet.customerName}}/{{orderData.openShopHelpSheet.mobilePhone}}</view>
 			</view>
+			
 			<view class="informationLine" >
 				<view class="informationTxt">救援门店：</view>
 				<view class="informationNum">{{orderData.shopInfo.shopName}}</view>
@@ -101,28 +109,19 @@
 			</view>
 			<view class="informationLine" v-if="orderData.openShopHelpSheet.confirmTime">
 				<view class="informationTxt">确认时间：</view>
-				<view class="informationNum" >{{orderData.openShopHelpSheet.confirmTime}}</view>
-			</view>
-			<view class="informationLine" v-if="orderData.openShopHelpSheet.confirmOperator">
-				<view class="informationTxt">确认人：</view>
-				<view class="informationNum" >{{orderData.openShopHelpSheet.confirmOperator}}</view>
+				<view class="informationNum" >{{orderData.openShopHelpSheet.confirmTime}}/{{orderData.openShopHelpSheet.confirmOperator}}</view>
 			</view>
+		
 			<view class="informationLine" v-if="orderData.openShopHelpSheet.goingTime">
 				<view class="informationTxt">出发时间：</view>
-				<view class="informationNum" >{{orderData.openShopHelpSheet.goingTime}}</view>
-			</view>
-			<view class="informationLine" v-if="orderData.openShopHelpSheet.goingOperator">
-				<view class="informationTxt">出发人：</view>
-				<view class="informationNum" >{{orderData.openShopHelpSheet.goingOperator}}</view>
+				<view class="informationNum" >{{orderData.openShopHelpSheet.goingTime}}/{{orderData.openShopHelpSheet.goingOperator}}</view>
 			</view>
+			
 			<view class="informationLine" v-if="orderData.openShopHelpSheet.finishTime">
 				<view class="informationTxt">完成时间：</view>
-				<view class="informationNum" >{{orderData.openShopHelpSheet.finishTime}}</view>
-			</view>
-			<view class="informationLine" v-if="orderData.openShopHelpSheet.finishOperator">
-				<view class="informationTxt">完成人：</view>
-				<view class="informationNum" >{{orderData.openShopHelpSheet.finishOperator}}</view>
+				<view class="informationNum" >{{orderData.openShopHelpSheet.finishTime}}/orderData.openShopHelpSheet.finishOperator</view>
 			</view>
+			
 			<view class="informationLine" v-if="orderData.openShopHelpSheet.finishComment">
 				<view class="informationTxt">完成备注：</view>
 				<view class="informationNum" >{{orderData.openShopHelpSheet.finishComment}}</view>
@@ -137,12 +136,9 @@
 			</view>
 			<view class="informationLine" v-if="orderData.openShopHelpSheet.cancelTime">
 				<view class="informationTxt">取消时间：</view>
-				<view class="informationNum">{{orderData.openShopHelpSheet.cancelTime}}</view>
-			</view>
-			<view class="informationLine" v-if="orderData.openShopHelpSheet.cancelOperator">
-				<view class="informationTxt">取消人：</view>
-				<view class="informationNum" >{{orderData.openShopHelpSheet.cancelOperator}}</view>
+				<view class="informationNum">{{orderData.openShopHelpSheet.cancelTime}}/{{orderData.openShopHelpSheet.cancelOperator}}</view>
 			</view>
+			
 			<view class="informationLine" v-if="orderData.openShopHelpSheet.cancelComment">
 				<view class="informationTxt">取消备注：</view>
 				<view class="informationNum" >{{orderData.openShopHelpSheet.cancelComment}}</view>
@@ -285,6 +281,16 @@
 		
 
 		methods: {
+			goMap(){
+				/* console.log(this.orderData.openShopHelpSheet.startLat)
+				uni.openLocation({
+				latitude: this.orderData.openShopHelpSheet.startLat,
+				longitude: this.orderData.openShopHelpSheet.startLng,
+				success: function () {
+					console.log('success');
+				    }
+			    }); */
+			},
 			goingOrder(){
 				var that = this
 				uni.showModal({
@@ -757,6 +763,10 @@
 </script>
 
 <style scoped>
+	.informationNum2{
+		color: #333333;
+		font-size: 26rpx;
+	}
 	.startPointBox{
 		width: 678rpx;
 		background: #FFFFFF;
@@ -766,6 +776,9 @@
 		padding:30rpx 12rpx ;
 		
 	}
+	.mapImg{
+		width: 44rpx;height: 44rpx;
+	}
 	.hStartAddressBox{
 		border-bottom: 1px solid #EEEEEE;
 		display: flex;padding-bottom: 30rpx;
@@ -793,6 +806,7 @@
 		font-weight: 400;font-size: 28rpx;
 		color: #333333;padding-left: 30rpx;
 		line-height: 40rpx;
+		width: 500rpx;
 	}
 	.startPointTitle{
 		color: #666666;line-height: 40rpx;font-size: 28rpx;

utils/request.js

@@ -1,6 +1,7 @@
 //测试地址
 const baseUrl = 'http://api.dms.66km.com.cn/'
-//const baseUrl = 'http://192.168.0.124:20187/'
+//const baseUrl = 'http://dms.66km.com.cn/'
+//const baseUrl = 'http://192.168.0.126:20187/'
 //const baseUrl = 'http://syadmin.66km.com/'
 //正式地址-66
 //const baseUrl = 'http://apidms.66km.com/'
@@ -18,7 +19,7 @@ const http = (url = '', date = {}, type = 'POST', header = {
 		 	header['accessToken']=wxOpenData.loginInfo.token;
 	 	   header['uid']=wxOpenData.loginInfo.uid; 
 		 }
-		//console.log($store.state.carInfo)
+		console.log(wxOpenData.loginInfo.token)
 		//header['token']='870347EA782D4A8D90848EEDF6A0B327';
 		//header['uid']='BD04C2D5-0C07-40C9-9F8A-91BB30EDF2F6'; 
 		header['Content-Type']='application/x-www-form-urlencoded';