修改bug

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

@@ -9,18 +9,22 @@
     <link rel="stylesheet" href="${s3('/jquery-weui/1.2.1/css/jquery-weui.min.css')}" type="text/css">
     <style>
         .demos-header {
-            padding: 20px 0 10px 0;
+            padding: 15px 0 5px 0;
+            background-color: #16ae9d;
         }
 
         .demos-title {
             text-align: center;
-            font-size: 34px;
-            color: #3cc51f;
-            font-weight: 400;
+            font-size: 30px;
+            color: white;
+            font-weight: 300;
             margin: 0 15%;
         }
         html,body{height: 100%;}
-        .weui_tab_bd_item_active {
+        .ri_bao_weui_tab_bd_item_active {
+            display: block !important;
+        }
+        .qiu_zhu_weui_tab_bd_item_active {
             display: block !important;
         }
     </style>

whepi-ui/templates/home/home.ftl

@@ -39,17 +39,23 @@
 <script>
     <#include "/home/ribao.js" />
     <#include "/home/qiuzhu.js" />
+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');
             //内容切换
-            $(".weui-tab__panel .weui_tab_bd_item_active").removeClass('weui_tab_bd_item_active');
+            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("weui_tab_bd_item_active");
+            $(data_toggle).addClass(moduleClass + "_weui_tab_bd_item_active");
         });
     });
 
+    console.log(userid);
+
     ribao_init();
     qiuzhu_init();
 })(jQuery);

whepi-ui/templates/home/qiuzhu.ftl

@@ -1,18 +1,15 @@
 <div class="page__bd">
-    <header class="demos-header">
-        <h1 class="demos-title">求助</h1>
-    </header>
     <div class="weui-tab">
         <div class="weui-navbar">
-            <a class="weui-navbar__item weui-bar__item_on" target="#qz_nav1">
+            <a class="weui-navbar__item weui-bar__item_on" target="#qz_nav1" module="qiu_zhu">
                 小区求助
             </a>
-            <a class="weui-navbar__item" target="#qz_nav2">
+            <a class="weui-navbar__item" target="#qz_nav2" module="qiu_zhu">
                 我的求助
             </a>
         </div>
         <div class="weui-tab__panel">
-            <div id="qz_nav1" class="weui-tab__bd-item weui_tab_bd_item_active">
+            <div id="qz_nav1" class="weui-tab__bd-item qiu_zhu_weui_tab_bd_item_active">
                 内容一
             </div>
             <div id="qz_nav2" class="weui-tab__bd-item">

whepi-ui/templates/home/ribao.ftl

@@ -1,23 +1,20 @@
 
 
 <div class="page__bd">
-    <header class="demos-header">
-        <h1 class="demos-title">日报</h1>
-    </header>
     <div class="weui-tab">
         <div class="weui-navbar">
-            <a class="weui-navbar__item weui-bar__item_on" target="#rb_nav1">
+            <a class="weui-navbar__item weui-bar__item_on" target="#rb_nav1" module="ri_bao">
                 今日报告
             </a>
-            <a class="weui-navbar__item" target="#rb_nav2">
+            <a class="weui-navbar__item" target="#rb_nav2" module="ri_bao">
                 健康日历
             </a>
         </div>
         <div class="weui-tab__panel">
-            <div id="rb_nav1" class="weui-tab__bd-item weui_tab_bd_item_active">
+            <div id="rb_nav1" class="weui-tab__bd-item ri_bao_weui_tab_bd_item_active">
                 内容一
             </div>
-            <div id="rb_nav2" class="weui-tab__bd-item">
+            <div id="rb_nav2" class="weui-tab__bd-item ">
                 内容二
             </div>
         </div>

whepi-ui/templates/home/ribao.js

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

whepi-ui/templates/yeweihui/home.ftl

@@ -1,4 +1,4 @@
-<#assign title="我的家"/>
+<#assign title="业委会"/>
 <#include "/home/frag.head.ftl" />
 
 <div class="weui-tab">
@@ -41,13 +41,18 @@
     <#include "/yeweihui/qiuzhu.js" />
 (function ($) {
     $(function(){
-        $('.weui-navbar__item').on('click', function () {
-            $(this).addClass('weui-bar__item_on').siblings('.weui-bar__item_on').removeClass('weui-bar__item_on');
-            //内容切换
-            $(".weui-tab__panel .weui_tab_bd_item_active").removeClass('weui_tab_bd_item_active');
-            var data_toggle =jQuery(this).attr("target");
-            $(data_toggle).addClass("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");
+            });
         });
+
     });
 
     ribao_init();

whepi-ui/templates/yeweihui/qiuzhu.ftl

@@ -1,21 +1,18 @@
 <div class="page__bd">
-    <header class="demos-header">
-        <h1 class="demos-title">求助</h1>
-    </header>
     <div class="weui-tab">
         <div class="weui-navbar">
-            <a class="weui-navbar__item weui-bar__item_on" target="#qz_nav1">
+            <a class="weui-navbar__item weui-bar__item_on" target="#qz_nav1" module="qiu_zhu">
                 未处理
             </a>
-            <a class="weui-navbar__item" target="#qz_nav2">
+            <a class="weui-navbar__item" target="#qz_nav2" module="qiu_zhu">
                 已处理
             </a>
-            <a class="weui-navbar__item" target="#qz_nav3">
+            <a class="weui-navbar__item" target="#qz_nav3" module="qiu_zhu">
                 处理中
             </a>
         </div>
         <div class="weui-tab__panel">
-            <div id="qz_nav1" class="weui-tab__bd-item weui_tab_bd_item_active">
+            <div id="qz_nav1" class="weui-tab__bd-item qiu_zhu_weui_tab_bd_item_active">
                 内容一
             </div>
             <div id="qz_nav2" class="weui-tab__bd-item">

whepi-ui/templates/yeweihui/ribao.ftl

@@ -1,23 +1,20 @@
 
 
 <div class="page__bd">
-    <header class="demos-header">
-        <h1 class="demos-title">每日上报</h1>
-    </header>
     <div class="weui-tab">
         <div class="weui-navbar">
-            <a class="weui-navbar__item weui-bar__item_on" target="#rb_nav1">
+            <a class="weui-navbar__item weui-bar__item_on" target="#rb_nav1" module="ri_bao">
                 待报
             </a>
-            <a class="weui-navbar__item" target="#rb_nav2">
+            <a class="weui-navbar__item" target="#rb_nav2" module="ri_bao">
                 异常
             </a>
-            <a class="weui-navbar__item" target="#rb_nav3">
+            <a class="weui-navbar__item" target="#rb_nav3" module="ri_bao">
                 已报
             </a>
         </div>
         <div class="weui-tab__panel">
-            <div id="rb_nav1" class="weui-tab__bd-item weui_tab_bd_item_active">
+            <div id="rb_nav1" class="weui-tab__bd-item ri_bao_weui_tab_bd_item_active">
                 内容一
             </div>
             <div id="rb_nav2" class="weui-tab__bd-item">

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

@@ -23,11 +23,11 @@ public class HomeController {
     @GetMapping("/home/home.html")
     public ModelAndView home(ModelMap model) {
 
-        Map<String, Object> queryParam = Maps.newLinkedHashMap();
-        queryParam.put("userId", "12345677");
-        queryParam.put("statistics", "M");
+//        Map<String, Object> queryParam = Maps.newLinkedHashMap();
+//        queryParam.put("userId", "12345677");
+//        queryParam.put("statistics", "M");
 
-        model.put("user", "{}");
+        model.put("user", new JsonWapper("{\"www\": \"er\"}"));
         return new ModelAndView("/home/home.ftl", model);
     }
 }