Merge remote-tracking branch 'origin/master'

whepi-ui/templates/home/ribao.ftl

@@ -38,6 +38,7 @@
                     <#--</div>-->
                     </div>
                     <div class="weui-cells__tips"> <span style="color: red">
+                        <br/>
                         注：请如实上报情况，便以相互帮助，小区是我家，团结就是力量！后期会有医生跟踪分析，给予大家医疗建议，请认真填报！
                     </span></div>
                     <div class="weui-btn-area">
@@ -226,7 +227,7 @@
                     </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>
+                            <div style="height: 5vh; line-height: 5vh; width: 60%;">工作驻地</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)"/>
@@ -235,7 +236,7 @@
                                    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>
+                            <div style="height: 5vh; line-height: 5vh; width: 60%;">今日所在地</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)"/>
@@ -244,7 +245,7 @@
                                    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>
+                            <div style="height: 5vh; line-height: 5vh; width: 60%;">是否出行</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: 145%"
                                    onchange="selectinput6(this)"/>
@@ -257,7 +258,7 @@
                                 <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: 55%;">出发地</div>
+                                <div style="height: 5vh; line-height: 5vh; width: 60%;">出发地</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)"/>
@@ -266,7 +267,7 @@
                                        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>
+                                <div style="height: 5vh; line-height: 5vh; width: 60%;">目的地</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)"/>
@@ -275,7 +276,7 @@
                                        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>
+                                <div style="height: 5vh; line-height: 5vh; width: 60%;">出行方式</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)"/>

whepi-ui/templates/lingyun/ribao.ftl

@@ -33,6 +33,7 @@
                     <#--</div>-->
                     </div>
                     <div class="weui-cells__tips"> <span style="color: red">
+                        <br/>
                         注：请如实上报情况，便以相互帮助，小区是我家，团结就是力量！后期会有医生跟踪分析，给予大家医疗建议，请认真填报！
                     </span></div>
                     <div class="weui-btn-area">
@@ -199,14 +200,14 @@
                             <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>
+                            <div style="height: 5vh; line-height: 5vh; width: 60%;">今日所在地</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>
                         <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
-                            <div style="height: 5vh; line-height: 5vh; width: 55%;">是否出行</div>
+                            <div style="height: 5vh; line-height: 5vh; width: 60%;">是否出行</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: 145%" onchange="selectinput6(this)"/>
                         </div>
@@ -218,21 +219,21 @@
                                 <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: 55%;">出发地</div>
+                                <div style="height: 5vh; line-height: 5vh; width: 60%;">出发地</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: 55%;">目的地</div>
+                                <div style="height: 5vh; line-height: 5vh; width: 60%;">目的地</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: 55%;">出行方式</div>
+                                <div style="height: 5vh; line-height: 5vh; width: 60%;">出行方式</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;