Merge branch 'master' of http://39.104.94.153:3000/yf_zd/second

templates/backstageNet/map/map.html

@@ -103,9 +103,21 @@
 
     });
     var mapimg = 'http://127.0.0.1:8000/'+$('#imgaddr').val();
-    var locat1 = eval('('+$('#locat1').val()+')');
-    var locat2 = eval('('+$('#locat2').val()+')');
-    var map_center = $('#pic_center').val().substring(1,$('#pic_center').val().length-1).split(',');
+    if($('#locat1').val()){
+        var locat1 = eval('('+$('#locat1').val()+')');
+    }else{
+        var locat1 = '116.246913,39.830454';
+    }
+    if($('#locat2').val()){
+        var locat2 = eval('('+$('#locat2').val()+')');
+    }else{
+        var locat2 = '116.246913,39.830454';
+    }
+    if($('#pic_center').val()){
+        var map_center = $('#pic_center').val().substring(1,$('#pic_center').val().length-1).split(',');
+    }else{
+        var map_center = [116.246913,39.830454];
+    }
     console.log(locat2)
 
     // 百度地图API功能

templates/outerNet/login2.html

@@ -338,7 +338,7 @@
                 success: function (data) {
                     if (data.code == 1) {
                         // var hrefstr = 'person_farm?name=' + data.username;
-                        window.location = 'home2'
+                        window.location = 'home'
                         window.open('back_manage')
                         // $('.isLogin').toggle();
                         // $('#person_farm').attr('href', hrefstr)