Merge remote-tracking branch 'origin/master'

# Conflicts:
#	whepi-ui/templates/yeweihui/home.ftl

whepi-ui/templates/home/help.ftl

@@ -0,0 +1,64 @@
+<div class="page__bd">
+
+    <div class="weui-cells__group weui-cells__group_form">
+        <div class="weui-cells weui-cells_radio">
+            <label class="weui-cell weui-cell_active weui-check__label" for="x11">
+                <div class="weui-cell__bd">
+                    <p>已解决</p>
+                </div>
+                <div class="weui-cell__ft">
+                    <input type="radio" class="weui-check" name="radio1" id="x11">
+                    <span class="weui-icon-checked"></span>
+                </div>
+            </label>
+            <label class="weui-cell weui-cell_active weui-check__label" for="x12">
+
+                <div class="weui-cell__bd">
+                    <p>未解决</p>
+                </div>
+                <div class="weui-cell__ft">
+                    <input type="radio" name="radio1" class="weui-check" id="x12" checked="checked">
+                    <span class="weui-icon-checked"></span>
+                </div>
+            </label>
+        </div>
+    </div>
+
+    <div>
+        <div>生活必须品求助</div>
+    </div>
+    <div class="weui-panel weui-panel_access">
+        <div class="weui-panel__bd">
+            <a href="javascript:void(0);" class="weui-media-box weui-media-box_appmsg">
+                <div class="weui-media-box__bd">
+                    <div style="display: flex; flex-direction: row; justify-content: space-between;">
+                        <p class="weui-media-box__desc">1. &nbsp;&nbsp; 7-2-202发出</p>
+                        <p class="weui-media-box__desc">2020-02-02 14:30</p>
+                    </div>
+                    <div class="weui-cell ">
+                        <div class="weui-cell__bd">
+                            <textarea class="weui-textarea" rows="1" readonly placeholder="只读"></textarea>
+                            <div class="weui-textarea-counter"></div>
+                        </div>
+                    </div>
+                </div>
+            </a>
+            <a href="javascript:void(0);" class="weui-media-box weui-media-box_appmsg">
+                <div class="weui-media-box__bd">
+                    <div style="display: flex; flex-direction: row; justify-content: space-between;">
+                        <p class="weui-media-box__desc">1. &nbsp;&nbsp; 7-2-202回复</p>
+                        <p class="weui-media-box__desc">2020-02-02 14:30</p>
+                    </div>
+                    <div class="weui-cell ">
+                        <div class="weui-cell__bd">
+                            <textarea class="weui-textarea" rows="1" readonly placeholder="只读"></textarea>
+                            <div class="weui-textarea-counter"></div>
+                        </div>
+                    </div>
+                </div>
+            </a>
+        </div>
+    </div>
+
+
+</div>

whepi-ui/templates/home/home.ftl

@@ -7,28 +7,28 @@
             <#include "/home/ribao.ftl" /></div>
         <div id="tab2" class="weui-tab__bd-item">
             <#include "/home/qiuzhu.ftl" /></div>
-        <#--<div id="tab3" class="weui-tab__bd-item">-->
-            <#--<h1>页面三</h1> </div>-->
-        <#--<div id="tab4" class="weui-tab__bd-item">-->
-            <#--<h1>页面四</h1> </div>-->
+    <#--<div id="tab3" class="weui-tab__bd-item">-->
+    <#--<h1>页面三</h1> </div>-->
+    <#--<div id="tab4" class="weui-tab__bd-item">-->
+    <#--<h1>页面四</h1> </div>-->
     </div>
     <div class="weui-tabbar">
         <a href="#tab1" class="weui-tabbar__item weui-bar__item--on">
-            <div class="weui-tabbar__icon"> <img src="./images/icon_nav_button.png" alt=""> </div>
+            <div class="weui-tabbar__icon"><img src="/static/images/wx/order.png" alt=""></div>
             <p class="weui-tabbar__label">健康日报</p>
         </a>
         <a href="#tab2" class="weui-tabbar__item">
-            <div class="weui-tabbar__icon"> <img src="./images/icon_nav_msg.png" alt=""> </div>
+            <div class="weui-tabbar__icon"><img src="/static/images/wx/customer_service.png" alt=""></div>
             <p class="weui-tabbar__label">家庭求助</p>
         </a>
-        <#--<a href="#tab3" class="weui-tabbar__item">-->
-            <#--<div class="weui-tabbar__icon"> <img src="./images/icon_nav_article.png" alt=""> </div>-->
-            <#--<p class="weui-tabbar__label">发现</p>-->
-        <#--</a>-->
-        <#--<a href="#tab4" class="weui-tabbar__item">-->
-            <#--<div class="weui-tabbar__icon"> <img src="./images/icon_nav_cell.png" alt=""> </div>-->
-            <#--<p class="weui-tabbar__label">我</p>-->
-        <#--</a>-->
+    <#--<a href="#tab3" class="weui-tabbar__item">-->
+    <#--<div class="weui-tabbar__icon"> <img src="./images/icon_nav_article.png" alt=""> </div>-->
+    <#--<p class="weui-tabbar__label">发现</p>-->
+    <#--</a>-->
+    <#--<a href="#tab4" class="weui-tabbar__item">-->
+    <#--<div class="weui-tabbar__icon"> <img src="./images/icon_nav_cell.png" alt=""> </div>-->
+    <#--<p class="weui-tabbar__label">我</p>-->
+    <#--</a>-->
     </div>
 </div>
 
@@ -39,24 +39,26 @@
 <script>
     <#include "/home/ribao.js" />
     <#include "/home/qiuzhu.js" />
-var userid = ${user};
-(function ($) {
+    var userid = ${user};
+    (function ($) {
 
-    $(function(){
-        $('.weui-navbar__item').on('click', function () {
-            $(this).addClass('weui-bar__item_on').siblings('.weui-bar__item_on').removeClass('weui-bar__item_on');
-            //内容切换
-            var moduleClass = jQuery(this).attr("module");
-            var ss = ".weui-tab__panel ." + moduleClass + "_weui_tab_bd_item_active";
-            $(ss).removeClass(moduleClass + '_weui_tab_bd_item_active');
-            var data_toggle =jQuery(this).attr("target");
-            $(data_toggle).addClass(moduleClass + "_weui_tab_bd_item_active");
+        $(function () {
+            $('.weui-navbar__item').on('click', function () {
+                $(this).addClass('weui-bar__item_on').siblings('.weui-bar__item_on').removeClass('weui-bar__item_on');
+                //内容切换
+                var moduleClass = jQuery(this).attr("module");
+                var ss = ".weui-tab__panel ." + moduleClass + "_weui_tab_bd_item_active";
+                $(ss).removeClass(moduleClass + '_weui_tab_bd_item_active');
+                var data_toggle = jQuery(this).attr("target");
+                $(data_toggle).addClass(moduleClass + "_weui_tab_bd_item_active");
+            });
         });
-    });
 
-    console.log(userid);
+        console.log(userid);
 
-    ribao_init();
-    qiuzhu_init();
-})(jQuery);
+        ribao_init();
+        qiuzhu_init();
+        help();
+        family_init();
+    })(jQuery);
 </script>

whepi-ui/templates/home/qiuzhu.ftl

@@ -10,74 +10,205 @@
         </div>
         <div class="weui-tab__panel">
             <div id="qz_nav1" class="weui-tab__bd-item qiu_zhu_weui_tab_bd_item_active">
-                <div class="weui-panel__bd">
-                    <div class="weui-media-box weui-media-box_text" id="title1">
-                        <p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>
-                    </div>
-                    <div class="weui-media-box weui-media-box_text" id="title2">
-                        <p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>
-                    </div>
+                <div id="notitle">
+                    <a class="weui-cell weui-cell_active weui-cell_access js_item" data-id="form" href="javascript:;">
+                        <div class="weui-cell__bd">
+                            <div class="weui-media-box weui-media-box_text" id="title">
+                                <p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>
+                            </div>
+                        </div>
+                        <div class="weui-cell__ft"></div>
+                    </a>
+                    <a class="weui-cell weui-cell_active weui-cell_access js_item" data-id="list" href="javascript:;">
+                        <div class="weui-cell__bd">
+                            <div class="weui-media-box weui-media-box_text" id="title">
+                                <p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>
+                            </div>
+                        </div>
+                        <div class="weui-cell__ft"></div>
+                    </a>
+                    <a class="weui-cell weui-cell_active weui-cell_access js_item" data-id="name" href="javascript:;">
+                        <div class="weui-cell__bd">
+                            <div class="weui-media-box weui-media-box_text" id="title2">
+                                <p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>
+                            </div>
+                        </div>
+                        <div class="weui-cell__ft"></div>
+                    </a>
+                    <a class="weui-cell weui-cell_active weui-cell_access js_item" data-id="age" href="javascript:;">
+                        <div class="weui-cell__bd">
+                            <div class="weui-media-box weui-media-box_text" id="title3">
+                                <p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>
+                            </div>
+                        </div>
+                        <div class="weui-cell__ft"></div>
+                    </a>
                 </div>
-
-
-            <#--<div class="weui-cells weui-cells_radio">&lt;#&ndash;单选&ndash;&gt;
-                <label class="weui-cell weui-check__label" for="x11">
-                    <div class="weui-cell__ft">
-                        <input type="radio" class="weui-check" name="radio1" id="x11">
-                        <span class="weui-icon-checked">已解决</span>
-                    </div>
-                </label>
-                <label>
-                    <div class="weui-cell__ft">
-                        <input type="radio" name="radio1" class="weui-check" id="x12" checked="checked">
-                        <span class="weui-icon-checked">未解决</span>
-                    </div>
-                </label>
-            </div>-->
-
-                <div id="helpType">
+                <div id="titlteZs" style="display: none">
+                      <#include "/home/help.ftl" />
                 </div>
             </div>
 
+
+
+        <#--我的求助2-->
             <div id="qz_nav2" class="weui-tab__bd-item">
-                <div class="weui-btn-area">
-                    <a <#--id="btnQZ"--> class="weui-btn weui-btn_primary" href="#help">发起求助</a>
-                </div>
-                <div class="weui-cell weui-cell_active weui-cell_switch">
-                    <div class="weui-cell">
-                        <div class="weui-cell__bd">
-                            <input type="text" placeholder="搜素关键字"/>
+                <div id="notPlay">
+                    <div class="weui-btn-area">
+                        <a id="btnQZ" class="weui-btn weui-btn_primary" href="javascript:">发起求助</a>
+                    </div>
+                    <div class="weui-cell weui-cell_active weui-cell_switch">
+                        <div class="weui-cell">
+                            <div class="weui-cell__bd">
+                                <input type="text" placeholder="搜素关键字"/>
+                            </div>
+                        </div>
+                        <div class="weui-cell__ft">
+                            <input class="weui-switch" type="checkbox">
                         </div>
+                        <div class="weui-cell__bd">只显示未解决</div>
                     </div>
-                    <div class="weui-cell__ft">
-                        <input class="weui-switch" type="checkbox">
+                    <div id="family">
+                        <div class="weui-panel__bd">
+                        <#--<div>
+                            <div style="float: left">laug</div>
+                            <div style="float: right">——2018/01/03 16:20发出</div>
+                        </div>-->
+                            <a class="weui-cell weui-cell_active weui-cell_access js_item" data-id="form"
+                               href="javascript:;">
+                                <div class="weui-cell__bd">
+                                    <div class="weui-media-box weui-media-box_text" id="title">
+                                        <p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。......</p>
+                                    </div>
+                                </div>
+                                <div class="weui-cell__ft"></div>
+                            </a>
+                            <a class="weui-cell weui-cell_active weui-cell_access js_item" data-id="form"
+                               href="javascript:;">
+                                <div class="weui-cell__bd">
+                                    <div class="weui-media-box weui-media-box_text" id="title">
+                                        <p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。......</p>
+                                    </div>
+                                </div>
+                                <div class="weui-cell__ft"></div>
+                            </a>
+                            <a class="weui-cell weui-cell_active weui-cell_access js_item" data-id="form"
+                               href="javascript:;">
+                                <div class="weui-cell__bd">
+                                    <div class="weui-media-box weui-media-box_text" id="title">
+                                        <p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。......</p>
+                                    </div>
+                                </div>
+                                <div class="weui-cell__ft"></div>
+                            </a>
+                            <a class="weui-cell weui-cell_active weui-cell_access js_item" data-id="form"
+                               href="javascript:;">
+                                <div class="weui-cell__bd">
+                                    <div class="weui-media-box weui-media-box_text" id="title">
+                                        <p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。......</p>
+                                    </div>
+                                </div>
+                                <div class="weui-cell__ft"></div>
+                            </a>
+                            <a class="weui-cell weui-cell_active weui-cell_access js_item" data-id="form"
+                               href="javascript:;">
+                                <div class="weui-cell__bd">
+                                    <div class="weui-media-box weui-media-box_text" id="title">
+                                        <p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。......</p>
+                                    </div>
+                                </div>
+                                <div class="weui-cell__ft"></div>
+                            </a>
+                            <a class="weui-cell weui-cell_active weui-cell_access js_item" data-id="form"
+                               href="javascript:;">
+                                <div class="weui-cell__bd">
+                                    <div class="weui-media-box weui-media-box_text" id="title">
+                                        <p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。......</p>
+                                    </div>
+                                </div>
+                                <div class="weui-cell__ft"></div>
+                            </a>
+                        </div>
                     </div>
-                    <div class="weui-cell__bd">只显示未解决</div>
                 </div>
-                <div class="weui-panel__bd">
-                <#--<div>
-                    <div style="float: left">laug</div>
-                    <div style="float: right">——2018/01/03 16:20发出</div>
-                </div>-->
-                    <div class="weui-media-box weui-media-box_text">
-                        <p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>
+                <div id="play" style="display: none" class="weui-panel__bd"><#--发起求助的展示界面-->
+                    <div class="weui-cells__group weui-cells__group_form">
+                        <div class="weui-cells weui-cells_form">
+                            <div class="weui-cell weui-cell_active" id="js_cell">
+                                <div class="weui-cell__hd"><label class="weui-label">标题</label></div>
+                                <div class="weui-cell__bd weui-flex">
+                                    <input id="js_input" class="weui-input" autofocus="" type="text"
+                                           placeholder="输入求助标题" maxlength="20">
+                                <#-- <button id="js_input_clear" class="weui-btn_reset weui-btn_icon weui-btn_input-clear">
+                                     <i class="weui-icon-clear"></i>
+                                 </button>-->
+                                </div>
+                            </div>
+                        </div>
                     </div>
-                    <div class="weui-media-box weui-media-box_text">
-                    <#--<h4 class="weui-media-box__title">标题二</h4>-->
-                        <p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>
+                    <div class="weui-form__control-area">
+                        <div class="weui-cells__group weui-cells__group_form">
+                            <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>居委会</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>业委会</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>
+                            <#--<a href="javascript:void(0);" class="weui-cell weui-cell_active weui-cell_link">
+                                <div class="weui-cell__bd">添加更多</div>
+                            </a>-->
+                            </div>
+                        </div>
+                        <div class="weui-cells weui-cells_form">
+                            <div class="weui-cell ">
+                                <div class="weui-cell__bd">
+                                    <textarea class="weui-textarea" placeholder="请输入求助内容" rows="3"></textarea>
+                                    <div class="weui-textarea-counter"><span>0</span>/200</div>
+                                </div>
+                            </div>
+                            <div class="weui-btn-area">
+                                <a class="weui-btn weui-btn_primary" href="javascript:">发起求助</a>
+                            </div>
+                        </div>
                     </div>
+
+                </div>
+                <div id="familyDisplay" style="display: none">
+                     <#include "/home/help.ftl" />
                 </div>
             </div>
         </div>
     </div>
-
-
-<#-- <div class="weui-btn-area">
-     <a id="btnQZ" class="weui-btn weui-btn_primary" href="javascript:">发起求助</a>
- </div>-->
 </div>
-<#include "/home/frag.foot.ftl" />
-
-<script type="text/javascript">
 
-</script>

whepi-ui/templates/home/qiuzhu.js

@@ -1,5 +1,36 @@
 function qiuzhu_init() {
   $('#btnQZ').on('click', function () {
-    alert("求助");
+    $("#notPlay").toggle();
+    /*点击隐藏*/
+    /*展示*/
+    $('#play')[0].style.display = '';
   });
 }
+
+function help() {
+  $('#qz_nav1').on('click', function () {
+    if ($('#titlteZs')[0].style.display == 'none') {
+      $('#notitle').toggle();
+      $('#titlteZs')[0].style.display = '';
+    } else {
+      $('#notitle')[0].style.display = '';
+      $('#titlteZs')[0].style.display = 'none';
+    }
+  })
+}
+
+function family_init() {
+  /*$('#family').on('click',function () {
+    $('#familyDisplay')[0].style.display == '';
+    alert($('#familyDisplay')[0].style.display == 'none')
+    if($('#familyDisplay')[0].style.display == 'none'){
+      $('#notPlay').toggle();
+
+    }else{
+      $('#familyDisplay')[0].style.display == '';
+      $('#notPlay')[0].style.display == 'none';
+    }
+
+
+  })*/
+}

whepi-ui/templates/yeweihui/houseSelect.ftl

@@ -0,0 +1,8 @@
+<div class="weui-btn-area"  style="display: flex; flex-direction: row; justify-content: space-between;">
+    <div style="display: flex; flex-direction: row; justify-content: space-between;width: 60vw;">
+        <input id="dong" class="weui-btn" style="background-color: #d1d1d1; margin-top: 0; color: #0d1215; width: 15vw;" href="javascript:" value="栋" onfocus="if (value =='栋'){value =''}" onblur="if (value ==''){value='栋'}" />
+        <input id="danyuan" class="weui-btn" style="background-color: #d1d1d1; margin-top: 0; color: #0d1215; width: 17vw;" href="javascript:" value="单元" onfocus="if (value =='单元'){value =''}" onblur="if (value ==''){value='单元'}" />
+        <input id="menpaihao" class="weui-btn" style="background-color: #d1d1d1; margin-top: 0; color: #0d1215; width: 20vw;" href="javascript:" value="门牌号" onfocus="if (value =='门牌号'){value =''}" onblur="if (value ==''){value='门牌号'}" />
+    </div>
+    <a id="btnQZ" class="weui-btn weui-btn_primary" style="width: 20vw;" href="javascript:">查询</a>
+</div>

whepi-ui/templates/yeweihui/qiuzhu.ftl

@@ -13,11 +13,11 @@
         </div>
         <div class="weui-tab__panel">
             <div id="qz_nav1" class="weui-tab__bd-item qiu_zhu_weui_tab_bd_item_active">
-                <div class="weui-btn-area">
-                    <a id="btnQZ" class="weui-btn weui-btn_primary" href="javascript:">查询</a>
-                </div>
+
+                <#include "/yeweihui/houseSelect.ftl" />
+
                 <div class="weui-panel weui-panel_access">
-                    <div class="weui-panel__bd">
+                    <div id="qz_list1" class="weui-panel__bd">
                         <a href="javascript:void(0);" class="weui-media-box weui-media-box_appmsg">
                             <div class="weui-media-box__bd">
                                 <div style="display: flex; flex-direction: row; justify-content: space-between;">
@@ -36,13 +36,56 @@
                         </a>
                     </div>
                 </div>
-
             </div>
             <div id="qz_nav2" class="weui-tab__bd-item">
-                内容二
+
+                <#include "/yeweihui/houseSelect.ftl" />
+
+                <div class="weui-panel weui-panel_access">
+                    <div id="qz_list2" class="weui-panel__bd">
+                        <a href="javascript:void(0);" class="weui-media-box weui-media-box_appmsg">
+                            <div class="weui-media-box__bd">
+                                <div style="display: flex; flex-direction: row; justify-content: space-between;">
+                                    <p class="weui-media-box__desc">1. &nbsp;&nbsp; 7-2-202</p>
+                                    <p class="weui-media-box__desc">2020-02-02 14:30</p>
+                                </div>
+                                <h4 class="weui-media-box__title">家庭求助</h4>
+                                <p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>
+                            </div>
+                        </a>
+                        <a href="javascript:void(0);" class="weui-media-box weui-media-box_appmsg">
+                            <div class="weui-media-box__bd">
+                                <h4 class="weui-media-box__title">医药求助</h4>
+                                <p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>
+                            </div>
+                        </a>
+                    </div>
+                </div>
             </div>
             <div id="qz_nav3" class="weui-tab__bd-item">
-                内容三
+
+                <#include "/yeweihui/houseSelect.ftl" />
+
+                <div class="weui-panel weui-panel_access">
+                    <div id="qz_list3" class="weui-panel__bd">
+                        <a href="javascript:void(0);" class="weui-media-box weui-media-box_appmsg">
+                            <div class="weui-media-box__bd">
+                                <div style="display: flex; flex-direction: row; justify-content: space-between;">
+                                    <p class="weui-media-box__desc">1. &nbsp;&nbsp; 7-2-202</p>
+                                    <p class="weui-media-box__desc">2020-02-02 14:30</p>
+                                </div>
+                                <h4 class="weui-media-box__title">家庭求助</h4>
+                                <p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>
+                            </div>
+                        </a>
+                        <a href="javascript:void(0);" class="weui-media-box weui-media-box_appmsg">
+                            <div class="weui-media-box__bd">
+                                <h4 class="weui-media-box__title">医药求助</h4>
+                                <p class="weui-media-box__desc">由各种物质组成的巨型球状天体，叫做星球。星球有一定的形状，有自己的运行轨道。</p>
+                            </div>
+                        </a>
+                    </div>
+                </div>
             </div>
         </div>
     </div>

whepi-ui/templates/yeweihui/qiuzhu.js

@@ -1,7 +1,72 @@
 function qiuzhu_init() {
+
+  makeUI(taskList);
+
   $('#btnQZ').on('click', function () {
     alert("查询");
   });
 
+  $("#dong").select({
+    title: "选择楼栋",
+    items: ["法官", "医生", "猎人", "学生", "记者", "其他"]
+  });
+
+  $("#danyuan").select({
+    title: "选择单元",
+    items: ["法官", "医生", "猎人", "学生", "记者", "其他"]
+  });
+
+  $("#menpaihao").select({
+    title: "选择门牌号",
+    items: ["法官", "医生", "猎人", "学生", "记者", "其他"]
+  });
+}
+
+function makeUI(tasks) {
+
+  $('#qz_list1').empty();
+  $('#qz_list2').empty();
+  $('#qz_list3').empty();
+
+  for (let i = 0; i < tasks.length; i++) {
+
+    let task = tasks[i];
+    if (task.taskStatus == 1) {
 
+      $('#qz_list1').append($('<a href="javascript:void(0);" class="weui-media-box weui-media-box_appmsg">\n' +
+          '                            <div class="weui-media-box__bd">\n' +
+          '                                <div style="display: flex; flex-direction: row; justify-content: space-between;">\n' +
+          '                                    <p class="weui-media-box__desc">' + task.houseNumber + '</p>\n' +
+          '                                    <p class="weui-media-box__desc">' + '2020-02-02 14:30' + '</p>\n' +
+          '                                </div>\n' +
+          '                                <h4 class="weui-media-box__title">' + task.taskTitle + '</h4>\n' +
+          '                                <p class="weui-media-box__desc">' + task.remark + '</p>\n' +
+          '                            </div>\n' +
+          '                        </a>'));
+    }
+    else if (task.taskStatus == 2) {
+      $('#qz_list2').append($('<a href="javascript:void(0);" class="weui-media-box weui-media-box_appmsg">\n' +
+          '                            <div class="weui-media-box__bd">\n' +
+          '                                <div style="display: flex; flex-direction: row; justify-content: space-between;">\n' +
+          '                                    <p class="weui-media-box__desc">' + task.houseNumber + '</p>\n' +
+          '                                    <p class="weui-media-box__desc">' + '2020-02-02 14:30' + '</p>\n' +
+          '                                </div>\n' +
+          '                                <h4 class="weui-media-box__title">' + task.taskTitle + '</h4>\n' +
+          '                                <p class="weui-media-box__desc">' + task.remark + '</p>\n' +
+          '                            </div>\n' +
+          '                        </a>'));
+    }
+    else if (task.taskStatus == 3) {
+      $('#qz_list3').append($('<a href="javascript:void(0);" class="weui-media-box weui-media-box_appmsg">\n' +
+          '                            <div class="weui-media-box__bd">\n' +
+          '                                <div style="display: flex; flex-direction: row; justify-content: space-between;">\n' +
+          '                                    <p class="weui-media-box__desc">' + task.houseNumber + '</p>\n' +
+          '                                    <p class="weui-media-box__desc">' + '2020-02-02 14:30' + '</p>\n' +
+          '                                </div>\n' +
+          '                                <h4 class="weui-media-box__title">' + task.taskTitle + '</h4>\n' +
+          '                                <p class="weui-media-box__desc">' + task.remark + '</p>\n' +
+          '                            </div>\n' +
+          '                        </a>'));
+    }
+  }
 }

whepi-web/src/main/java/com/bofeng/dao/UserOpenMapper.java

@@ -17,4 +17,6 @@ public interface UserOpenMapper extends BaseMapper<UserOpen> {
     User getUserByHigherId(Long higherId);
 
     UserOpen selectByUserId(@Param("userId") Long userId);
+
+    UserOpen selectByOpenId(@Param("openId") String openId);
 }

whepi-web/src/main/java/com/bofeng/service/HomeService.java

@@ -0,0 +1,59 @@
+package com.bofeng.service;
+
+import com.baomidou.mybatisplus.toolkit.IdWorker;
+import com.bofeng.dao.UserOpenMapper;
+import com.bofeng.entity.ParseCurrentOpenId;
+import com.bofeng.entity.UserOpen;
+import com.google.common.base.Strings;
+import com.google.common.collect.Maps;
+import com.yvan.springmvc.HttpParameterParser;
+import com.yvan.springmvc.HttpUtils;
+import lombok.extern.slf4j.Slf4j;
+import lombok.val;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.mp.api.WxMpService;
+import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken;
+import me.chanjar.weixin.mp.bean.result.WxMpUser;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.Map;
+
+@Service
+@Transactional(readOnly = true)
+@Slf4j
+public class HomeService {
+
+    @Autowired
+    private UserService userService;
+    @Autowired
+    private UserOpenMapper userOpenMapper;
+
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
+    public UserOpen getUserOpen() {
+        ParseCurrentOpenId wxToken = userService.currentWxUser();
+        WxMpUser wxMpUser = wxToken.getWxMpUser();
+        UserOpen user = userOpenMapper.selectByOpenId(wxMpUser.getOpenId());
+        if (user == null) {
+            // 账户没有注册,需要注册
+            UserOpen userOpen = new UserOpen();
+            userOpen.setUserId(IdWorker.getId());
+            userOpen.setOpenId(wxMpUser.getOpenId());
+            userOpen.setNickName(wxMpUser.getNickname());
+            userOpen.setSexDesc(wxMpUser.getSexDesc());
+            userOpen.setSex(wxMpUser.getSex());
+            userOpen.setCity(wxMpUser.getCity());
+            userOpen.setProvince(wxMpUser.getProvince());
+            userOpen.setCountry(wxMpUser.getCountry());
+            userOpen.setHeadImgUrl(wxMpUser.getHeadImgUrl());
+            userOpen.setBeActive("Y");
+            userOpenMapper.insert(userOpen);
+            return userOpen;
+        }
+        return user;
+    }
+}

whepi-web/src/main/java/com/bofeng/service/SecurityService.java

@@ -9,7 +9,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 @Service
 public class SecurityService {

whepi-web/src/main/java/com/bofeng/service/UserService.java

@@ -189,26 +189,26 @@ public class UserService {
             return r;
         }
 
-        val user = getUserById(userOpen.getUserId());
-        if (user == null) {
-            model.put("message", "user 不存在 " + userOpen.getUserId());
-            model.put("isError", true);
-            r.setErrorResult(new ModelAndView("/prompt/prompt.ftl", model));
-            r.setError(true);
-            log.error("user 不存在 " + userOpen.getUserId());
-            return r;
-        }
-        if (!Consts.ACT_ENABLE.equals(user.getBeActive())) {
-            model.put("message", "user 被禁用 " + userOpen.getUserId());
-            model.put("isError", true);
-            r.setErrorResult(new ModelAndView("/prompt/prompt.ftl", model));
-            r.setError(true);
-            log.error("user 被禁用 " + userOpen.getUserId());
-            return r;
-        }
+//        val user = getUserById(userOpen.getUserId());
+//        if (user == null) {
+//            model.put("message", "user 不存在 " + userOpen.getUserId());
+//            model.put("isError", true);
+//            r.setErrorResult(new ModelAndView("/prompt/prompt.ftl", model));
+//            r.setError(true);
+//            log.error("user 不存在 " + userOpen.getUserId());
+//            return r;
+//        }
+//        if (!Consts.ACT_ENABLE.equals(user.getBeActive())) {
+//            model.put("message", "user 被禁用 " + userOpen.getUserId());
+//            model.put("isError", true);
+//            r.setErrorResult(new ModelAndView("/prompt/prompt.ftl", model));
+//            r.setError(true);
+//            log.error("user 被禁用 " + userOpen.getUserId());
+//            return r;
+//        }
 
         r.setUserOpen(userOpen);
-        r.setUser(user);
+//        r.setUser(user);
         r.setError(false);
         return r;
     }

whepi-web/src/main/java/com/bofeng/wx/controller/HomeController.java

@@ -1,14 +1,18 @@
 package com.bofeng.wx.controller;
 
+import com.baomidou.mybatisplus.toolkit.IdWorker;
 import com.bofeng.Consts;
-import com.bofeng.entity.ParseCurrentOpenId;
-import com.bofeng.entity.StatisticsOrder;
-import com.bofeng.entity.SubUser;
-import com.bofeng.entity.User;
+import com.bofeng.dao.UserOpenMapper;
+import com.bofeng.entity.*;
+import com.bofeng.service.HomeService;
+import com.bofeng.service.UserOpenService;
+import com.bofeng.service.UserService;
 import com.google.common.collect.Maps;
 import com.yvan.platform.JsonWapper;
 import com.yvan.platform.YvanUtil;
 import lombok.val;
+import me.chanjar.weixin.mp.bean.result.WxMpUser;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -20,13 +24,12 @@ import java.util.Map;
 @RestController
 public class HomeController {
 
+    @Autowired
+    private HomeService homeService;
+
     @GetMapping("/home/home.html")
     public ModelAndView home(ModelMap model) {
-
-//        Map<String, Object> queryParam = Maps.newLinkedHashMap();
-//        queryParam.put("userId", "12345677");
-//        queryParam.put("statistics", "M");
-
+        UserOpen userOpen = homeService.getUserOpen();
         model.put("user", new JsonWapper("{\"www\": \"er\"}"));
         return new ModelAndView("/home/home.ftl", model);
     }

whepi-web/src/main/java/com/bofeng/wx/controller/YeWeiHuiController.java

@@ -3,6 +3,7 @@ package com.bofeng.wx.controller;
 import com.bofeng.entity.QzTask;
 import com.bofeng.service.QzTaskService;
 import com.google.common.collect.Maps;
+import com.yvan.platform.YvanUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -27,7 +28,8 @@ public class YeWeiHuiController {
 
         List<QzTask> taskList = qzTaskService.selectAll();
 
-        model.put("taskList", taskList);
+        model.put("taskList", YvanUtil.toJsonPretty(taskList));
+
         return new ModelAndView("/yeweihui/home.ftl", model);
     }
 }

whepi-web/src/main/resources/application-hudingbo.yml

@@ -0,0 +1,73 @@
+logging:
+  level:
+    root: INFO
+    jdbc.sqltiming: INFO
+  pattern:
+    console: '%d %-5level %logger{32} - %msg%n'
+
+debug: false
+ui-path: file:whepi-ui
+secret: 456 # jwt私钥
+salt: 123 #密码加盐
+token_time_minutes: 720 #12小时有效期
+token_time_minutes_mobile: 525600 #1年有效
+
+server:
+  port: 8086
+
+yvan:
+  debug: false
+  static_version: v20170728
+  static_domain: /static
+  upload_domain: /static
+  wechat:
+    #测试帐号
+    token: hudingbo
+    appID: wx39b9602905ed3b75
+    appsecret: 2ad7a715bed0cd8672a0d577492dd259
+
+#    token: yuliang
+#    appID: wx1b020f76b18f0294
+#    appsecret: 69f06d671d445dc14b04a097fe50f4cc
+
+    #token: slxtoken
+    #appID: wx79c1af613d5d22dd
+    #appsecret: 2de3b4abfe30ff7523f464ace8322b44
+    #EncodingAESKey: wb4IyoD7FZa0yB2BMU8HWQ0inWJuAfJSiRR6jlfivo2
+    ## 商户编号
+    #pay_mch_id: 1499356522
+    ## 回调地址
+    #notify_url: http://central.good5you.com/pay/wx/notify
+
+    ## 绑定客户的二维码有效时间
+    #qrcode_bind_expire_second: 10800
+    ## 找到用户的二维码有效时间
+    #qrcode_match_cust_expire_second: 10800
+
+    ##domain: http://wx.good5you.com/
+#    domain: http://bofeng.ng.good5you.com
+    domain: http://hudingbo.ng.yvanui.com
+#    domain: http://yyc21fmd42.hkhttp.cn
+#    tmpTicketExpireSeconds: 10800
+    templates:
+      预定信息: 'MLNz8YVi7zofQOBeLS0Ruhr-3fJpTnfsKjyPeDB879s'
+      修改预定信息: 'FsPj2Syigep3ctUd0aBmE4JMsuxjW-U0JgmoLAXjJtc'
+      结账信息: '5t4LSW4cb7j4mcHxoYyzTvLHnp2gehpxn1faf7G4ABs'
+      结算信息: 'GoZBKvyqAfP8uM3xrJk40YHhMoM_E44aPLEoKV_1-pQ'
+    #  round_out_template_id: 'xpQJsBwlhZ5r7P7Glur8hiNl1IgjQxtMGTVwdVOfGKg'
+    #  round_in_template_id: 'oobiXKFatguG1H7K-HPi2lipzF-Qv0pMY12e1JaQxdA'
+
+spring:
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    #driverClassName: com.mysql.jdbc.Driver
+    #url: jdbc:mysql://localhost:3306/bofeng_test?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
+    driverClassName: net.sf.log4jdbc.DriverSpy
+    url: jdbc:log4jdbc:mysql://39.99.148.1:3306/whepi_test?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
+    username: whepi_test
+    password: 123456
+
+  redis:
+    database: 4
+    host: localhost
+    port: 6379

whepi-web/src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@ logging:
     console: '%d %-5level %logger{32} - %msg%n'
 
 debug: false
-ui-path: file:/home/www/ws/bofeng/b2b_sale/bofeng-ui
+ui-path: file:/home/www/ws/wuhan_epi/whepi-ui
 secret: hh123 # jwt私钥
 salt: 456 #密码加盐
 token_time_minutes: 720 #12小时有效期
@@ -55,9 +55,9 @@ spring:
     #driverClassName: com.mysql.jdbc.Driver
     #url: jdbc:mysql://localhost:3306/bofeng_test?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
     driverClassName: net.sf.log4jdbc.DriverSpy
-    url: jdbc:log4jdbc:mysql://localhost:3306/bofeng?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
-    username: bofeng
-    password: 123456
+    url: jdbc:log4jdbc:mysql://localhost:3306/whepi?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
+    username: whepi
+    password: hust!2020epi
 
   redis:
     database: 8

whepi-web/src/main/resources/application-xielianghe.yml

@@ -0,0 +1,73 @@
+logging:
+  level:
+    root: INFO
+    jdbc.sqltiming: INFO
+  pattern:
+    console: '%d %-5level %logger{32} - %msg%n'
+
+debug: false
+ui-path: file:whepi-ui
+secret: 456 # jwt私钥
+salt: 123 #密码加盐
+token_time_minutes: 720 #12小时有效期
+token_time_minutes_mobile: 525600 #1年有效
+
+server:
+  port: 8086
+
+yvan:
+  debug: false
+  static_version: v20170728
+  static_domain: /static
+  upload_domain: /static
+  wechat:
+    #测试帐号
+    token: xielianghe
+    appID: wxb6a62941748ad177
+    appsecret: b7fecaa77d9ef970a870e64d194e1026
+
+#    token: yuliang
+#    appID: wx1b020f76b18f0294
+#    appsecret: 69f06d671d445dc14b04a097fe50f4cc
+
+    #token: slxtoken
+    #appID: wx79c1af613d5d22dd
+    #appsecret: 2de3b4abfe30ff7523f464ace8322b44
+    #EncodingAESKey: wb4IyoD7FZa0yB2BMU8HWQ0inWJuAfJSiRR6jlfivo2
+    ## 商户编号
+    #pay_mch_id: 1499356522
+    ## 回调地址
+    #notify_url: http://central.good5you.com/pay/wx/notify
+
+    ## 绑定客户的二维码有效时间
+    #qrcode_bind_expire_second: 10800
+    ## 找到用户的二维码有效时间
+    #qrcode_match_cust_expire_second: 10800
+
+    ##domain: http://wx.good5you.com/
+#    domain: http://bofeng.ng.good5you.com
+    domain: http://xielianghe.ng.yvanui.com
+#    domain: http://yyc21fmd42.hkhttp.cn
+#    tmpTicketExpireSeconds: 10800
+    templates:
+      预定信息: 'MLNz8YVi7zofQOBeLS0Ruhr-3fJpTnfsKjyPeDB879s'
+      修改预定信息: 'FsPj2Syigep3ctUd0aBmE4JMsuxjW-U0JgmoLAXjJtc'
+      结账信息: '5t4LSW4cb7j4mcHxoYyzTvLHnp2gehpxn1faf7G4ABs'
+      结算信息: 'GoZBKvyqAfP8uM3xrJk40YHhMoM_E44aPLEoKV_1-pQ'
+    #  round_out_template_id: 'xpQJsBwlhZ5r7P7Glur8hiNl1IgjQxtMGTVwdVOfGKg'
+    #  round_in_template_id: 'oobiXKFatguG1H7K-HPi2lipzF-Qv0pMY12e1JaQxdA'
+
+spring:
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    #driverClassName: com.mysql.jdbc.Driver
+    #url: jdbc:mysql://localhost:3306/bofeng_test?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
+    driverClassName: net.sf.log4jdbc.DriverSpy
+    url: jdbc:log4jdbc:mysql://39.99.148.1:3306/whepi_test?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false
+    username: whepi_test
+    password: 123456
+
+  redis:
+    database: 4
+    host: localhost
+    port: 6379

whepi-web/src/main/resources/application.yml

@@ -43,10 +43,10 @@ endpoints:
 #  whitelabel.enabled: false
 
 spring:
-  profiles.active: guojing
+  profiles.active: dev
 
   application:
-    name: bofeng-web
+    name: whepi-web
 
   #mvc:
   #  throw-exception-if-no-handler-found: true

whepi-web/src/main/resources/mapper/UserOpen.xml

@@ -10,4 +10,9 @@
         select * from sys_user_open
         where user_id=#{userId}
     </select>
+
+    <select id="selectByOpenId" resultType="com.bofeng.entity.UserOpen">
+        select * from sys_user_open
+        where open_id=#{openId}
+    </select>
 </mapper>