style

whepi-ui/templates/home/home.ftl

@@ -1,4 +1,4 @@
-<#assign title="我的家"/>
+<#assign title="我的信息"/>
 <#include "/home/frag.head.ftl" />
 
 <div class="weui-tab">
@@ -406,6 +406,7 @@
     }
 
     $(function () {
+        var noIos = isAndroidFun()
         //微信内置浏览器浏览H5页面弹出的键盘遮盖文本框的解决办法
         window.addEventListener("resize", function () {
             if (document.activeElement.tagName == "INPUT" || document.activeElement.tagName == "TEXTAREA") {
@@ -414,15 +415,28 @@
                 }, 0);
             }
         });
-        var clientHeight = $(window).height();
-        $(window).on('resize',function () {
-            var height = $(this).height();
-            if (height < clientHeight) {
-                $('#resetRibaoDigiBtn').removeClass('resetRibaoDigiBtn');
-            } else {
-                $('#resetRibaoDigiBtn').addClass('resetRibaoDigiBtn');
+        if(noIos){
+            var clientHeight = $(window).height();
+            $(window).on('resize',function () {
+                var height = $(this).height();
+                if (height < clientHeight) {
+                    $('#resetRibaoDigiBtn').removeClass('resetRibaoDigiBtn');
+                } else {
+                    $('#resetRibaoDigiBtn').addClass('resetRibaoDigiBtn');
+                }
+            })
+        }
+        function isAndroidFun() {
+            var u = navigator.userAgent;
+            var isAndroid = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1;
+            var isIOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
+            if (isAndroid) {
+                return true;
             }
-        })
+            if (isIOS) {
+                return false;
+            }
+        }
     })
 
 </script>

whepi-ui/templates/home/ribao.ftl

@@ -84,7 +84,7 @@
                                        style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 30px; width: 25%; text-align: center;"/>
                             </div>
                             <div id="ribao_jbqk">
-                                <div style="height: 30px; line-height: 30px;margin-left: 2vw; display: none;">基本情况</div>
+                                <div style="height: 30px; line-height: 30px;margin-left: 2vw; display: none;">健康情况</div>
                                 <div class="weui-cells weui-cells_checkbox" style="display: none;">
                                     <label class="weui-cell weui-cell_active weui-check__label" for="s11">
                                         <div class="weui-cell__hd">
@@ -151,7 +151,7 @@
                                     </label>
                                 </div>
                                 <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 10px;">
-                                    <div style="color: black;height: 30px;line-height: 30px; width: 35%;">基本情况</div>
+                                    <div style="color: black;height: 30px;line-height: 30px; width: 35%;">健康情况</div>
                                     <input id="js_input_user_status"
                                            class="weui-input" autofocus=""
                                            type="text"

whepi-ui/templates/home/ribao.js

@@ -183,37 +183,37 @@ function ribao_init() {
   });
 
   var userStatus = [
-      // {
-      //     title: "无病史",
-      //     value: "0",
-      // },
       {
-          title: "心脑血管疾病(服用ARB)",
+          title: "无病史",
           value: 0,
       },
       {
-          title: "心脑血管疾病(未服ARB)",
+          title: "心脑血管疾病(服用ARB)",
           value: 1,
       },
       {
-          title: "呼吸系统病史",
+          title: "心脑血管疾病(未服ARB)",
           value: 2,
       },
       {
-          title: "肿瘤病史",
+          title: "呼吸系统病史",
           value: 3,
       },
       {
-          title: "糖尿病史",
+          title: "肿瘤病史",
           value: 4,
       },
       {
-          title: "服用过激素药物",
+          title: "糖尿病史",
           value: 5,
       },
       {
-          title: "妊娠期",
+          title: "服用过激素药物",
           value: 6,
+      },
+      {
+          title: "妊娠期",
+          value: 7,
       }
       ];
 
@@ -228,6 +228,38 @@ function ribao_init() {
       //   target.data('values',userFamilyStatus);
       //     console.log(target.data().values,userFamilyStatusStr,userFamilyStatus)
       // }
+    // onChange:function(e){
+    //   var selectStr = e.values
+    //   if(!selectStr){
+    //     $("#js_input_user_status").select('update',{
+    //       multi: true,
+    //     })
+    //   }else {
+    //     if(selectStr.indexOf('0')>-1){
+    //       $("#js_input_user_status").select('update',{
+    //         multi: false,
+    //       })
+    //     }else {
+    //       $("#js_input_user_status").select('update',{
+    //         multi: true,
+    //       })
+    //     }
+    //   }
+    //     // var target = $("#js_input_user_status");
+    //     // console.log(target.data().values,userFamilyStatusStr,userFamilyStatus)
+    //   console.log(e)
+    // },
+    beforeClose:function (e) {
+      if(e){
+        if(e.indexOf('0')>-1 && e.length>1){
+          $.toast("无病史不能与其他项同时被选中", "text");
+          return false
+        }else {
+          return true
+        }
+      }
+    }
+
   });
 
   $("#js_input_user_crov19").select({
@@ -1128,6 +1160,8 @@ function ribao_add() {
     //   },
     // });
 
+    getLocation()
+
   });
 }
 
@@ -1204,13 +1238,13 @@ function ribaoCommit() {
   var age = $("#js_input_user_age").val();
   var userStatus = filterUserStatus($("#js_input_user_status").data().values)
   //不能同时选择服用和未服用
-  if (userStatus.indexOf('0')>-1 && userStatus.indexOf('1')>-1) {
+  if (userStatus.indexOf('1')>-1 && userStatus.indexOf('2')>-1) {
     cantijiao = true;
     $.alert("心脑血管不能同时选择服用和未服用");
     return;
   }
   //男性不能选择妊娠期
-  if ($("#js_input_user_sex").attr("data-values") == 1 && userStatus.indexOf('6')>-1) {
+  if ($("#js_input_user_sex").attr("data-values") == 1 && userStatus.indexOf('7')>-1) {
     cantijiao = true;
     $.alert("男性不能选择妊娠期");
     return;
@@ -1220,14 +1254,10 @@ function ribaoCommit() {
   if(!userStatus.length){
       familyStatus += '0,0,0,0,0,0,0'
   }else {
-      if (userStatus.indexOf('0')>-1)
+      if (userStatus.indexOf('1')>-1)
           familyStatus += "1";
       else
           familyStatus += "0";
-      if (userStatus.indexOf('1')>-1)
-          familyStatus += ",1";
-      else
-          familyStatus += ",0";
       if (userStatus.indexOf('2')>-1)
           familyStatus += ",1";
       else
@@ -1248,6 +1278,10 @@ function ribaoCommit() {
           familyStatus += ",1";
       else
           familyStatus += ",0";
+      if (userStatus.indexOf('7')>-1)
+          familyStatus += ",1";
+      else
+          familyStatus += ",0";
   }
 
   var medical = $("#js_input_user_crov19").data().values;

whepi-ui/templates/lingyun/home.ftl

@@ -1,4 +1,4 @@
-<#assign title="我的家"/>
+<#assign title="我的信息"/>
 <#include "/home/frag.head.ftl" />
 
 <div class="weui-tab">