fix

pages/amap/amap.js

@@ -234,7 +234,7 @@
             var latlngSign = null;
 
             getVehicleData = function(t, first=false){
-                var deviceNumber = userinfo.baseinfo['deviceNumber'];
+                var deviceNumber = learun.storage.get('userinfo').baseinfo['deviceNumber'];
                 var mapData = null;
                 learun.httpget(config.webapi+"/?s=api/get_map_index_data", {deviceNumber:deviceNumber}, function (_res) {
                     mapData = _res.data;
@@ -264,10 +264,10 @@
                             $('#on-off-online').text('未在线过');
                             $('#on-off-online').css({color:"gray"})
                             var routeTime = new Date(0);
-                            routePageData = {speed: mapData.speed == null ? 0 : mapData.speed, lastTime:routeTime.Format("yyyy-MM-dd hh:mm:ss")}
+                            routePageData = {speed: mapData.speed == null ? 0 : mapData.speed, lastTime:routeTime.Format("yyyy-MM-dd hh:mm:ss")};
                         }else{
                             var routeTime = new Date(mapData.onlineTime*1000);
-                            routePageData = {speed: mapData.speed == null ? 0 : mapData.speed, lastTime:routeTime.Format("yyyy-MM-dd hh:mm:ss")}
+                            routePageData = {speed: mapData.speed == null ? 0 : mapData.speed, lastTime:routeTime.Format("yyyy-MM-dd hh:mm:ss")};
                             var interval = parseInt(new Date().getTime()/1000) - mapData.onlineTime;
                             if(interval < 24*3600){
                                 $('#on-off-online').text('在线中');
@@ -456,13 +456,13 @@
             });
             //定时刷新数据
             
-            var mainPageInterval = setInterval(function(){
-                if($('.f-page').length > 1){
-                    // clearTimeout(mainPageInterval);
-                    return;
-                }
-                getVehicleData(overlayData);
-            }, timeInterval);
+            // var mainPageInterval = setInterval(function(){
+            //     if($('.f-page').length > 1){
+            //         // clearTimeout(mainPageInterval);
+            //         return;
+            //     }
+            //     getVehicleData(overlayData);
+            // }, timeInterval);
             
         },
 

pages/my/my.js

@@ -22,19 +22,11 @@
             $page.find('#outloginbtn').on('tap', function () {
                 learun.layer.confirm('确定要退出账号?', function (_index) {
                     if (_index === '1') {
-                        
-                        //learun.nav.close('amap');
-						learun.isOutLogin = true;
+                        learun.isOutLogin = true;
                         learun.storage.set('logininfo', null);
 						
-                        learun.nav.go({ 
-							path: 'login', 
-							isBack: false, 
-							isHead: false,
-							callback: function(){
-								learun.nav.close('amap');
-							}
-						});
+                        learun.nav.go({ path: 'login', isBack: false, isHead: false });
+                        // window.location.reload();
                         
                     }
 

scripts/lrmuidebug.js

@@ -1392,9 +1392,7 @@ u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(
             d.nav.page.data[i.op.id] = null
         },
         remove: function(h) {
-			console.log('********* b.remove(h)***********');
             var i = d.nav.page.data[h];
-			console.log(d.nav.page.data);
             if (i != null) {
                 i.$page.remove();
                 i.$page = null;
@@ -1442,8 +1440,7 @@ u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(
             b.doQueue()
         },
         close: function(h) {
-            console.log('********* d.close(h)***********');
-			b.remove(h)
+            b.remove(h)
         }
     }
 })(window.jQuery, window.fui); (function(a, b) {
@@ -5967,8 +5964,6 @@ u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(
                 else {
                     $tab.hide();
                 }
-				console.log('%%%%%%%%%%%%%%%');
-				console.log(pageinfo);
                 var $pagebody = pageinfo.$page.find('.f-page-body');
                 var page = learun.nav.data[pageinfo.op.id];
 
@@ -5978,7 +5973,6 @@ u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(
                     var _pageinfo = pageinfo;
                     for (var i = 0; i < 100; i++) {
                         pageid = _pageinfo.preid;
-						console.log(i+'====='+pageid);
                         if (pageid !== "" && pageinfo.id !== pageid) {
                             _pageinfo = fui.nav.page.data[pageid];
                             if (!_pageinfo.op.isBack || !_pageinfo.op.isHead) {
@@ -5994,9 +5988,7 @@ u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(
                     }
                     pageinfo.preid = "";
                 }
-				if (dfop.callback) {
-                    dfop.callback();
-                }
+
                 if (!pageinfo.hasLoad) {
                     loadhtml(page, $pagebody, pageinfo.op);
                 }