Merge remote-tracking branch 'origin/master'

whepi-ui/templates/home/frag.head.ftl

@@ -152,6 +152,13 @@
             border-top: 3px solid #75859f;
             margin-top:2.4em
         }
+        .weui-radio{
+            padding:10px 15px;
+            position:relative;
+            -webkit-box-align:center;
+            -webkit-align-items:center;
+            align-items:center
+        }
     </style>
 </head>
 <span hidden="hidden" id="id"></span>

whepi-ui/templates/home/ribao.ftl

@@ -139,24 +139,26 @@
                     <#--<input id="switchQuezhen" class="weui-input" autofocus="" type="text" placeholder="请选择"-->
                     <#--maxlength="20"-->
                     <#--style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>-->
-                        <div class="weui-cells weui-cells_checkbox" style="width: 125%">
-                            <label class="weui-cell weui-cell_active weui-check__label" for="s18">
-                                <input type="radio" name="radio" value="0" class="weui-check" id="s18">
+                        <div class="weui-cells_checkbox" style="width: 125%">
+                            <label class="weui-radio weui-cell_active weui-check__label" for="s18" >
+                                <input type="radio" name="radio" value="0" class="weui-check" id="s18" style="width: 10%"/>
                                 <i class="weui-icon-checked"></i>无
                             </label>
-                            <label class="weui-cell weui-cell_active weui-check__label" for="s19">
-                                <input type="radio" name="radio" value="1" class="weui-check" id="s19">
+                            <label class="weui-radio weui-cell_active weui-check__label" for="s19" >
+                                <input type="radio" name="radio" value="1" class="weui-check" id="s19" style="width: 10%"/>
                                 <i class="weui-icon-checked"></i>确诊
                             </label>
-                            <label class="weui-cell weui-cell_active weui-check__label" for="s20">
-                                <input type="radio" name="radio" value="2" class="weui-check" id="s20">
+                            <label class="weui-radio weui-cell_active weui-check__label" for="s20">
+                                <input type="radio" name="radio" value="2" class="weui-check" id="s20" style="width: 10%">
                                 <i class="weui-icon-checked"></i>疑似
                             </label>
-                            <label class="weui-cell weui-cell_active weui-check__label" for="s21">
+                            <br style="height: 100px"/>
+                            <#--<div style="height: 10px"></div>-->
+                            <label class="weui-radio weui-cell_active weui-check__label" for="s21" style="width: 25%">
                                 <input type="radio" name="radio" value="3" class="weui-check" id="s21">
                                 <i class="weui-icon-checked"></i>有接触史
                             </label>
-                            <label class="weui-cell weui-cell_active weui-check__label" for="s22">
+                            <label class="weui-radio weui-cell_active weui-check__label" for="s22" style="width: 25%">
                                 <input type="radio" name="radio" value="4" class="weui-check" id="s22">
                                 <i class="weui-icon-checked"></i>解除隔离
                             </label>

whepi-ui/templates/home/ribao.js

@@ -448,19 +448,19 @@ function insertlingyun() {
   var jrszd = $("#js_input_jrszd").attr("data-values") == undefined ? 0 : $("#js_input_jrszd").attr("data-values");
   var cfd = $("#js_input_cfd").attr("data-values") == undefined ? 0 : $("#js_input_cfd").attr("data-values");
   var mdd = $("#js_input_mdd").attr("data-values") == undefined ? 0 : $("#js_input_mdd").attr("data-values");
-  // var jrszq = $('#js_input_jrszq').val();
-  // var cfdq = $('#js_input_cfdq').val();
-  // if (cfd != jrszd) {
-  //   $.alert("出发地与今晚住地不是同一地点");
-  //   return;
-  // }
-  // if (jrszq != cfdq) {
-  //   $.alert("出发地与今晚住地不是同一地点");
-  //   return;
-  // }
+  var jrszq = $('#js_input_jrszq').val();
+    var mddq = $('#js_input_mddq').val();
+  if (mdd != jrszd) {
+    $.alert("目的地与今晚住地不一致");
+    return;
+  }
+  if (jrszq != mddq) {
+    $.alert("目的地与今晚住地不一致");
+    return;
+  }
     var cxfsq = $('#js_input_cxfsq').val();
     var cfdq = $('#js_input_cfdq').val();
-    var mddq = $('#js_input_mddq').val();
+
     for (var i = 0; i < listcx.length; i++){
       if(listcx[i].tripTypeDesp == cxfsq && listcx[i].tripType == cxfs && listcx[i].startLocal == cfd && listcx[i].startLocalOther == cfdq && listcx[i].endLocal == mdd && listcx[i].endLocalOther == mddq){
 
@@ -1042,6 +1042,7 @@ function ribaoCommit() {
 
 
   var medical = $("input[name='radio']:checked").val();
+  console.log(medical)
   if(medical ==undefined){
       $.alert("请选择新冠肺炎");
       return;