fix tips

pages/amap/amap.js

@@ -242,7 +242,9 @@
                 var gpsNumber = renlian.storage.get('userinfo').baseinfo.gpsNumber;
                 var mapData = null;
                 renlian.httpget(config.webapi+"/?s=api/get_map_index_data", {deviceNumber:deviceNumber, licensePlate:licensePlate, gpsNumber:gpsNumber}, function (_res) {
+                    
                     mapData = _res.data;
+                    console.log(mapData);
                     if(!mapData){
                         renlian.layer.warning('无地图数据,请检测网络或联系管理员！', function () { }, '提示', '关闭');
                         return;
@@ -278,7 +280,7 @@
                         }
                     }
                     
-
+                    $(".ract").off("click");
                     vehicleInfoWin();
                     
 
@@ -401,8 +403,9 @@
                                 });
                             }
                             infoWindow.open(mainMap, lnglat);
+                            console.log(infoWindow.get$Container());
                             infoWindow.get$Container().on('click', function(){
-                                renlian.nav.go({ path: 'amap/navigation', title: '导航', isBack: true, isHead: true, param: startEnd });
+                                renlian.nav.go({ path: 'amap/navigation', title: '导航', isBack: true, isHead: true, param: startEnd});
                                 if(infoWindow){
                                     infoWindow.close( );
                                 }

pages/amap/fence/fence.js

@@ -28,7 +28,7 @@
             function getFenceData(){
                 renlian.httpget(config.webapi+'?s=api/get_fence_info',userinfo.baseinfo.plate,function(res){
                     if(!res.success){
-                        renlian.layer.toast(res.message);
+                        // renlian.layer.toast(res.message);
                         var fenceInfo = {radius:500, center:param.default}
                         if(!circleFence){
                             circleFence = new AMap.Circle({

pages/amap/navigation/navigation.css

@@ -16,7 +16,7 @@
     background: white;
     padding: 10px;
     display: flex;
-}
+} 
 
 /* id */
 #address{

pages/amap/navigation/navigation.js

@@ -18,20 +18,24 @@
             map.on('complete', function(){
                 renlian.layer.loading(false);
                 
-			});
+            });
+            var riding = null;
 
             var userMarker = new AMap.Marker({icon: "./images/location.png", offset:new AMap.Pixel(-16, -16)});
 
             //骑行导航
-           var riding = new AMap.Riding({
-                map: map,
-                autoFitView: true
-            }); 
+            if(!riding){
+                var riding = new AMap.Riding({
+                    map: map,
+                    autoFitView: true
+                }); 
+            } 
+
             //根据起终点坐标规划骑行路线
             riding.search(param.start, param.end, function(status, result) {
                 // result即是对应的骑行路线数据信息，相关数据结构文档请参考  https://lbs.amap.com/api/javascript-api/reference/route-search#m_RidingResult
                 if (status === 'complete') {
-                    renlian.layer.toast('绘制骑行路线完成:');
+                    // renlian.layer.toast('绘制骑行路线完成:');
                 } else {
                     renlian.layer.toast('骑行路线数据查询失败:' + result);
                 }
@@ -57,7 +61,7 @@
 				// onError Callback receives a PositionError object
 				//
 				function onError(error) {
-					alert('code: '    + error.code    + '\n' +
+					console.log('code: '    + error.code    + '\n' +
 						  'message: ' + error.message + '\n');
 				}
                 navigator.geolocation.getCurrentPosition(onSuccess, onError);
@@ -89,13 +93,17 @@
                         }else{console.log(JSON.stringify(result))}
                     });
                 }
-            }, 2000);
+            }, 10000);
 
 
 
 
 
             
+        },
+
+        reload:function(pageinfo){
+            console.log('testsfadfasd')
         }
     };
 

pages/amap/route/route.js

@@ -11,7 +11,7 @@
 			
             //播放控制相关事件清除
             function removeEvents(){
-                $(".icon-bofang").off("tap");
+                $("#play-pause").off("tap");
                 $(".icon-last").off("tap");
                 $(".icon-next").off("tap");
                 $(".speed-set").off("tap");
@@ -32,7 +32,7 @@
 
             //test
             var initPage = function(PathSimplifier, data) {
-
+                removeEvents();
                 if(!data){
                     if( window.pathSimplifierIns){
                         window.pathSimplifierIns.setData([]);
@@ -45,7 +45,6 @@
 
                     return;
                 }
-
                 removeEvents();
                 if(window.pathSimplifierIns){
                     window.pathSimplifierIns.setData([]);
@@ -74,8 +73,20 @@
                             strokeStyle: 'red',
                             lineWidth: 6,
                             dirArrowStyle: true
-                        }
-                    }
+                            
+                        },
+                        eventSupport: false,
+
+                        //巡航线样式
+                        pathNavigatorStyle:{
+                            pathLinePassedStyle:{
+                                lineWidth:2
+                            },
+                        },
+                        
+                        
+                    },
+
                 });
             
 
@@ -112,7 +123,7 @@
                 });
 
                 // 播放暂停切换
-                $page.find('.icon-bofang').on('tap', function () {
+                $page.find('#play-pause').on('tap', function () {
                     var playSign = $page.find('#play-pause');
                     if(playSign.hasClass('icon-bofang')){
                         playSign.removeClass('icon-bofang');
@@ -151,7 +162,9 @@
                 });
                 $page.find('.icon-next').on('tap', function () {
                     if(navg0.getNaviStatus() == 'stop'){
-                        return;
+                        navg0.start();
+                        navg0.pause();
+                        // return;
                     }
                     if(navg0.getNaviStatus() == 'moving'){
                         navg0.pause();
@@ -253,7 +266,6 @@
                             //    lngLats.push([v.lng, v.lat]);
                             });
                         }
-                        
                        initPage(PathSimplifier, data);
 					});
                 });

pages/baojing/baojing.js

@@ -20,6 +20,7 @@
             renlian.httpget(config.webapi + "/?s=api/get_cityinfo_by_cityid&cityid="+userinfo.baseinfo.cityid, {}, function(res) {
             	    console.log(res);
 					$page.find('#select3').lrpickerSet(res.data);
+					
 					// $page.find('#select3').lrpickerSet('20,331,2012');
 			});
 			$page.find('#plate').val(userinfo.baseinfo.plate);

pages/my/aboutadms/aboutadms.html

@@ -1,8 +1,8 @@
 <div class="lr-aboutadms-page">
     <div>
-        <div class="title">xxx<br>xxxx</div>
+        <div class="title">内蒙古璟意中联科技有限公司<br>电话:xxxx-xxxxxxxx</div>
         <div class="img"><img src="" /></div>
         <div class="des">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
-        <div class="ver">当前版本:v1.0.0</div>
+        <!--<div class="ver">当前版本:v1.0.0</div>-->
     </div>
 </div>

pages/my/aboutlearun/aboutlearun.html

@@ -1,6 +1,6 @@
 <div class="lr-about-page">
     <div>
-        <div class="title">xxx<br>xxx</div>
+        <div class="title">内蒙古璟意中联科技有限公司<br>电话:xxxx-xxxxxxxx</div>
         <div class="img"><img src="" /></div>
         <div class="des">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
         <!--<div class="ver">当前版本:v1.0.0</div>-->

pages/my/mybaodan/mybaodan.html

@@ -0,0 +1,5 @@
+<div class="lr-my-page">
+    <div style="width: 100%;height: 100%;">
+        <img style="max-width: 100%!important;max-height: 100%!important;width: auto;height: auto;" src="./images/developing.jpg" alt="">
+    </div>  
+</div>

pages/tongji/tongji.js

@@ -21,7 +21,7 @@
 						averageSpeed = 0.00;
 					}
 
-					drivingdata = [{name:'里程总计', value: days5Dist.toFixed(2) + 'km'}, {name:'累计时长', value: days5Dist.toFixed(2) + '小时'}, {name:'平均速度', value: averageSpeed + 'km/h'}]
+					drivingdata = [{name:'里程总计', value: days5Dist.toFixed(2) + 'km'}, {name:'累计时长', value: day5Time.toFixed(2) + '小时'}, {name:'平均速度', value: averageSpeed + 'km/h'}]
 										//直方
 					chartMap = {};
 					chartMap['drive-data-bar'] = echarts.init(document.getElementById('drive-data-bar'));

scripts/rlmuiex.js

@@ -47,7 +47,7 @@
                     //callback(null);
                     callback(res);
                     //renlian.layer.toast(res.info);
-                    renlian.layer.toast(res.message);
+                    // renlian.layer.toast(res.message);
                 }
             }
         });
@@ -91,7 +91,7 @@
                     //callback(null);
                     callback(res);
                     //renlian.layer.toast(res.info);
-                    renlian.layer.toast(res.message);
+                    // renlian.layer.toast(res.message);
                 }
             }
         });