Merge remote-tracking branch 'origin/master'

whepi-ui/templates/home/home.ftl

@@ -63,5 +63,6 @@
         ribao_add();
         ribao_cancel();
         ribao_commit();
+        submit_back();
     })(jQuery);
 </script>

whepi-ui/templates/home/qiuzhu.ftl

@@ -197,12 +197,14 @@
                                     <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 class="weui-cell">
+                                <a class="weui-btn weui-btn_primary" href="javascript:" id="back">发起求助</a>
+                            </div>
+                            <div class="weui-cell ">
+                                <br>
                             </div>
                         </div>
                     </div>
-
                 </div>
                 <div id="familyDisplay" style="display: none">
                      <#include "/home/help.ftl" />

whepi-ui/templates/home/qiuzhu.js

@@ -34,3 +34,12 @@ function family_init() {
 
   })*/
 }
+
+function submit_back() {
+  $('#back').on('click', function () {
+    if ($('#notPlay')[0].style.display = 'none') {
+      $('#notPlay')[0].style.display = '';
+      $('#play').toggle();
+    }
+  })
+}

whepi-ui/templates/yeweihui/home.ftl

@@ -4,7 +4,7 @@
 <div class="weui-tab">
     <div class="weui-tab__bd">
         <div id="tab1" class="weui-tab__bd-item weui-tab__bd-item--active">
-            <#include "/yeweihui/ribao.ftl" /></div>
+            <#include "/yeweihui/ribaoDy.ftl" /></div>
         <div id="tab2" class="weui-tab__bd-item">
             <#include "/yeweihui/qiuzhu.ftl" /></div>
         <#--<div id="tab3" class="weui-tab__bd-item">-->

whepi-ui/templates/yeweihui/ribao.ftl

@@ -1,4 +1,5 @@
-
+<#assign title="业委会"/>
+<#include "/home/frag.head.ftl" />
 
 <div class="page__bd">
     <header class="demos-header">
@@ -13,30 +14,18 @@
             <span style="background-color: #0bb20c">&nbsp;&nbsp;&nbsp</span>异常
         </div>
         </div>
-        <#--<div class="weui-tab__panel">-->
-            <#--<div id="rb_nav1" class="weui-tab__bd-item weui_tab_bd_item_active">-->
-                <#--内容一-->
-            <#--</div>-->
-            <#--<div id="rb_nav2" class="weui-tab__bd-item">-->
-                <#--内容二-->
-            <#--</div>-->
-            <#--<div id="rb_nav3" class="weui-tab__bd-item">-->
-                <#--内容二-->
-            <#--</div>-->
-        <#--</div>-->
-
     </div>
     <br/>
     <br/>
     <br/>
     <div class="weui-tab" style="height: 400px">
         <div class="weui-navbar">
-                <table border="1" cellspacing="0" cellpadding="0">
-                    <tbody>
-                    <list list as li>
+            <table border="1" cellspacing="0" cellpadding="0" style="width: 100%">
+                <tbody>
+                <list list as li>
                     <tr><#--//colspan="2"-->
-                        <td rowspan="4" style="border-top-color: #75859f" bgcolor="greenyellow" bordercolor =“＃007eff”>2栋</td>
-                        <td rowspan="2" style="border-top-color: #75859f" bordercolor =“＃007eff”>1单元</td>
+                        <td <#--rowspan="4"--> style="border-top-color: #75859f" bgcolor="greenyellow" bordercolor =“＃007eff”>101</td>
+                        <td <#--rowspan="2"--> style="border-top-color: #75859f" bordercolor =“＃007eff”>102</td>
                         <td style="border-top-color: #75859f" ><a href="javascript:void(0);">101</a></td>
                         <td style="border-top-color: #75859f"> 102</td>
                         <td style="border-top-color: #75859f"> 103</td>
@@ -46,70 +35,58 @@
                         <td style="border-top-color: #75859f"> 303</td>
                         <td style="border-top-color: #75859f"> 304</td>
                         <td style="border-top-color: #75859f"> 201</td>
+                    </tr>
+                    <tr>
+                        <td style="border-top-color: #75859f"> 201</td>
+                        <td style="border-top-color: #75859f"> 302</td>
+                        <td style="border-top-color: #75859f"> 303</td>
+                        <td style="border-top-color: #75859f"> 304</td>
+                        <td style="border-top-color: #75859f"> 201</td>
                         <td style="border-top-color: #75859f"> 302</td>
                         <td style="border-top-color: #75859f"> 303</td>
                         <td style="border-top-color: #75859f"> 304</td>
+                        <td style="border-top-color: #75859f"> 201</td
+                    </tr>
+                    <tr>
+                        <td <#--rowspan="2" -->style="border-top-color: #75859f"> 202</td>
+                        <td style="border-top-color: #75859f"> 101</td>
+                        <td style="border-top-color: #75859f"> 102</td>
+                        <td style="border-top-color: #75859f"> 103</td>
+                        <td style="border-top-color: #75859f"> 104</td>
+                        <td style="border-top-color: #75859f"> 104</td>
+                        <td style="border-top-color: #75859f"> 304</td>
+                        <td style="border-top-color: #75859f"> 201</td>
                         <td style="border-top-color: #75859f"> 302</td>
+                        <td style="border-top-color: #75859f"> 303</td>
+                    </tr>
+                    <tr>
+                        <td style="border-top-color: #75859f"> 101</td>
+                        <td style="border-top-color: #75859f"> 102</td>
+                        <td style="border-top-color: #75859f"> 103</td>
+                        <td style="border-top-color: #75859f"> 104</td>
+                        <td style="border-top-color: #75859f"> 104</td>
+                        <td style="border-top-color: #75859f"> 304</td>
+                        <td style="border-top-color: #75859f"> 201</td>
                         <td style="border-top-color: #75859f"> 302</td>
+                        <td style="border-top-color: #75859f"> 303</td>
                     </tr>
-                        <tr>
-                            <td style="border-top-color: #75859f"> 201</td>
-                            <td style="border-top-color: #75859f"> 302</td>
-                            <td style="border-top-color: #75859f"> 303</td>
-                            <td style="border-top-color: #75859f"> 304</td>
-                            <td style="border-top-color: #75859f"> 201</td>
-                            <td style="border-top-color: #75859f"> 302</td>
-                            <td style="border-top-color: #75859f"> 303</td>
-                            <td style="border-top-color: #75859f"> 304</td>
-                            <td style="border-top-color: #75859f"> 201</td>
-                            <td style="border-top-color: #75859f"> 302</td>
-                            <td style="border-top-color: #75859f"> 303</td>
-                            <td style="border-top-color: #75859f"> 304</td>
-                            <td style="border-top-color: #75859f"> 302</td>
-                            <td style="border-top-color: #75859f"> 302</td>
-                        </tr>
-                        <tr>
-                            <td rowspan="2" style="border-top-color: #75859f"> 2单元</td>
-                            <td style="border-top-color: #75859f"> 101</td>
-                            <td style="border-top-color: #75859f"> 102</td>
-                            <td style="border-top-color: #75859f"> 103</td>
-                            <td style="border-top-color: #75859f"> 104</td>
-                            <td style="border-top-color: #75859f"> 104</td>
-                            <td style="border-top-color: #75859f"> 304</td>
-                            <td style="border-top-color: #75859f"> 201</td>
-                            <td style="border-top-color: #75859f"> 302</td>
-                            <td style="border-top-color: #75859f"> 303</td>
-                            <td style="border-top-color: #75859f"> 304</td>
-                            <td style="border-top-color: #75859f"> 302</td>
-                            <td style="border-top-color: #75859f"> 302</td>
-                            <td style="border-top-color: #75859f"> 302</td>
-                            <td style="border-top-color: #75859f"> 302</td>
-                        </tr>
-                        <tr>
-                            <td style="border-top-color: #75859f"> 101</td>
-                            <td style="border-top-color: #75859f"> 102</td>
-                            <td style="border-top-color: #75859f"> 103</td>
-                            <td style="border-top-color: #75859f"> 104</td>
-                            <td style="border-top-color: #75859f"> 104</td>
-                            <td style="border-top-color: #75859f"> 304</td>
-                            <td style="border-top-color: #75859f"> 201</td>
-                            <td style="border-top-color: #75859f"> 302</td>
-                            <td style="border-top-color: #75859f"> 303</td>
-                            <td style="border-top-color: #75859f"> 304</td>
-                            <td style="border-top-color: #75859f"> 302</td>
-                            <td style="border-top-color: #75859f"> 302</td>
-                            <td style="border-top-color: #75859f"> 302</td>
-                            <td style="border-top-color: #75859f"> 302</td>
-                        </tr>
-                    </list>
-                    </tbody>
-                </table>
+                </list>
+                </tbody>
+            </table>
         </div>
     </div>
     <br/>
 
     <div class="weui-btn-area"  style="display: grid;">
-        <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:">一键通知</a>
+        <p id="btnRB" class="weui-btn weui-btn_primary" href="javascript:">一键通知</p>
+        <p id="return" class="weui-btn weui-btn_primary" href="javascript:">返&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;回</p>
     </div>
 </div>
+<#include "/home/frag.foot.ftl" />
+<script>
+    $('#return').on('click', function () {
+        window.location.href = "/yeweihui/home.html#tab2"
+        // alert("日报");
+    });
+</script>
 

whepi-ui/templates/yeweihui/ribao.js

@@ -1,6 +1,11 @@
 function ribao_init() {
   $('#btnRB').on('click', function () {
-    alert("日报");
+      window.location.href = "/yeweihui/ribao.html"
+    // alert("日报");
+  });
+  $('#return').on('click', function () {
+      window.location.href = "/yeweihui/home.html#tab2"
+    // alert("日报");
   });
 
 

whepi-ui/templates/yeweihui/ribaoDy.ftl

@@ -0,0 +1,40 @@
+
+
+<div class="page__bd">
+    <header class="demos-header">
+        <h1 class="demos-title">每日上报</h1>
+    </header>
+
+    <div class="weui-btn-area"  style="display: grid;">
+        <section style="display: grid;">
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:">1栋6单元</a>
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋6单元</a>
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋6单元</a>
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋6单元</a>
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋6单元</a>
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋6单元</a>
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋6单元</a>
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋6单元</a>
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋6单元</a>
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋6单元</a>
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋5单元</a>
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋5单元</a>
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋5单元</a>
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋67单元</a>
+            <a id="btnRB" class="weui-btn weui-btn_primary" href="javascript:window.onload">1栋9单元</a>
+        </section>
+
+    </div>
+
+</div>
+

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

@@ -29,7 +29,7 @@ public class HomeController {
 
     @GetMapping("/home/home.html")
     public ModelAndView home(ModelMap model) {
-        UserOpen userOpen = homeService.getUserOpen();
+        //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

@@ -32,4 +32,18 @@ public class YeWeiHuiController {
 
         return new ModelAndView("/yeweihui/home.ftl", model);
     }
+
+    @GetMapping("/yeweihui/ribao.html")
+    public ModelAndView yeweihuiRibao(ModelMap model) {
+
+        Map<String, Object> queryParam = Maps.newLinkedHashMap();
+        queryParam.put("userId", "12345677");
+        queryParam.put("statistics", "M");
+
+        List<QzTask> taskList = qzTaskService.selectAll();
+
+        model.put("taskList", YvanUtil.toJsonPretty(taskList));
+
+        return new ModelAndView("/yeweihui/ribao.ftl", model);
+    }
 }

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

@@ -41,7 +41,7 @@ yvan:
     #qrcode_match_cust_expire_second: 10800
 
     #bofeng9999 / 789456hh
-    domain: http://epi.qtws.xyz
+    domain: http://caller.whyxzz.com.cn
     tmpTicketExpireSeconds: 10800
     templates:
       预定信息: 'MLNz8YVi7zofQOBeLS0Ruhr-3fJpTnfsKjyPeDB879s'

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

@@ -43,7 +43,7 @@ endpoints:
 #  whitelabel.enabled: false
 
 spring:
-  profiles.active: dev
+  profiles.active: guojing
 
   application:
     name: whepi-web