style

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

@@ -22,9 +22,54 @@
         }
 
 
+        .cx-reset-role {
+            height: 100%;
+        }
+        .cx-reset-role .user-header {
+            box-sizing: border-box;
+            height: 50%;
+            padding: 0;
+            position: relative;
+            padding-top: 20%;
+        }
+        .cx-reset-role .weui-form {
+            width: 150px;
+            margin: auto;
+        }
+        .cx-reset-role .weui-cells::after {
+            display: none;
+        }
+        .cx-reset-role .weui-cells::before {
+            display: none;
+        }
+        .cx-reset-role .weui-cells .weui-cell::before {
+            display: none;
+        }
+        .cx-reset-home .page__bd {
+            height: 100%;
+        }
+        .cx-reset-home .weui-cells::before,.cx-reset-home .weui-cells::after {
+            display: none;
+        }
+        .cx-reset-ribao .resetpanel {
+            position: absolute;
+            top: 0;
+            left: 0;
+            right: 0;
+            bottom: 0;
+        }
+        .cx-reset-ribao .resetpanel .weui-cell {
+            text-align: center;
+        }
+        .cx-reset-ribao .resetpanel .resetinfo{
+            margin: 0;
+            padding: 0 10px;
+        }
 
         .user-header {
+
             padding: 15px 0 5px 0;
+
             /*background-color: #16ae9d;*/
         }
         .user-title {

whepi-ui/templates/home/home.ftl

@@ -4,7 +4,7 @@
 <div class="weui-tab">
     <input id="userId" type="text" hidden="hidden" value=${user_id!}/>
     <input id="uptownId" type="text" hidden="hidden" value=${uptown_id!}/>
-    <div class="weui-tab__bd">
+    <div class="weui-tab__bd cx-reset-home">
         <div id="tab1" class="weui-tab__bd-item weui-tab__bd-item--active">
             <#include "/home/ribao.ftl" /></div>
         <#if uptownId != 1238790987234 && uptownId != 5 && uptownId != 100000002>
@@ -16,7 +16,7 @@
     <#--<div id="tab4" class="weui-tab__bd-item">-->
     <#--<h1>页面四</h1> </div>-->
     </div>
-    <div class="weui-tabbar">
+    <div class="weui-tabbar" style="display: none">
         <a id="jt1" href="#tab1" class="weui-tabbar__item weui-bar__item--on">
             <div class="weui-tabbar__icon"><img src="/static/images/wx/order.png" alt=""></div>
             <p class="weui-tabbar__label">健康日报</p>
@@ -87,8 +87,8 @@
             }
 
         }
-        $("#commit").attr("disabled",true).css("pointer-events","none");
-        $("#commit").css("background-color","#EBEBE4").css("color","#757575");
+        // $("#commit").attr("disabled",true).css("pointer-events","none");
+        // $("#commit").css("background-color","#EBEBE4").css("color","#757575");
         ribao_init();
         family_init();
         ribao_add();

whepi-ui/templates/home/ribao.ftl

@@ -1,4 +1,4 @@
-<div class="page__bd">
+<div class="page__bd cx-reset-ribao">
     <div class="weui-tab">
         <div class="weui-navbar">
             <a class="weui-navbar__item weui-bar__item_on" target="#rb_nav1" module="ri_bao" onclick="ribao_refrash()">
@@ -19,385 +19,403 @@
             </#if>
         </div>
         <div class="weui-tab__panel">
-            <div id="rb_nav1" class="weui-tab__bd-item ri_bao_weui_tab_bd_item_active">
-                <div class="weui-panel weui-panel_access">
-                    <div id="notOpenRibao">
-                        <div class="weui-cells weui-cells_form">
-                            <div class="weui-cell weui-cell_vcode" style="height: 7vh">
-                                <div class="weui-cell__hd">
-                                    <label class="weui-label">今日居家</label>
-                                </div>
-                                <div class="weui-cell__bd" id="ribao_jinrijujian">
+            <div id="rb_nav1" class="weui-tab__bd-item ri_bao_weui_tab_bd_item_active" style="position: relative">
+                <div class="weui-panel weui-panel_access resetpanel">
+                    <div style="height: 100%;overflow-y: auto;">
+                        <div id="notOpenRibao" style="height: 100%;position: relative;">
+                            <div class="weui-cells weui-cells_form" style="margin-top: 0">
+                                <div class="weui-cell" style="padding: 20px 20px 10px 20px">
+                                    <div class="weui-cell__hd" style="display: none">
+                                        <label class="weui-label">今日居家</label>
+                                    </div>
+                                    <div class="weui-cell__bd" id="ribao_jinrijujian" style="display: none">
 
-                                </div>
-                                <div class="weui-cell__ft">
-                                    <button id="btnAdd" href="javascript:" style="height:5vh; margin-right: 3vh;"
+                                    </div>
+                                    <div class="">
+
+                                    </div>
+                                    <button id="btnAdd" href="javascript:"
                                             class="weui-btn weui-btn_mini weui-btn_primary">添加人员
                                     </button>
                                 </div>
                             </div>
-                        </div>
-                        <div id="rb_family">
-                        <#--<div class="weui-media-box weui-media-box_text">-->
-                        <#--<h4 class="weui-media-box__title">家人1：咳嗽、乏力、未确诊 <a href="javascript:" >删除</a></h4>-->
-                        <#--<p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>-->
-                        <#--</div>-->
-                        </div>
-                        <div class="weui-cells__tips"> <span style="color: red; display: none">
+                            <div id="rb_family">
+                            <#--<div class="weui-media-box weui-media-box_text">-->
+                            <#--<h4 class="weui-media-box__title">家人1：咳嗽、乏力、未确诊 <a href="javascript:" >删除</a></h4>-->
+                            <#--<p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>-->
+                            <#--</div>-->
+                            </div>
+                            <div class="weui-cells__tips"> <span style="color: red; display: none">
                         <br/>
                         注：请如实上报情况，便以相互帮助，小区是我家，团结就是力量！后期会有医生跟踪分析，给予大家医疗建议，请认真填报！
                     </span></div>
-                        <div class="weui-btn-area" style="text-align: center">
+                            <div class="weui-btn-area" style="position: absolute;bottom: 0;left: 0;width: 100%;margin: 0;padding-bottom:10px;text-align: center">
                         <span style="color: red;font-size:x-large" id="txt_shangbao">
                             今日未上报
                        </span><br/> <span style="color: red;font-size:x-large" id="txt_shangbaotime">
                        </span>
-                            <a id="btn_shangbao" class="weui-btn weui-btn_primary" href="javascript:" id="showTooltips"
-                               style="background-color: #D9D9D9"
-                               onclick="addReport()">上报</a>
-                        </div>
-                    </div>
-                    <div id="ribao" class="weui-btn-area" style="display: none">
-                        <div style="text-align: center;">基本信息</div>
-                        <div style="display:flex; flex-direction: row; justify-content: space-between;">
-                            <input id="js_input_user_name" 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; width: 30%; text-align: center;"/>
-                            <input id="js_input_user_sex" 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; width: 25%; text-align: center;"/>
-                            <input id="js_input_user_age" class="weui-input" autofocus="" type="text" placeholder="年龄"
-                                   maxlength="3"
-                                   style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 25%; text-align: center;"/>
-                        </div>
-                        <div id="ribao_jbqk">
-                            <div style="height: 5vh; line-height: 5vh;margin-left: 2vw;">基本情况</div>
-                            <div class="weui-cells weui-cells_checkbox">
-                                <label class="weui-cell weui-cell_active weui-check__label" for="s11">
-                                    <div class="weui-cell__hd">
-                                        <input type="checkbox" class="weui-check" name="checkbox1" id="s11">
-                                        <i class="weui-icon-checked"></i>
-                                    </div>
-                                    <div class="weui-cell__bd">
-                                        <p>心脑血管疾病（服用ARB）</p>
-                                    </div>
-                                </label>
-                                <label class="weui-cell weui-cell_active weui-check__label" for="s12">
-                                    <div class="weui-cell__hd">
-                                        <input type="checkbox" name="checkbox2" class="weui-check" id="s12">
-                                        <i class="weui-icon-checked"></i>
-                                    </div>
-                                    <div class="weui-cell__bd">
-                                        <p>心脑血管疾病（未服ARB）</p>
-                                    </div>
-                                </label>
-                                <label class="weui-cell weui-cell_active weui-check__label" for="s13">
-                                    <div class="weui-cell__hd">
-                                        <input type="checkbox" name="checkbox3" class="weui-check" id="s13">
-                                        <i class="weui-icon-checked"></i>
-                                    </div>
-                                    <div class="weui-cell__bd">
-                                        <p>呼吸系统病史</p>
-                                    </div>
-                                </label>
-                                <label class="weui-cell weui-cell_active weui-check__label" for="s14">
-                                    <div class="weui-cell__hd">
-                                        <input type="checkbox" name="checkbox4" class="weui-check" id="s14">
-                                        <i class="weui-icon-checked"></i>
-                                    </div>
-                                    <div class="weui-cell__bd">
-                                        <p>肿瘤病史</p>
-                                    </div>
-                                </label>
-                                <label class="weui-cell weui-cell_active weui-check__label" for="s15">
-                                    <div class="weui-cell__hd">
-                                        <input type="checkbox" name="checkbox5" class="weui-check" id="s15">
-                                        <i class="weui-icon-checked"></i>
-                                    </div>
-                                    <div class="weui-cell__bd">
-                                        <p>糖尿病史</p>
-                                    </div>
-                                </label>
-                                <label class="weui-cell weui-cell_active weui-check__label" for="s16">
-                                    <div class="weui-cell__hd">
-                                        <input type="checkbox" name="checkbox6" class="weui-check" id="s16">
-                                        <i class="weui-icon-checked"></i>
-                                    </div>
-                                    <div class="weui-cell__bd">
-                                        <p>服用过激素药物</p>
-                                    </div>
-                                </label>
-                                <label class="weui-cell weui-cell_active weui-check__label" for="s17">
-                                    <div class="weui-cell__hd">
-                                        <input type="checkbox" name="checkbox7" class="weui-check" id="s17">
-                                        <i class="weui-icon-checked"></i>
-                                    </div>
-                                    <div class="weui-cell__bd">
-                                        <p>妊娠期</p>
-                                    </div>
-                                </label>
+                                <a id="btn_shangbao" class="weui-btn weui-btn_primary" href="javascript:"
+                                   id="showTooltips"
+                                   style="background-color: #D9D9D9;width: 200px"
+                                   onclick="addReport()">上报</a>
                             </div>
                         </div>
+                        <div id="ribao" class="weui-btn-area resetinfo" style="display: none">
+                            <div style="text-align: center;padding: 10px 0;font-size: 16px;font-weight: 600;">基本信息</div>
+                            <div style="display:flex; flex-direction: row; justify-content: space-between;">
+                                <input id="js_input_user_name" 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; width: 30%; text-align: center;"/>
+                                <input id="js_input_user_sex" 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; width: 25%; text-align: center;"/>
+                                <input id="js_input_user_age" class="weui-input" autofocus="" type="text"
+                                       placeholder="年龄"
+                                       maxlength="3"
+                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh; width: 25%; text-align: center;"/>
+                            </div>
+                            <div id="ribao_jbqk">
+                                <div style="height: 5vh; line-height: 5vh;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">
+                                            <input type="checkbox" class="weui-check" name="checkbox1" id="s11">
+                                            <i class="weui-icon-checked"></i>
+                                        </div>
+                                        <div class="weui-cell__bd">
+                                            <p>心脑血管疾病（服用ARB）</p>
+                                        </div>
+                                    </label>
+                                    <label class="weui-cell weui-cell_active weui-check__label" for="s12">
+                                        <div class="weui-cell__hd">
+                                            <input type="checkbox" name="checkbox2" class="weui-check" id="s12">
+                                            <i class="weui-icon-checked"></i>
+                                        </div>
+                                        <div class="weui-cell__bd">
+                                            <p>心脑血管疾病（未服ARB）</p>
+                                        </div>
+                                    </label>
+                                    <label class="weui-cell weui-cell_active weui-check__label" for="s13">
+                                        <div class="weui-cell__hd">
+                                            <input type="checkbox" name="checkbox3" class="weui-check" id="s13">
+                                            <i class="weui-icon-checked"></i>
+                                        </div>
+                                        <div class="weui-cell__bd">
+                                            <p>呼吸系统病史</p>
+                                        </div>
+                                    </label>
+                                    <label class="weui-cell weui-cell_active weui-check__label" for="s14">
+                                        <div class="weui-cell__hd">
+                                            <input type="checkbox" name="checkbox4" class="weui-check" id="s14">
+                                            <i class="weui-icon-checked"></i>
+                                        </div>
+                                        <div class="weui-cell__bd">
+                                            <p>肿瘤病史</p>
+                                        </div>
+                                    </label>
+                                    <label class="weui-cell weui-cell_active weui-check__label" for="s15">
+                                        <div class="weui-cell__hd">
+                                            <input type="checkbox" name="checkbox5" class="weui-check" id="s15">
+                                            <i class="weui-icon-checked"></i>
+                                        </div>
+                                        <div class="weui-cell__bd">
+                                            <p>糖尿病史</p>
+                                        </div>
+                                    </label>
+                                    <label class="weui-cell weui-cell_active weui-check__label" for="s16">
+                                        <div class="weui-cell__hd">
+                                            <input type="checkbox" name="checkbox6" class="weui-check" id="s16">
+                                            <i class="weui-icon-checked"></i>
+                                        </div>
+                                        <div class="weui-cell__bd">
+                                            <p>服用过激素药物</p>
+                                        </div>
+                                    </label>
+                                    <label class="weui-cell weui-cell_active weui-check__label" for="s17">
+                                        <div class="weui-cell__hd">
+                                            <input type="checkbox" name="checkbox7" class="weui-check" id="s17">
+                                            <i class="weui-icon-checked"></i>
+                                        </div>
+                                        <div class="weui-cell__bd">
+                                            <p>妊娠期</p>
+                                        </div>
+                                    </label>
+                                </div>
+                                <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                                    <div style="color: gray;height: 5vh;line-height: 5vh; width: 35%;">基本情况</div>
+                                    <input id="js_input_user_status" class="weui-input" autofocus="" type="text"
+                                           placeholder="请选择"
+                                           style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>
+                                </div>
 
-                    <#--<textarea id="jibenmiaoshu" class="weui-textarea" placeholder="身体基本状况描述" rows="5"-->
-                    <#--style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; margin-top: 1vh;"></textarea>-->
-                        <input id="suspectedId" type="text" hidden="hidden" value=""/>
-                        <div style="height: 5vh; line-height: 5vh;margin-left: 2vw;">病情描述</div>
+                            </div>
 
-                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                            <div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">新冠肺炎</div>
-                        <#--<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_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-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>
-                                <br/>
-                                <div style="height: 20px"></div>
-                                <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>
-                            <#--<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>
-                                <br/>
-                                <div style="height: 20px"></div>
-                                <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>
+                        <#--<textarea id="jibenmiaoshu" class="weui-textarea" placeholder="身体基本状况描述" rows="5"-->
+                        <#--style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; margin-top: 1vh;"></textarea>-->
+                            <input id="suspectedId" type="text" hidden="hidden" value=""/>
+                            <div style="height: 5vh; line-height: 5vh;margin-left: 2vw;">病情描述</div>
+
+                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                                <div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">新冠肺炎</div>
+                            <#--<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_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-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>
+                                    <br/>
+                                    <div style="height: 20px"></div>
+                                    <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>
+                                <#--<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>
+                                    <br/>
+                                    <div style="height: 20px"></div>
+                                    <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>
+                                </div>
                             </div>
-                        </div>
-                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                            <div style="color: gray;height: 10vh; line-height: 5vh; width: 150%;">
-                                家庭成员中有新冠肺炎疫情或有过病例接触史人员
+                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                                <div style="color: gray;height: 10vh; line-height: 5vh; width: 150%;">
+                                    家庭成员中有新冠肺炎疫情或有过病例接触史人员
+                                </div>
+                                <div class="weui-cells_checkbox" style="width: 100%; margin-top: 2.5vh;">
+                                    <label class="weui-radio weui-cell_active weui-check__label" for="s28">
+                                        <input type="radio" name="radio1" value="0" class="weui-check" id="s28"
+                                               style="width: 10%"/>
+                                        <i class="weui-icon-checked"></i>否
+                                    </label>
+                                    <label class="weui-radio weui-cell_active weui-check__label" for="s29">
+                                        <input type="radio" name="radio1" value="1" class="weui-check" id="s29"
+                                               style="width: 10%"/>
+                                        <i class="weui-icon-checked"></i>是
+                                    </label>
+                                </div>
                             </div>
-                            <div class="weui-cells_checkbox" style="width: 100%; margin-top: 2.5vh;">
-                                <label class="weui-radio weui-cell_active weui-check__label" for="s28">
-                                    <input type="radio" name="radio1" value="0" class="weui-check" id="s28"
-                                           style="width: 10%"/>
-                                    <i class="weui-icon-checked"></i>否
-                                </label>
-                                <label class="weui-radio weui-cell_active weui-check__label" for="s29">
-                                    <input type="radio" name="radio1" value="1" class="weui-check" id="s29"
-                                           style="width: 10%"/>
-                                    <i class="weui-icon-checked"></i>是
-                                </label>
+                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                                <div style="color: gray;height: 10vh; line-height: 5vh; width: 150%;">
+                                    近期接触的家庭成员中有感冒、发热、咳嗽等症状
+                                </div>
+                                <div class="weui-cells_checkbox" style="width: 100%; margin-top: 2.5vh;">
+                                    <label class="weui-radio weui-cell_active weui-check__label" for="s38">
+                                        <input type="radio" name="radio2" value="0" class="weui-check" id="s38"
+                                               style="width: 10%"/>
+                                        <i class="weui-icon-checked"></i>否
+                                    </label>
+                                    <label class="weui-radio weui-cell_active weui-check__label" for="s39">
+                                        <input type="radio" name="radio2" value="1" class="weui-check" id="s39"
+                                               style="width: 10%"/>
+                                        <i class="weui-icon-checked"></i>是
+                                    </label>
+                                </div>
                             </div>
-                        </div>
-                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                            <div style="color: gray;height: 10vh; line-height: 5vh; width: 150%;">
-                                近期接触的家庭成员中有感冒、发热、咳嗽等症状
+                        <#--<div id="ribao_djgl">-->
+                        <#--<div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">-->
+                        <#--<div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">单间隔离</div>-->
+                        <#--<input id="switchDanjiangeli" 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>-->
+                        <#--</div>-->
+
+                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                                <div style="color: gray;height: 5vh; line-height: 5vh; width: 35%;">体温</div>
+                                <input id="js_input_user_tiwen" class="weui-input" autofocus="" type="number"
+                                       placeholder="请输入"
+                                       maxlength="4"
+                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>
                             </div>
-                            <div class="weui-cells_checkbox" style="width: 100%; margin-top: 2.5vh;">
-                                <label class="weui-radio weui-cell_active weui-check__label" for="s38">
-                                    <input type="radio" name="radio2" value="0" class="weui-check" id="s38"
-                                           style="width: 10%"/>
-                                    <i class="weui-icon-checked"></i>否
-                                </label>
-                                <label class="weui-radio weui-cell_active weui-check__label" for="s39">
-                                    <input type="radio" name="radio2" value="1" class="weui-check" id="s39"
-                                           style="width: 10%"/>
-                                    <i class="weui-icon-checked"></i>是
-                                </label>
+                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                                <div style="color: gray;height: 5vh; line-height: 5vh; width: 35%;">咳嗽现象</div>
+                                <input id="js_input_user_kesou" 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>
-                        </div>
-                    <#--<div id="ribao_djgl">-->
-                    <#--<div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">-->
-                    <#--<div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">单间隔离</div>-->
-                    <#--<input id="switchDanjiangeli" 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>-->
-                    <#--</div>-->
-
-                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                            <div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">体温</div>
-                            <input id="js_input_user_tiwen" class="weui-input" autofocus="" type="number"
-                                   placeholder="请输入"
-                                   maxlength="4"
-                                   style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>
-                        </div>
-                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                            <div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">咳嗽现象</div>
-                            <input id="js_input_user_kesou" 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>
-                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                            <div style="color: gray;height: 5vh;line-height: 5vh; width: 55%;">肌肉酸痛</div>
-                            <input id="js_input_user_jirou" 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>
-                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                            <div style="color: gray;height: 5vh;line-height: 5vh; width: 55%;">呼吸困难</div>
-                            <input id="js_input_user_huxi" 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>
-                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                            <div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">乏力现象</div>
-                            <input id="js_input_user_fali" 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>
-                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                            <div style="color: gray;height: 5vh; line-height: 5vh; width: 55%;">腹泻现象</div>
-                            <input id="js_input_user_fuxie" 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>
-                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                            <div style="color: gray;height: 5vh; line-height: 5vh;width: 55%;">其他描述</div>
-                            <textarea id="shuruqita" class="weui-textarea" placeholder="输入内容（300字内）" rows="5"
-                                      style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; margin-top: 1vh;"></textarea>
-                        </div>
-                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                            <div style="color: gray;height: 5vh; line-height: 5vh;width: 55%;">
-                                <button id="ribao_score" style="height:5vh;"
-                                        class="weui-btn weui-btn_mini weui-btn_primary">健康评估
-                                </button>
+                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                                <div style="color: gray;height: 5vh;line-height: 5vh; width: 35%;">肌肉酸痛</div>
+                                <input id="js_input_user_jirou" 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>
-                            <input id="js_input_score_rezult" class="weui-input" autofocus="" readonly="readonly"
-                                   style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>
-                            <input id="js_input_score_rezult_value" type="text" hidden="hidden"/>
-                            <input id="js_input_temperature_score" type="text" hidden="hidden"/>
-                            <input id="js_input_score_histroy" type="text" hidden="hidden"/>
-                            <input id="js_input_score" type="text" hidden="hidden"/>
-                        </div>
-                    <#--<div style="display: flex; justify-content: center;">-->
-                    <#--<div style="width: 70%;color: red; text-align: center;">-->
-                    <#--<br/>-->
-                    <#--自愿填写病情描述（温度为必填项），提交后会根据每天病情描述变化趋势给出更加科学的健康评估建议-->
-                    <#--</div>-->
-                    <#--</div>-->
-                        <div id="ribao_trip" class="weui-btn-area"><#--style="display: none"-->
-                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 6vh;">
-                                <div style="height: 5vh; line-height: 5vh; width: 55%;">工作驻地</div>
-                                <input id="js_input_gzzd" 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="selectinput1(this)"/>
-                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                <input id="js_input_qtdd" placeholder="仅填市级如，上海市" disabled="disabled" type="text"
-                                       style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;"/>
+                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                                <div style="color: gray;height: 5vh;line-height: 5vh; width: 35%;">呼吸困难</div>
+                                <input id="js_input_user_huxi" 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>
                             <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="请选择"
-                                       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;
-                                <input id="js_input_jrszq" placeholder="仅填市级如，上海市" disabled="disabled" type="text"
-                                       style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;"/>
+                                <div style="color: gray;height: 5vh; line-height: 5vh; width: 35%;">乏力现象</div>
+                                <input id="js_input_user_fali" 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>
                             <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_sf" 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: 90%"
-                                       onchange="selectinput6(this)"/>
+                                <div style="color: gray;height: 5vh; line-height: 5vh; width: 35%;">腹泻现象</div>
+                                <input id="js_input_user_fuxie" 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>
                             <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                                <div style="height: 5vh; line-height: 5vh; color: red">
-                                    注：本地区出行无需填写行程，到达今晚住地后请重新填写行程，保证行程正确
-                                </div>
+                                <div style="color: gray;height: 5vh; line-height: 5vh;width: 35%;">其他描述</div>
+                                <textarea id="shuruqita" class="weui-textarea" placeholder="输入内容（300字内）" rows="5"
+                                          style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; margin-top: 1vh;"></textarea>
                             </div>
-                            <br/>
-                        <#--<div style="text-align: center;height: 1vh;">出行情况上报</div>-->
-
-                            <div id="none">
-                                <div class="weui-loadmore weui-loadmore_line" style="width: 100%;height: 1vh;">
-                                    <span class="weui-loadmore__tips">出行情况上报</span>
+                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                                <div style="color: gray;height: 5vh; line-height: 5vh;width: 35%;">
+                                    <button id="ribao_score" style="height:5vh;"
+                                            class="weui-btn weui-btn_mini weui-btn_primary">健康评估
+                                    </button>
                                 </div>
+                                <input id="js_input_score_rezult" class="weui-input" autofocus="" readonly="readonly"
+                                       style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>
+                                <input id="js_input_score_rezult_value" type="text" hidden="hidden"/>
+                                <input id="js_input_temperature_score" type="text" hidden="hidden"/>
+                                <input id="js_input_score_histroy" type="text" hidden="hidden"/>
+                                <input id="js_input_score" type="text" hidden="hidden"/>
+                            </div>
+                        <#--<div style="display: flex; justify-content: center;">-->
+                        <#--<div style="width: 70%;color: red; text-align: center;">-->
+                        <#--<br/>-->
+                        <#--自愿填写病情描述（温度为必填项），提交后会根据每天病情描述变化趋势给出更加科学的健康评估建议-->
+                        <#--</div>-->
+                        <#--</div>-->
+                            <div id="ribao_trip" class="weui-btn-area" style="margin: 0"><#--style="display: none"-->
                                 <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 6vh;">
-                                    <div style="height: 5vh; line-height: 5vh; width: 55%;">出发地</div>
-                                    <input id="js_input_cfd" class="weui-input" type="text" placeholder="请选择"
+                                    <div style="height: 5vh; line-height: 5vh; width: 35%;">工作驻地</div>
+                                    <input id="js_input_gzzd" 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="selectinput3(this)"/>
+                                           onchange="selectinput1(this)"/>
                                     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                    <input id="js_input_cfdq" placeholder="仅填市级如，上海市" disabled="disabled" type="text"
+                                    <input id="js_input_qtdd" placeholder="仅填市级如，上海市" disabled="disabled" type="text"
                                            style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;"/>
                                 </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_mdd" class="weui-input" type="text" placeholder="请选择"
+                                    <div style="height: 5vh; line-height: 5vh; width: 35%;">今晚住地</div>
+                                    <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="selectinput4(this)"/>
+                                           onchange="selectinput2(this)"/>
                                     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                    <input id="js_input_mddq" placeholder="仅填市级如，上海市" disabled="disabled" type="text"
+                                    <input id="js_input_jrszq" placeholder="仅填市级如，上海市" disabled="disabled" type="text"
                                            style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;"/>
                                 </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_cxfs" 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="selectinput5(this)"/>
-                                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                    <input id="js_input_cxfsq" placeholder="车次/航班/车牌" type="text"
-                                           style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;"/>
-
-                                </div>
-                                <div class="weui-cell__ft" style="margin-top: 1vh;">
-                                    <button href="javascript:" style="height:5vh; margin-right: 0vh;width: 70px;"
-                                            class="weui-btn weui-btn_mini weui-btn_primary" onclick="insertlingyun()">添加
-                                    </button>
+                                    <div style="height: 5vh; line-height: 5vh; width: 35%;">是否跨市出行</div>
+                                    <input id="js_input_sf" 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: 90%"
+                                           onchange="selectinput6(this)"/>
                                 </div>
-                                <div class="weui-loadmore tt" style="width: 100%;height: 1vh;margin-top: 1vh;">
+                                <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                                    <div style="height: 5vh; line-height: 5vh; color: red">
+                                        注：本地区出行无需填写行程，到达今晚住地后请重新填写行程，保证行程正确
+                                    </div>
                                 </div>
-                                <div>
-                                    <table cellspacing="0" cellpadding="0" style="width: 100%">
-                                        <tbody id="tabtr"><#--border="1" cellspacing="0" cellpadding="0"-->
-                                        <tr style="background-color: #f8f8f8;">
-                                        <#-- <td style="text-align: center;">序号</td>
+                                <br/>
+                            <#--<div style="text-align: center;height: 1vh;">出行情况上报</div>-->
+
+                                <div id="none">
+                                    <div class="weui-loadmore weui-loadmore_line" style="width: 100%;height: 1vh;">
+                                        <span class="weui-loadmore__tips">出行情况上报</span>
+                                    </div>
+                                    <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 6vh;">
+                                        <div style="height: 5vh; line-height: 5vh; width: 35%;">出发地</div>
+                                        <input id="js_input_cfd" 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="selectinput3(this)"/>
+                                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                        <input id="js_input_cfdq" placeholder="仅填市级如，上海市" disabled="disabled"
+                                               type="text"
+                                               style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;"/>
+                                    </div>
+                                    <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                                        <div style="height: 5vh; line-height: 5vh; width: 35%;">目的地</div>
+                                        <input id="js_input_mdd" 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="selectinput4(this)"/>
+                                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                        <input id="js_input_mddq" placeholder="仅填市级如，上海市" disabled="disabled"
+                                               type="text"
+                                               style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;"/>
+                                    </div>
+                                    <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
+                                        <div style="height: 5vh; line-height: 5vh; width: 35%;">出行方式</div>
+                                        <input id="js_input_cxfs" 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="selectinput5(this)"/>
+                                        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                                        <input id="js_input_cxfsq" placeholder="车次/航班/车牌" type="text"
+                                               style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;"/>
+
+                                    </div>
+                                    <div class="weui-cell__ft" style="margin-top: 1vh;">
+                                        <button href="javascript:" style="height:5vh; margin-right: 0vh;width: 70px;"
+                                                class="weui-btn weui-btn_mini weui-btn_primary"
+                                                onclick="insertlingyun()">添加
+                                        </button>
+                                    </div>
+                                    <div class="weui-loadmore tt" style="width: 100%;height: 1vh;margin-top: 1vh;">
+                                    </div>
+                                    <div>
+                                        <table cellspacing="0" cellpadding="0" style="width: 100%">
+                                            <tbody id="tabtr"><#--border="1" cellspacing="0" cellpadding="0"-->
+                                            <tr style="background-color: #f8f8f8;">
+                                            <#-- <td style="text-align: center;">序号</td>
                                 <td style="text-align: center;">出发地</td>
                                 <td style="text-align: center;">目的地</td>
                                 <td style="text-align: center;">出行方式</td>
                                 <td style="text-align: center;">车次/航班/车牌</td>-->
-                                        </tr>
-                                        </tbody>
-                                    </table>
-                                    <table id="tab5" class="new_tab" align="left" cellpadding="0" cellspacing="0"
-                                           style="width: 100%;">
-                                    </table>
+                                            </tr>
+                                            </tbody>
+                                        </table>
+                                        <table id="tab5" class="new_tab" align="left" cellpadding="0" cellspacing="0"
+                                               style="width: 100%;">
+                                        </table>
+                                    </div>
                                 </div>
-                            </div>
 
-                        </div>
-                        <div style="display: flex; justify-content: center;">
-                            <div style="color: red">
-                                <br/>
-                                本人郑重声明，上述信息是我本人或代他人填写，本人对信息内容真实性和完整性负责，因信息填报不实导致相关后果的，本人愿承担相应责任。
                             </div>
-                        </div>
-                        <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh; margin-bottom: 5vh;">
-                            <a id="cancel" href="javascript:;" class="weui-btn weui-btn_default"
-                               style="width: 30%;">取消</a>
-                            <a id="commit" href="javascript:;" onclick="ribaoCommit();"
-                               class="weui-btn weui-btn_primary"
-                               style="margin-top: 0;width: 30%;">提交</a>
-                        </div>
-                        <div id="dingwei" style="display: flex; justify-content: center;">
-                            <div style="color: blue">
-                                正在获取定位信息，请保证开启手机定位和微信定位
+                            <div style="display: flex; justify-content: center;">
+                                <div style="color: red">
+                                    <br/>
+                                    本人郑重声明，上述信息是我本人或代他人填写，本人对信息内容真实性和完整性负责，因信息填报不实导致相关后果的，本人愿承担相应责任。
+                                </div>
+                            </div>
+                            <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh; margin-bottom: 5vh;">
+                                <a id="cancel" href="javascript:;" class="weui-btn weui-btn_default"
+                                   style="width: 30%;">取消</a>
+                                <a id="commit" href="javascript:;" onclick="ribaoCommit();"
+                                   class="weui-btn weui-btn_primary"
+                                   style="margin-top: 0;width: 30%;">提交</a>
+                            </div>
+                            <div id="dingwei" style="display: flex; justify-content: center;">
+                                <div style="color: blue">
+                                    正在获取定位信息，请保证开启手机定位和微信定位
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -429,7 +447,7 @@
                     <div class="weui-panel__hd" style=" font-size: large">所在部门：<span
                             id="unitMsg">${ridgepole!''}${unit!''}</span></div>
                     <div class="weui-panel__hd" style=" font-size: large">二级部门：<span
-                                id="departmentMsg">${departmentName!''}</span></div>
+                            id="departmentMsg">${departmentName!''}</span></div>
                     <div class="weui-panel__hd" style=" font-size: large">员工编号：<span
                             id="doorplateMsg">${doorplate!''}</span></div>
                     <input id="unitId" type="text" hidden="hidden" value="${unitId!''}"/>
@@ -451,12 +469,13 @@
                         </div>
                         <div class="weui-cell__bd">
                             <select class="weui-select" id="newDepartmentId">
-<#--                                <option>请选择</option>-->
+                            <#--                                <option>请选择</option>-->
                             </select>
                         </div>
                     </div>
                     <div class="weui-form__opr-area">
-                        <a class="weui-btn weui-btn_primary" href="javascript:;" onclick="changeDepartmentId();">确定部门更改</a>
+                        <a class="weui-btn weui-btn_primary" href="javascript:;"
+                           onclick="changeDepartmentId();">确定部门更改</a>
                     </div>
                     <div>
                         <div class="weui-cells__title" id="menpaiTitle">更改工号</div>
@@ -475,12 +494,12 @@
             </div>
             <div id="rb_nav4" class="weui-tab__bd-item ">
                 <div class="weui-panel weui-panel_access">
-                    <#--                    <div class="weui-panel__hd" style=" font-size: large">${uptown_name!''}小区</div>-->
+                <#--                    <div class="weui-panel__hd" style=" font-size: large">${uptown_name!''}小区</div>-->
                     <div class="weui-panel__hd" style=" font-size: large">员工姓名：${linkman!''}</div>
                     <div class="weui-panel__hd" style=" font-size: large">所在部门：<span
-                                id="unitMsg">${ridgepole!''}${unit!''}</span></div>
+                            id="unitMsg">${ridgepole!''}${unit!''}</span></div>
                     <div class="weui-panel__hd" style=" font-size: large">员工编号：<span
-                                id="doorplateMsg">${doorplate!''}</span></div>
+                            id="doorplateMsg">${doorplate!''}</span></div>
                     <input id="unitId" type="text" hidden="hidden" value="${unitId!''}"/>
                     <input id="uptownId" type="text" hidden="hidden" value="${uptownId!''}"/>
                     <div class="weui-cell weui-cell_select weui-cell_select-after">

whepi-ui/templates/home/ribao.js

@@ -182,40 +182,44 @@ function ribao_init() {
       }]
   });
 
-  $("#js_input_user_status").select({
-    title: "选择基本状况",
-    items: [
+  var userStatus = [
       {
-        title: "无病史",
-        value: "0",
+          title: "无病史",
+          value: "0",
       }, {
-        title: "心脑血管疾病（服用ARB）",
-        value: "1",
+          title: "心脑血管疾病（服用ARB）",
+          value: "1",
       },
       {
-        title: "心脑血管疾病（未服ARB）",
-        value: "2",
+          title: "心脑血管疾病（未服ARB）",
+          value: "2",
       },
       {
-        title: "呼吸系统病史",
-        value: "3",
+          title: "呼吸系统病史",
+          value: "3",
       },
       {
-        title: "肿瘤病史",
-        value: "4",
+          title: "肿瘤病史",
+          value: "4",
       },
       {
-        title: "糖尿病史",
-        value: "5",
+          title: "糖尿病史",
+          value: "5",
       },
       {
-        title: "服用过激素药物",
-        value: "6",
+          title: "服用过激素药物",
+          value: "6",
       },
       {
-        title: "妊娠期",
-        value: "7",
-      }]
+          title: "妊娠期",
+          value: "7",
+      }
+      ];
+
+  $("#js_input_user_status").select({
+    title: "选择基本状况",
+      multi: true,
+    items: userStatus
   });
 
   $("#js_input_user_kesou").select({
@@ -1063,6 +1067,11 @@ function ribao_cancel() {
   });
 }
 
+function filterUserStatus(values) {
+    if(!values) return []
+    return values.split(',')
+}
+
 function ribaoCommit() {
   if (cantijiao == false) {
     return
@@ -1090,49 +1099,53 @@ function ribaoCommit() {
   var userName = $("#js_input_user_name").val();
   var grender = $("#js_input_user_sex").attr("data-values") == undefined ? 0 : $("#js_input_user_sex").attr("data-values");
   var age = $("#js_input_user_age").val();
+  var userStatus = filterUserStatus($("#js_input_user_status").data().values)
   //不能同时选择服用和未服用
-  if ($("input[name='checkbox1']:checked").val() == "on" && $("input[name='checkbox2']:checked").val() == "on") {
+  if (userStatus.include('1') && userStatus.include('2')) {
     cantijiao = true;
     $.alert("心脑血管不能同时选择服用和未服用");
     return;
   }
   //男性不能选择妊娠期
-  if ($("#js_input_user_sex").attr("data-values") == 1 && $("input[name='checkbox7']:checked").val() == "on") {
+  if ($("#js_input_user_sex").attr("data-values") == 1 && userStatus.include('7')) {
     cantijiao = true;
     $.alert("男性不能选择妊娠期");
     return;
   }
   //家庭状态
   var familyStatus = "";
-  if ($("input[name='checkbox1']:checked").val() == "on")
-    familyStatus += "1";
-  else
-    familyStatus += "0";
-  if ($("input[name='checkbox2']:checked").val() == "on")
-    familyStatus += ",1";
-  else
-    familyStatus += ",0";
-  if ($("input[name='checkbox3']:checked").val() == "on")
-    familyStatus += ",1";
-  else
-    familyStatus += ",0";
-  if ($("input[name='checkbox4']:checked").val() == "on")
-    familyStatus += ",1";
-  else
-    familyStatus += ",0";
-  if ($("input[name='checkbox5']:checked").val() == "on")
-    familyStatus += ",1";
-  else
-    familyStatus += ",0";
-  if ($("input[name='checkbox6']:checked").val() == "on")
-    familyStatus += ",1";
-  else
-    familyStatus += ",0";
-  if ($("input[name='checkbox7']:checked").val() == "on")
-    familyStatus += ",1";
-  else
-    familyStatus += ",0";
-
+  if(userStatus.include('0')){
+      familyStatus += '0,0,0,0,0,0,0'
+  }else {
+      if (userStatus.include('1'))
+          familyStatus += "1";
+      else
+          familyStatus += "0";
+      if (userStatus.include('2'))
+          familyStatus += ",1";
+      else
+          familyStatus += ",0";
+      if (userStatus.include('3'))
+          familyStatus += ",1";
+      else
+          familyStatus += ",0";
+      if (userStatus.include('4'))
+          familyStatus += ",1";
+      else
+          familyStatus += ",0";
+      if (userStatus.include('5'))
+          familyStatus += ",1";
+      else
+          familyStatus += ",0";
+      if (userStatus.include('6'))
+          familyStatus += ",1";
+      else
+          familyStatus += ",0";
+      if (userStatus.include('7'))
+          familyStatus += ",1";
+      else
+          familyStatus += ",0";
+  }
 
   var medical = $("input[name='radio']:checked").val();
   if (medical == undefined) {
@@ -1458,40 +1471,40 @@ function updateSuspected(suspectedId) {
         $("#js_input_user_name").val(suspected.userName);
         $("#js_input_user_age").val(suspected.age);
         //基本情况
-        if (suspected.familyStatus != "") {
-          var familyStatusList = suspected.familyStatus.split(",");
-          if (familyStatusList[0] == 1)
-            $("input[name='checkbox1']").prop("checked", "checked");
-          else
-            $("input[name='checkbox1']").removeAttr("checked");
-          if (familyStatusList[1] == 1)
-            $("input[name='checkbox2']").prop("checked", "checked");
-          else
-            $("input[name='checkbox2']").removeAttr("checked");
-          if (familyStatusList[2] == 1)
-            $("input[name='checkbox3']").prop("checked", "checked");
-          else
-            $("input[name='checkbox3']").removeAttr("checked");
-          if (familyStatusList[3] == 1)
-            $("input[name='checkbox4']").prop("checked", "checked");
-          else
-            $("input[name='checkbox4']").removeAttr("checked");
-          if (familyStatusList[4] == 1)
-            $("input[name='checkbox5']").prop("checked", "checked");
-          else
-            $("input[name='checkbox5']").removeAttr("checked");
-          if (familyStatusList[5] == 1)
-            $("input[name='checkbox6']").prop("checked", "checked");
-          else
-            $("input[name='checkbox6']").removeAttr("checked");
-          if (familyStatusList[6] == 1)
-            $("input[name='checkbox7']").prop("checked", "checked");
-          else
-            $("input[name='checkbox7']").removeAttr("checked");
-
-        }
-        // $("#js_input_user_status").val(getFamilyStatus(suspected.familyStatus));
-        // $("#js_input_user_status").attr("data-values", suspected.familyStatus);
+        // if (suspected.familyStatus != "") {
+        //   var familyStatusList = suspected.familyStatus.split(",");
+        //   if (familyStatusList[0] == 1)
+        //     $("input[name='checkbox1']").prop("checked", "checked");
+        //   else
+        //     $("input[name='checkbox1']").removeAttr("checked");
+        //   if (familyStatusList[1] == 1)
+        //     $("input[name='checkbox2']").prop("checked", "checked");
+        //   else
+        //     $("input[name='checkbox2']").removeAttr("checked");
+        //   if (familyStatusList[2] == 1)
+        //     $("input[name='checkbox3']").prop("checked", "checked");
+        //   else
+        //     $("input[name='checkbox3']").removeAttr("checked");
+        //   if (familyStatusList[3] == 1)
+        //     $("input[name='checkbox4']").prop("checked", "checked");
+        //   else
+        //     $("input[name='checkbox4']").removeAttr("checked");
+        //   if (familyStatusList[4] == 1)
+        //     $("input[name='checkbox5']").prop("checked", "checked");
+        //   else
+        //     $("input[name='checkbox5']").removeAttr("checked");
+        //   if (familyStatusList[5] == 1)
+        //     $("input[name='checkbox6']").prop("checked", "checked");
+        //   else
+        //     $("input[name='checkbox6']").removeAttr("checked");
+        //   if (familyStatusList[6] == 1)
+        //     $("input[name='checkbox7']").prop("checked", "checked");
+        //   else
+        //     $("input[name='checkbox7']").removeAttr("checked");
+        //
+        // }
+        $("#js_input_user_status").val(getFamilyStatus(suspected.familyStatus));
+        $("#js_input_user_status").attr("data-values", formatUserStatus(suspected.familyStatus));
 
         // $("#jibenmiaoshu").val(suspected.statusDesp);
         if (suspected.medical == 0)
@@ -1810,7 +1823,7 @@ function getFamilyStatus(familyStatus) {
   var familyStatusList = familyStatus.split(",");
   var familyStatusString = "";
   if (familyStatus == '0,0,0,0,0,0,0')
-    familyStatusString += "无病史，";
+    familyStatusString += "无病史";
   else {
     if (familyStatusList[0] == 1)
       familyStatusString += "心脑血管疾病(服用ARB),";
@@ -1830,6 +1843,11 @@ function getFamilyStatus(familyStatus) {
   return familyStatusString.substring(0, familyStatusString.length - 1);
 }
 
+function formatUserStatus(str) {
+    var statusList = str.split(',')
+
+}
+
 function getCough(cough) {
   if (cough == 0)
     return "无咳嗽";

whepi-ui/templates/user/changeRole.ftl

@@ -7,24 +7,14 @@
         <input id="uptownId" type="text" hidden="hidden" value=${uptown_id!}/>
         <input id="uptownName" type="text" hidden="hidden" value=${uptown_name!}/>
             <div class="weui-tab__bd-item weui-tab__bd-item--active">
-                <div class="page__bd">
+                <div class="page__bd cx-reset-role">
                     <header class="user-header">
-                        <br/>
-                        <br/>
-                        <br/>
-                        <br/>
-                        <h1 class="user-title">家园互助平台</h1>
-                        <br/>
-                        <h1 class="user-title"><#if uptown_name ??>${uptown_name!''}</#if></h1>
-                        <br/>
+                        <#--<h1 class="user-title">家园互助平台</h1>-->
+                        <h1 class="user-title" style="padding: 10px 0;"><#if uptown_name ??>${uptown_name!''}</#if></h1>
                         <h1 class="user-title"><#if user ??>${user.nickName!''}</#if>登录</h1>
-                        <br/>
-                        <br/>
-                        <br/>
-                        <br/>
                     </header>
                     <div class="weui-form" id="fromMsg">
-                        <div class="weui-cells weui-cells_checkbox">
+                        <div class="weui-cells weui-cells_checkbox" style="margin-top: 0">
                             <label class="weui-cell weui-cell_active weui-check__label" for="s11">
                                 <div class="weui-cell__hd">
                                     <input type="radio" name="radio" value="1" class="weui-check" id="s11">