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

admin-ui/app/whepi/tugou/dialogTugou.js

@@ -107,7 +107,7 @@ define(function (require) {
             }],
             [{
               name: 'tgItemNum',
-              label: '单人限额',
+              label: '个人限额',
               readonly: context.isEdit != 1 ? true : false,
               maxlength: 6, validType: 'integer',
               width: 450, height: 35,

admin-ui/app/whepi/tugou/tugou.js

@@ -279,7 +279,7 @@ define(function (require) {
                     },
                     {
                       field: 'tgItemNum',
-                      title: '单人限额',
+                      title: '个人限额',
                       align: 'left',
                     },
                     {

whepi-doc/group.sql

@@ -57,4 +57,4 @@ ADD  time_update    datetime(0)     NOT NULL DEFAULT CURRENT_TIMESTAMP(0) ON UPD
 ADD  role_type      int(11)         NOT NULL DEFAULT 0          COMMENT '角色类型  0 业委会角色 1 指挥部' AFTER tg_min_num;
 
 ALTER TABLE jm_tuangou
-    ADD  tg_item_num      int(11)         NOT NULL DEFAULT 0          COMMENT '单人限额' after tg_max_num;
+    ADD  tg_item_num      int(11)         NOT NULL DEFAULT 0          COMMENT '个人限额' after tg_max_num;

whepi-ui/templates/groupBuying/groupBuyingCx.ftl

@@ -27,7 +27,7 @@
             <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">最大订量(份):&nbsp;&nbsp;${ tgItem.tgMaxNum }</p>
             <div style="height: 1vh;"></div>
-            <p id="cx_p_tgItemNum" style="text-indent: -0em;margin-left: 2em;">单人限额(份):&nbsp;&nbsp;</p>
+            <p id="cx_p_tgItemNum" style="text-indent: -0em;margin-left: 2em;">个人限额(份):&nbsp;&nbsp;</p>
             <div style="height: 1vh;"></div>
             <p id="cx_p_endTime" style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;</p>
             <div style="height: 1vh;"></div>

whepi-ui/templates/groupBuying/groupBuyingXx.ftl

@@ -28,7 +28,7 @@
             <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">最大订量(份):&nbsp;&nbsp;${ tgItem.tgMaxNum }</p>
             <div style="height: 1vh;"></div>
-            <p id="p_tgItemNum" style="text-indent: -0em;margin-left: 2em;">单人限额(份):&nbsp;&nbsp;</p>
+            <p id="p_tgItemNum" style="text-indent: -0em;margin-left: 2em;">个人限额(份):&nbsp;&nbsp;</p>
             <div style="height: 1vh;"></div>
             <p id="p_endTime" style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;</p>
             <div style="height: 1vh;"></div>

whepi-ui/templates/home/buyClient.ftl

@@ -12,7 +12,7 @@
     </div>
 
     <div class="weui-flex__item" id="xe1">
-        <div style="display: inline;align-items: flex-end">单人限额:</div>
+        <div style="display: inline;align-items: flex-end">个人限额:</div>
         <div style="display: inline;margin-top: 1vh;" id="xe"></div>
     </div>
     <div class="weui-flex__item" id="tc1">
@@ -188,7 +188,7 @@
                     $.alert("团购套餐只剩" + $('#tc').html() + "份");
                     return false;
                 } else if (data.data == 4) {
-                    $.alert("团购数量已经超过单人限额");
+                    $.alert("团购数量已经超过个人限额");
                     return false;
                 }
                 buyBack();

whepi-ui/templates/yeweihui/tgPublish.ftl

@@ -17,11 +17,11 @@
         <p class="weui-media-box__desc" style="margin-top: 1vh;">单价（元）：</p>
         <input id="tg_input_price" onkeyup="clearNoNum(this)" class="weui-input" autofocus="" type="number" placeholder="请输入" maxlength="50" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;" />
         <p class="weui-media-box__desc" style="margin-top: 1vh;">最低起送（份）：</p>
-        <input id="tg_input_minnum" class="weui-input" autofocus="" type="number" placeholder="请输入" maxlength="50" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;" />
+        <input id="tg_input_minnum" class="weui-input" autofocus="" type="number" placeholder="不填为没有起送量" maxlength="50" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;" />
         <p class="weui-media-box__desc" style="margin-top: 1vh;">最大订量（份）：</p>
-        <input id="tg_input_maxnum" class="weui-input" autofocus="" type="number" placeholder="请输入" maxlength="50" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;" />
-        <p class="weui-media-box__desc" style="margin-top: 1vh;">单人限购（份）：</p>
-        <input id="tg_input_itemNum" class="weui-input" autofocus="" type="number" placeholder="请输入" maxlength="50" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;" />
+        <input id="tg_input_maxnum" class="weui-input" autofocus="" type="number" placeholder="不填为没有上限" maxlength="50" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;" />
+        <p class="weui-media-box__desc" style="margin-top: 1vh;">个人限额（份）：</p>
+        <input id="tg_input_itemNum" class="weui-input" autofocus="" type="number" placeholder="不填为没有限额" maxlength="50" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;" />
         <p class="weui-media-box__desc" style="margin-top: 1vh;">截止时间：</p>
         <input id="tg_input_end_time" type="text" placeholder="请选择时间" style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;"/>
         <p class="weui-media-box__desc" style="margin-top: 1vh;">预计送货时间：</p>
@@ -89,13 +89,11 @@
 
         let minnum = $("#tg_input_minnum").val();
         if (minnum.length <= 0) {
-            $.alert("请输入最低起送");
-            return;
+            minnum = "0";
         }
         let maxnum = $("#tg_input_maxnum").val();
         if (maxnum.length <= 0) {
-            $.alert("请输入最大订量");
-            return;
+            maxnum = "0";
         }
 
         let itemNum = $("#tg_input_itemNum").val();
@@ -149,14 +147,14 @@
         }
 
         if (itemNum.length > 4) {
-            $.alert("单人限购最大为9999");
+            $.alert("个人限额最大为9999");
             return;
         }
 
-        if (parseInt(minnum) <= 0) {
-            $.alert("最低起送量应大于0");
-            return;
-        }
+        // if (parseInt(minnum) <= 0) {
+        //     $.alert("最低起送量应大于0");
+        //     return;
+        // }
 
         if (parseInt(maxnum) < parseInt(minnum)) {
             $.alert("最大订量应大于或等于最低起送量");
@@ -164,12 +162,12 @@
         }
 
         // if (parseInt(itemNum) <= 0) {
-        //     $.alert("单人限购应大于0");
+        //     $.alert("个人限额应大于0");
         //     return;
         // }
 
         if (parseInt(maxnum) < parseInt(itemNum)) {
-            $.alert("最大订量应大于或等于单人限购");
+            $.alert("最大订量应大于或等于个人限额");
             return;
         }
 

whepi-web/src/main/java/com/bofeng/entity/JmTuangou.java

@@ -62,7 +62,7 @@ public class JmTuangou implements Serializable {
      */
     private Integer tgMaxNum = 0;
     /**
-     * 单人限额
+     * 个人限额
      */
     private Integer tgItemNum = 0;