maoyunfeng 5 years ago
parent
commit
d93077ad9e

+ 9 - 5
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>

+ 0 - 0
whepi-ui/templates/home/help.ftl


+ 8 - 2
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);

+ 68 - 11
whepi-ui/templates/home/qiuzhu.ftl

@@ -1,26 +1,83 @@
 <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 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>
+
+
+            <#--<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>
             </div>
+
             <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>
+                    </div>
+                    <div class="weui-cell__ft">
+                        <input class="weui-switch" type="checkbox">
+                    </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>
+                    <div class="weui-media-box weui-media-box_text">
+                    <#--<h4 class="weui-media-box__title">标题二</h4>-->
+                        <p class="weui-media-box__desc">由各种物质组成的巨型球状天体,叫做星球。星球有一定的形状,有自己的运行轨道。</p>
+                    </div>
+                </div>
             </div>
         </div>
     </div>
-    <div class="weui-btn-area">
-        <a id="btnQZ" class="weui-btn weui-btn_primary" href="javascript:">求助</a>
-    </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>

+ 4 - 7
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>

+ 1 - 1
whepi-ui/templates/home/ribao.js

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

+ 12 - 7
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");
+            });
         });
+
     });
 
     <#--console.log('ssssss');-->

+ 4 - 7
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 class="weui-btn-area">
                     <a id="btnQZ" class="weui-btn weui-btn_primary" href="javascript:">查询</a>
                 </div>

+ 3 - 3
whepi-ui/templates/yeweihui/ribao.ftl

@@ -7,13 +7,13 @@
     <div class="weui-tab">
         <div class="weui-navbar">
             <a class="weui-navbar__item weui-bar__item_on" target="#rb_nav1">
-                待报
+                待报<br/>
             </a>
             <a class="weui-navbar__item" target="#rb_nav2">
-                异常
+                异常<br/>
             </a>
             <a class="weui-navbar__item" target="#rb_nav3">
-                已报
+                已报<br/>
             </a>
         </div>
         <div class="weui-tab__panel">

+ 0 - 0
whepi-ui/templates/yeweihui/ribaoXq.ftl


+ 4 - 4
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);
     }
 }

+ 73 - 0
whepi-web/src/main/resources/application-guojing.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: guojing
+    appID: wx81e126249bb5eba0
+    appsecret: 3cbd25a7a93332cbe76dec1d9667aa9a
+
+#    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://guojing.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

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

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