Merge remote-tracking branch 'origin/master'

whepi-ui/templates/user/changeRole.ftl

@@ -13,7 +13,7 @@
                         <br/>
                         <br/>
                         <br/>
-                        <h1 class="user-title">家园抗击疫情公共服务平台</h1>
+                        <h1 class="user-title">家园互助平台</h1>
                         <br/>
                         <h1 class="user-title"><#if uptown_name ??>${uptown_name!''}</#if></h1>
                         <br/>

whepi-ui/templates/user/home.ftl

@@ -9,7 +9,7 @@
                     <header class="user-header">
                         <br/>
                         <br/>
-                        <h1 class="user-title">家园抗击疫情公共服务平台</h1>
+                        <h1 class="user-title">家园互助平台</h1>
                         <br/>
                         <h1 class="user-title">用户登录</h1>
                     </header>

whepi-ui/templates/yeweihui/tgPublish.ftl

@@ -100,8 +100,7 @@
 
         let itemNum = $("#tg_input_itemNum").val();
         if (itemNum.length <= 0) {
-            $.alert("请输入单人限购");
-            return;
+            itemNum = "0";
         }
 
         let end_time = $("#tg_input_end_time").val();
@@ -164,10 +163,10 @@
             return;
         }
 
-        if (parseInt(itemNum) <= 0) {
-            $.alert("单人限购应大于0");
-            return;
-        }
+        // if (parseInt(itemNum) <= 0) {
+        //     $.alert("单人限购应大于0");
+        //     return;
+        // }
 
         if (parseInt(maxnum) < parseInt(itemNum)) {
             $.alert("最大订量应大于或等于单人限购");

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

@@ -68,7 +68,7 @@ public class UserOpenController {
             UserOpen userOpen = homeService.getUserOpen();
             list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
 //            list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
-//            UserOpen userOpen = userOpenMapper.select ByUserId(1225321682867105793L);
+//            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
             userId = userOpen.getUserId();
             model.put("user", userOpen);
             model.put("user_id", "\"" + userOpen.getUserId() + "\"");