Ver Fonte

xielianghe

lange há 5 anos atrás
pai
commit
17ff0a160f

+ 9 - 0
whepi-ui/templates/home/getLocation.js

@@ -46,6 +46,15 @@ function getLocation() {
           autoAddr = result.detail.address;
           // alert(result.detail.address)
 
+          //获取到定位
+          if(autoLocal==''){
+            $('#js_input_jrszd').removeAttr("disabled")
+            $('#js_input_jrszq').removeAttr("disabled")
+          }
+          else {
+            $('#js_input_jrszd').attr("disabled", "disabled");
+            $('#js_input_jrszq').attr("disabled", "disabled");
+          }
           console.log(result);
         }
       })

+ 1 - 1
whepi-ui/templates/home/ribao.ftl

@@ -281,7 +281,7 @@
                             </div>
                             <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
                                 <div style="height: 5vh; line-height: 5vh; width: 55%;">今晚住地</div>
-                                <input id="js_input_jrszd" class="weui-input" type="text" placeholder="请选择" disabled="disabled"
+                                <input id="js_input_jrszd" class="weui-input" type="text" placeholder="请选择"
                                        style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%"
                                        onchange="selectinput2(this)"/>
                                 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

+ 18 - 18
whepi-ui/templates/home/ribao.js

@@ -400,8 +400,8 @@ function ribao_init() {
 function selectinput1(obj) {
   var grender = $("#js_input_gzzd").attr("data-values") == undefined ? 0 : $("#js_input_gzzd").attr("data-values");
   if (grender != 4) {//js_input_qtdd
-    // $('#js_input_qtdd')[0].disabled == 'disabled'
-    $('#js_input_qtdd').attr("disabled", "disabled");
+    // $('#js_input_qtdd')[0].disabled == 'disabled'+
+    +
     $("#js_input_qtdd").val("");
   } else {
     $('#js_input_qtdd').removeAttr("disabled")
@@ -1066,12 +1066,12 @@ function ribaoCommit() {
     return
   }
   cantijiao = false
-  //判断是否获取到定位
-  if (autoLocal == '') {
-    cantijiao = true;
-    $.alert("请先设置微信获取当前位置");
-    return;
-  }
+  // //判断是否获取到定位
+  // if (autoLocal == '') {
+  //   cantijiao = true;
+  //   $.alert("请先设置微信获取当前位置");
+  //   return;
+  // }
   var sf = $("#js_input_sf").attr("data-values") == undefined ? 3 : $("#js_input_sf").attr("data-values");
   if (listcx.length == 0 && sf == 1) {
     cantijiao = true;
@@ -1528,16 +1528,16 @@ function updateSuspected(suspectedId) {
         }
         $("#js_input_qtdd").val(suspected.workLocalOther);
         //今晚驻地
-        // $("#js_input_jrszd").val(getLocal(suspected.todayLocal));
-        // $("#js_input_jrszd").attr("data-values", suspected.todayLocal);
-        // if (suspected.todayLocal != 4) {
-        //   $('#js_input_jrszq').attr("disabled", "disabled");
-        //   $("#js_input_jrszq").val("");
-        // }
-        // else {
-        //   $('#js_input_jrszq').removeAttr("disabled")
-        // }
-        //$("#js_input_jrszq").val(suspected.todayLocalOther);
+        $("#js_input_jrszd").val(getLocal(suspected.todayLocal));
+        $("#js_input_jrszd").attr("data-values", suspected.todayLocal);
+        if (suspected.todayLocal != 4) {
+          $('#js_input_jrszq').attr("disabled", "disabled");
+          $("#js_input_jrszq").val("");
+        }
+        else {
+          $('#js_input_jrszq').removeAttr("disabled")
+        }
+        $("#js_input_jrszq").val(suspected.todayLocalOther);
         //是否出行
         $("#js_input_sf").val(getIsTrip(suspected.isTrip));
         $("#js_input_sf").attr("data-values", suspected.isTrip);