Merge remote-tracking branch 'origin/master'

whepi-ui/templates/home/homeHelp.ftl

@@ -3,7 +3,7 @@
 
 <div class="page__bd" style="height: 300px">
     <div class="container">
-        <img src="/static/homeHelp_1.jpg" style="width: 100%"/>
+        <img src="/static/homeHelp.jpg" style="width: 100%"/>
 </div>
 
 

whepi-ui/templates/home/outHelp.ftl

@@ -0,0 +1,19 @@
+<#assign title="出入管理"/>
+<#include "/home/frag.head.ftl" />
+
+<div class="page__bd" style="height: 300px">
+    <div class="container">
+        <img src="/static/outHelp.jpg" style="width: 100%"/>
+</div>
+
+
+<#include "/home/frag.foot.ftl" />
+
+<script>
+
+    (function ($) {
+
+    })(jQuery);
+
+
+</script>

whepi-web/src/main/java/com/bofeng/wx/WxController.java

@@ -167,17 +167,28 @@ public class WxController {
                                 "/home/adminHelp.html",
                         WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
         );
+
         val btn33 = new WxMenuButton();
-        btn33.setName("简介");
+        btn33.setName("出入管理");
         btn33.setType(WxConsts.MenuButtonType.VIEW);
         btn33.setUrl(
                 wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
+                                "/home/outHelp.html",
+                        WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
+        );
+
+        val btn34 = new WxMenuButton();
+        btn34.setName("简介");
+        btn34.setType(WxConsts.MenuButtonType.VIEW);
+        btn34.setUrl(
+                wxService.oauth2buildAuthorizationUrl(weChatProperties.getDomain() +
                                 "/home/desc.html",
                         WxConsts.OAuth2Scope.SNSAPI_USERINFO, null)
         );
         btnDesc.getSubButtons().add(btn31);
         btnDesc.getSubButtons().add(btn32);
         btnDesc.getSubButtons().add(btn33);
+        btnDesc.getSubButtons().add(btn34);
 //        btn3.getSubButtons().add(btnDesc);
 //        btn3.getSubButtons().add(btnHelp);
 

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

@@ -247,6 +247,12 @@ public class UserOpenController {
         return new ModelAndView("/home/adminHelp.ftl", model);
     }
 
+    @GetMapping("/home/outHelp.html")
+    public ModelAndView outHelp(ModelMap model) {
+        return new ModelAndView("/home/outHelp.ftl", model);
+    }
+
+
     @GetMapping("/home/testOk.html")
     public ModelAndView testOk(ModelMap model, HttpServletResponse response) {
         response.setHeader("Access-Control-Allow-Credentials", "true");