Merge branch 'master' of http://git.yvanui.com/hust/wuhan_epi

whepi-ui/templates/home/getLocation.js

@@ -47,7 +47,7 @@ function getLocation() {
           // alert(result.detail.address)
 
           //获取到定位
-          if(autoLocal==''){
+          if(autoLocal == null || autoLocal==''){
             $('#js_input_jrszd').removeAttr("disabled")
             $('#js_input_jrszq').removeAttr("disabled")
           }