Merge remote-tracking branch 'origin/master'

whepi-doc/group.sql

@@ -30,7 +30,7 @@ create table jm_tuangou (
     tg_supplier     varchar(20)     NOT NULL DEFAULT ''         COMMENT '团购供应商',
     tg_goods        varchar(50)     NOT NULL DEFAULT ''         COMMENT '团购物资（套餐）',
     tg_price        varchar(20)     NOT NULL DEFAULT ''         COMMENT '价格',
-    tg_min_num      int(11)         NOT NULL DEFAULT 0          COMMENT '最小起订量',
+    tg_min_num      int(11)         NOT NULL DEFAULT 0          COMMENT '最低起送',
     tg_end_time     datetime(0)     NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '团购截止时间',
     tg_deliver_time datetime(0)     NOT NULL DEFAULT CURRENT_TIMESTAMP(0) COMMENT '预计送货时间',
     tg_phone_number varchar(20)     NOT NULL DEFAULT ''         COMMENT '联系人电话',

whepi-ui/templates/groupBuying/groupBuyingCx.ftl

@@ -23,7 +23,7 @@
              
             <p style="text-indent: -0em;margin-left: 2em;">单&nbsp;&nbsp;&nbsp;&nbsp;价:&nbsp;&nbsp;${ tgItem.tgPrice }</p>
             &nbsp;
-            <p style="text-indent: -0em;margin-left: 2em;">最新起定量(份):&nbsp;&nbsp;${ tgItem.tgMinNum }</p>
+            <p style="text-indent: -0em;margin-left: 2em;">最低起送(份):&nbsp;&nbsp;${ tgItem.tgMinNum }</p>
             &nbsp;
             <p id="cx_p_endTime" style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;</p>
             &nbsp;

whepi-ui/templates/groupBuying/groupBuyingJt.ftl

@@ -19,7 +19,7 @@
              
             <p style="text-indent: -0em;margin-left: 2em;">单&nbsp;&nbsp;&nbsp;&nbsp;价:&nbsp;&nbsp;10</p>
             &nbsp;
-            <p style="text-indent: -0em;margin-left: 2em;">最新起定量(份):&nbsp;&nbsp;20</p>
+            <p style="text-indent: -0em;margin-left: 2em;">最低起送(份):&nbsp;&nbsp;20</p>
             &nbsp;
             <p style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;2020-02-11</p>
             &nbsp;

whepi-ui/templates/groupBuying/groupBuyingQx.ftl

@@ -19,7 +19,7 @@
              
             <p style="text-indent: -0em;margin-left: 2em;">单&nbsp;&nbsp;&nbsp;&nbsp;价:&nbsp;&nbsp;10</p>
             &nbsp;
-            <p style="text-indent: -0em;margin-left: 2em;">最新起定量(份):&nbsp;&nbsp;20</p>
+            <p style="text-indent: -0em;margin-left: 2em;">最低起送(份):&nbsp;&nbsp;20</p>
             &nbsp;
             <p style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;2020-02-11</p>
             &nbsp;

whepi-ui/templates/groupBuying/groupBuyingXx.ftl

@@ -18,20 +18,21 @@
             </div>
         </div>
         <div>
-
-        <p style="text-indent: -0em;margin-left: 2em;">供应商:&nbsp;&nbsp;${ tgItem.tgSupplier }</p>
-        &nbsp;
-        <p style="text-indent: -0em;margin-left: 2em;">套&nbsp;&nbsp;&nbsp;&nbsp;餐:&nbsp;&nbsp;${ tgItem.tgGoods }</p>
-        &nbsp;
-        <p style="text-indent: -0em;margin-left: 2em;">单&nbsp;&nbsp;&nbsp;&nbsp;价:&nbsp;&nbsp;${ tgItem.tgPrice }</p>
-        &nbsp;
-        <p style="text-indent: -0em;margin-left: 2em;">最新起定量(份):&nbsp;&nbsp;${ tgItem.tgMinNum }</p>
-        &nbsp;
-        <p id="p_endTime" style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;</p>
-        &nbsp;
-        <p id="p_deliverTime" style="text-indent: -0em;margin-left: 2em;">预计送货时间:&nbsp;&nbsp;</p>
-        &nbsp;
-        <p style="text-indent: -0em;margin-left: 2em;">服务电话:&nbsp;&nbsp;${ tgItem.tgPhoneNumber }</p>
+            <p style="text-indent: -0em;margin-left: 2em;">供应商:&nbsp;&nbsp;${ tgItem.tgSupplier }</p>
+            &nbsp;
+            <p style="text-indent: -0em;margin-left: 2em;">套&nbsp;&nbsp;&nbsp;&nbsp;餐:&nbsp;&nbsp;${ tgItem.tgGoods }</p>
+            &nbsp;
+            <p style="text-indent: -0em;margin-left: 2em;">单&nbsp;&nbsp;&nbsp;&nbsp;价:&nbsp;&nbsp;${ tgItem.tgPrice }</p>
+            &nbsp;
+            <p style="text-indent: -0em;margin-left: 2em;">最低起送(份):&nbsp;&nbsp;${ tgItem.tgMinNum }</p>
+            &nbsp;
+            <p id="p_endTime" style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;</p>
+            &nbsp;
+            <p id="p_deliverTime" style="text-indent: -0em;margin-left: 2em;">预计送货时间:&nbsp;&nbsp;</p>
+            &nbsp;
+            <p style="text-indent: -0em;margin-left: 2em;">服务电话:&nbsp;&nbsp;${ tgItem.tgPhoneNumber }</p>
+            &nbsp;
+            <p style="text-indent: -0em;margin-left: 2em;">增补修订:&nbsp;&nbsp;${ tgItem.remark }</p>
         </div>
         <div class="weui-loadmore weui-loadmore_line" style="width: 100%">
             <span class="weui-loadmore__tips">参团情况</span>

whepi-ui/templates/yeweihui/tgPublish.ftl

@@ -1,4 +1,4 @@
-<#assign title="求助详情"/>
+<#assign title="团购详情"/>
 <#include "/home/frag.head.ftl" />
 
 <div class="weui-tab">
@@ -16,7 +16,7 @@
         <input id="tg_input_goods" class="weui-input" autofocus="" type="text" 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_price" 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>
+        <p class="weui-media-box__desc" style="margin-top: 1vh;">最低起送（份）：</p>
         <input id="tg_input_mixnum" 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;"/>
@@ -73,7 +73,7 @@
 
         let mixnum = $("#tg_input_mixnum").val();
         if (mixnum.length <= 0) {
-            $.alert("请输入最小起订量");
+            $.alert("请输入最低起送");
             return;
         }
 

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

@@ -49,7 +49,7 @@ public class JmTuangou implements Serializable {
     private String tgPrice;
 
     /**
-     * 最小起订量
+     * 最低起送
      */
     private Integer tgMinNum;
 

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

@@ -31,9 +31,9 @@ public class JmTuangouMember {
     private String tgPrice;
 
     /**
-     * 最小起订量
+     * 最低起送
      */
-    @ExcelProperty(value = "最小起订量", index = 4)
+    @ExcelProperty(value = "最低起送", index = 4)
     private Integer tgMinNum;
     /**
      * 小区名称