Merge branch 'master' of http://git.yvanui.com/hust/wuhan_epi

whepi-doc/login.sql

@@ -80,12 +80,11 @@ CREATE TABLE sys_owner_linkman  (
 ) ENGINE = InnoDB default charset=utf8 comment = '业委会联系人表';
 
 -- ----------------------------
+-- Table structure for sys_uptown_home
 -- ----------------------------
-DROP TABLE IF EXISTS sys_uptown_house;
-CREATE TABLE sys_uptown_house  (
+DROP TABLE IF EXISTS sys_uptown_home;
+CREATE TABLE sys_uptown_home  (
   house_id         bigint(20) NOT NULL DEFAULT 0 COMMENT '门牌ID',
-  uptown_id         bigint(20) NOT NULL DEFAULT 0 COMMENT '小区ID',
   linkman           varchar(10)  NOT NULL DEFAULT '' COMMENT '联系人名称',
   phone             varchar(20)  NOT NULL DEFAULT '' COMMENT '联系人电话',
   young             int(11) NOT NULL DEFAULT 0 COMMENT '家庭年前人数',
@@ -128,4 +127,17 @@ CREATE TABLE sys_uptown  (
   time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
   time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
   PRIMARY KEY (uptown_id) USING BTREE
-) ENGINE = InnoDB default charset=utf8 comment = '小区表';
+) ENGINE = InnoDB default charset=utf8 comment = '小区表';
+
+DROP TABLE IF EXISTS sys_uptown_house;
+CREATE TABLE sys_uptown_house  (
+  house_id         bigint(20) NOT NULL DEFAULT 0 COMMENT '门牌ID',
+  uptown_id         bigint(20) NOT NULL DEFAULT 0 COMMENT '小区ID',
+  ridgepole         varchar(20) NOT NULL DEFAULT '' COMMENT '栋',
+  unit              varchar(20) NOT NULL DEFAULT '' COMMENT '单元',
+  doorplate         varchar(20)  NOT NULL DEFAULT '' COMMENT '门牌',
+  status            int(11) NOT NULL DEFAULT 0 COMMENT '状态:1正常,0草稿,-1删除',
+  time_create       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '新增时间',
+  time_update       datetime(0) NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPDATE CURRENT_TIMESTAMP(0) COMMENT '修改时间',
+  PRIMARY KEY (house_id) USING BTREE
+) ENGINE = InnoDB default charset=utf8 comment = '门牌信息表';

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-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/resources/application.yml

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