调度端调整

components/tabBar/tabBar.vue

@@ -97,7 +97,7 @@
 			// #endif
 			if (!this.nowPageInterval) {
 				this.nowPageInterval = setInterval(() => {
-
+					console.log('this.$msgSocket: ',this.$msgSocket);
 					this.msgSocket = this.$msgSocket
 				}, 3000);
 			}

manifest.json

@@ -21,7 +21,8 @@
             "Maps" : {},
             "Geolocation" : {},
             "Camera" : {},
-            "Barcode" : {}
+            "Barcode" : {},
+            "Push" : {}
         },
         /* 应用发布信息 */
         "distribute" : {
@@ -69,6 +70,12 @@
                         "appkey_ios" : "10fbc0a1e5490c06278eff3a10f0af50",
                         "appkey_android" : "10fbc0a1e5490c06278eff3a10f0af50"
                     }
+                },
+                "push" : {
+                    "unipush" : {
+                        "version" : "2",
+                        "offline" : false
+                    }
                 }
             },
             "icons" : {
@@ -189,6 +196,9 @@
     },
     "vueVersion" : "2",
     "h5" : {
+        "devServer" : {
+            "port" : 8081
+        },
         "sdkConfigs" : {
             "maps" : {
                 "qqmap" : {

pages/details/details.vue

@@ -50,7 +50,7 @@
 					<!-- <view class="box-title" v-if="detailsinfo.rescueInfo.rescueStatus == 5">您的订单已经完成</view>
 					<view class="box-title" v-if="detailsinfo.rescueInfo.rescueStatus == 6">待取车</view> -->
 
-					<view class="touxiang">
+					<view v-if="detailsinfo.rescueInfo.rescueStatus > 2" class="touxiang">
 						<image :src="baseUrl + detailsinfo.driverInfo.avatar" mode="aspectFit"></image>
 					</view>
 					<view class="box-bs" v-if="detailsinfo.driverInfo != '' ">

pages/move/move.vue

@@ -81,7 +81,7 @@
               <text style="margin-left: 5px;font-size: 18px;color: #71a2ff">定位</text>
             </view>
             <view style="border-radius: 0 0 10px 0" class="gwu inline" @click="gettel(item.phonenumber)">
-              <u-icon name="../../static/move/编组 7@2x.png" color="#ffffff" size="28"></u-icon>
+              <u-icon name="../../static/move/bz72x.png" color="#ffffff" size="28"></u-icon>
               <text style="margin-left: 5px;font-size: 18px;color: #71a2ff">拨打电话</text>
             </view>
           </view>

pages/my/my.vue

@@ -35,9 +35,9 @@
 
 		<view class="ail">
       <view class="back-car" v-if="identity === 'user'">
-        <image style="width: 45px;height: 35px" src="../../static/my/位图@2x.png" mode=""></image>
+        <image style="width: 45px;height: 35px" src="../../static/my/wt@2x.png" mode=""></image>
         <view class="back-car-logo">
-          <image style="width: 90px;height: 22px" src="../../static/my/一键还车@2x.png" mode=""></image>
+          <image style="width: 90px;height: 22px" src="../../static/my/yjhc2x.png" mode=""></image>
           <text class="back-car-text">添加车辆，查看更多救援信息</text>
         </view>
         <view class="back-button" @click="goHuanche">去还车</view>
@@ -49,26 +49,26 @@
 				<view class="sige">
           <view class="s-box" @click="goorder(2)">
             <view class="simg">
-              <u-icon name="../../static/my/待支付payment@2x.png" color="#133490" size="35"></u-icon>
+              <u-icon name="../../static/my/dzfpayment@2x.png" color="#133490" size="35"></u-icon>
             </view>
             <view class="zi">待支付</view>
           </view>
 
           <view class="s-box" @click="goorder(3)">
             <view class="simg">
-              <u-icon name="../../static/my/4出场车辆@2x.png" color="#133490" size="35"></u-icon>
+              <u-icon name="../../static/my/4cccl@2x.png" color="#133490" size="35"></u-icon>
             </view>
             <view class="zi">待取车</view>
           </view>
 					<view class="s-box" @click="goorder(1)">
 						<view class="simg">
-							<u-icon name="../../static/my/救援力量@2x.png" color="#133490" size="35"></u-icon>
+							<u-icon name="../../static/my/jyll@2x.png" color="#133490" size="35"></u-icon>
 						</view>
 						<view class="zi">救援中</view>
 					</view>
 					<view class="s-box" @click="goorder(5)">
 						<view class="simg">
-							<u-icon name="../../static/my/303正确、完成-线性圆框@2x.png" color="#133490" size="35"></u-icon>
+							<u-icon name="../../static/my/303zqwc-xxyk@2x.png" color="#133490" size="35"></u-icon>
 						</view>
 						<view class="zi">已完成</view>
 					</view>
@@ -80,7 +80,7 @@
         <view class="vinput" @click="goAssess()" v-if="identity === 'user'">
           <view class="dix">
             <view class="d-img">
-              <image src="../../static/my/编组 18@2x.png" mode=""></image>
+              <image src="../../static/my/bz18@2x.png" mode=""></image>
             </view>
             <view class="zq">评价管理</view>
           </view>
@@ -91,7 +91,7 @@
 				<view class="vinput" @click="gogogog()" v-if="identity === 'user'">
 					<view class="dix">
 						<view class="d-img">
-							<image src="../../static/my/编组 19@2x.png" mode=""></image>
+							<image src="../../static/my/bz19@2x.png" mode=""></image>
 						</view>
 						<view class="zq">车辆管理</view>
 					</view>
@@ -102,7 +102,7 @@
 				<view class="vinput" @click="gocarlist()">
 					<view class="dix">
 						<view class="d-img">
-							<image src="../../static/my/编组 17@2x.png" mode=""></image>
+							<image src="../../static/my/bz17@2x.png" mode=""></image>
 						</view>
 						<view class="zq">扣车管理</view>
 					</view>
@@ -113,7 +113,7 @@
 				<view class="vinput" @click="gosj()" v-if="identity === 'user'">
 					<view class="dix">
 						<view class="d-img">
-							<image src="../../static/my/编组 20@2x.png" mode=""></image>
+							<image src="../../static/my/bz20@2x.png" mode=""></image>
 						</view>
 						<view class="zq">数据统计</view>
 					</view>
@@ -124,7 +124,7 @@
 				<view class="vinput" @click="dialogToggle()" style="border-bottom: none">
 					<view class="dix">
 						<view class="d-img">
-							<image src="../../static/my/编组 21@2x.png" mode=""></image>
+							<image src="../../static/my/bz21@2x.png" mode=""></image>
 						</view>
 						<view class="zq">退出登录</view>
 					</view>

pages/rescue/rescue.vue

@@ -207,9 +207,8 @@
 			<view style="width: 100%; height: 80px; "></view>
 			<!-- dibu -->
 		</view>
-		<u-modal :show="showDelete" :title="title" :showCancelButton="true" @confirm="confirm"
+		<u-modal :show="showDelete" :title="title" :showCancelButton="true"></u-modal>
-			@cancel="cancel"></u-modal>
+		<u-popup :show="showp" mode="center" :round="10">
-		<u-popup :show="showp" @close="close" mode="center" :round="10">
 			<scroll-view scroll-y style="height: 200px;">
 				<view class="box_">
 					<view class="title_">车辆提醒</view>
@@ -763,7 +762,7 @@
 	}
 
 	.boxf1 {
-		height: 84px;
+		height: 140rpx;
 		overflow: hidden;
 		box-sizing: border-box;
 		border-radius: 6px;
@@ -777,7 +776,7 @@
 	}
 
 	.boxf2 {
-		height: 84px;
+		height: 140rpx;
 		overflow: hidden;
 		box-sizing: border-box;
 		border-radius: 6px;
@@ -791,7 +790,7 @@
 	}
 
 	.boxf3 {
-		height: 84px;
+		height: 140rpx;
 		overflow: hidden;
 		box-sizing: border-box;
 		border-radius: 6px;