UI 整理

whepi-ui/templates/groupBuying/groupBuyingCx.ftl

@@ -18,17 +18,17 @@
         </div>
         <div>
             <p style="text-indent: -0em;margin-left: 2em;">供应商:&nbsp;&nbsp;${ tgItem.tgSupplier }</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">套&nbsp;&nbsp;&nbsp;&nbsp;餐:&nbsp;&nbsp;${ tgItem.tgGoods }</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">单&nbsp;&nbsp;&nbsp;&nbsp;价:&nbsp;&nbsp;${ tgItem.tgPrice }</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">最低起送(份):&nbsp;&nbsp;${ tgItem.tgMinNum }</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p id="cx_p_endTime" style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p id="cx_p_deliverTime"style="text-indent: -0em;margin-left: 2em;">预计送货时间:&nbsp;&nbsp;</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">服务电话:&nbsp;&nbsp;${ tgItem.tgPhoneNumber }</p>
         </div>
         <div class="weui-loadmore weui-loadmore_line" style="width: 100%">

whepi-ui/templates/groupBuying/groupBuyingJt.ftl

@@ -14,17 +14,17 @@
         </div>
         <div>
             <p style="text-indent: -0em;margin-left: 2em;">供应商:&nbsp;&nbsp;接口的法国红酒返回打撒借款方和德生科技发送到返回的是否合适看警方海口市</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">套&nbsp;&nbsp;&nbsp;&nbsp;餐:&nbsp;&nbsp;没有套餐</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">单&nbsp;&nbsp;&nbsp;&nbsp;价:&nbsp;&nbsp;10</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">最低起送(份):&nbsp;&nbsp;20</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;2020-02-11</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">预计送货时间:&nbsp;&nbsp;2020-02-10</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">服务电话:&nbsp;&nbsp;12345678912</p>
         </div>
         <div class="weui-loadmore weui-loadmore_line" style="width: 100%">

whepi-ui/templates/groupBuying/groupBuyingQx.ftl

@@ -14,17 +14,17 @@
         </div>
         <div>
             <p style="text-indent: -0em;margin-left: 2em;">供应商:&nbsp;&nbsp;接口的法国红酒返回打撒借款方和德生科技发送到返回的是否合适看警方海口市</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">套&nbsp;&nbsp;&nbsp;&nbsp;餐:&nbsp;&nbsp;没有套餐</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">单&nbsp;&nbsp;&nbsp;&nbsp;价:&nbsp;&nbsp;10</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">最低起送(份):&nbsp;&nbsp;20</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;2020-02-11</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">预计送货时间:&nbsp;&nbsp;2020-02-10</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">服务电话:&nbsp;&nbsp;12345678912</p>
         </div>
         <div class="weui-loadmore weui-loadmore_line" style="width: 100%">

whepi-ui/templates/groupBuying/groupBuyingXx.ftl

@@ -19,19 +19,19 @@
         </div>
         <div>
             <p style="text-indent: -0em;margin-left: 2em;">供应商:&nbsp;&nbsp;${ tgItem.tgSupplier }</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">套&nbsp;&nbsp;&nbsp;&nbsp;餐:&nbsp;&nbsp;${ tgItem.tgGoods }</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">单&nbsp;&nbsp;&nbsp;&nbsp;价:&nbsp;&nbsp;${ tgItem.tgPrice }</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">最低起送(份):&nbsp;&nbsp;${ tgItem.tgMinNum }</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p id="p_endTime" style="text-indent: -0em;margin-left: 2em;">截止时间:&nbsp;&nbsp;</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p id="p_deliverTime" style="text-indent: -0em;margin-left: 2em;">预计送货时间:&nbsp;&nbsp;</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">服务电话:&nbsp;&nbsp;${ tgItem.tgPhoneNumber }</p>
-            &nbsp;
+            <div style="height: 1vh;"></div>
             <p style="text-indent: -0em;margin-left: 2em;">增补修订:&nbsp;&nbsp;${ tgItem.remark }</p>
         </div>
         <div class="weui-loadmore weui-loadmore_line" style="width: 100%">
@@ -61,6 +61,12 @@
                     <div class="weui-cells__title">发货</div>
                 </div>
             </div>
+            <div class="weui-btn-area">
+                <p id="gb_wc2" class="weui-btn weui-btn_primary">完成团购</p>
+            </div>
+            <div style="height: 10vh;">
+
+            </div>
         </#if>
         <#if tgItem.tgStatus==3>
             <div class="weui-btn-area">
@@ -100,6 +106,22 @@
     });
 
     $('#gb_wc').on('click', function () {
+        finish();
+    });
+
+    $('#gb_wc2').on('click', function () {
+        finish();
+    });
+
+    $('#gb_ck').on('click', function () {
+        window.location.href = "/yeweihui/tuangou/member/list.html?jmId=" + tgItem.jmId + "&userId=" + userId;
+    });
+
+    function goback() {
+        window.location.href = "/yeweihui/home.html?show=tuangou&userId=" + userId;
+    }
+
+    function finish() {
         let sendData = {
             jmId: tgItem.jmId,
             status: 3
@@ -121,13 +143,5 @@
                 $.alert("网络异常");
             }
         });
-    });
-
-    $('#gb_ck').on('click', function () {
-        window.location.href = "/yeweihui/tuangou/member/list.html?jmId=" + tgItem.jmId + "&userId=" + userId;
-    });
-
-    function goback() {
-        window.location.href = "/yeweihui/home.html?show=tuangou&userId=" + userId;
     }
 </script>

whepi-ui/templates/yeweihui/home.ftl

@@ -13,9 +13,9 @@
         </div>
         <div id="tab2" class="weui-tab__bd-item">
             <#include "/yeweihui/qiuzhu.ftl" /></div>
-        <#--<div id="tab3" class="weui-tab__bd-item">-->
-            <#--<#include "/yeweihui/tuangou.ftl" />-->
-        <#--</div>-->
+        <div id="tab3" class="weui-tab__bd-item">
+            <#include "/yeweihui/tuangou.ftl" />
+        </div>
     <#--<div id="tab3" class="weui-tab__bd-item">-->
     <#--<h1>页面三</h1> </div>-->
     <#--<div id="tab4" class="weui-tab__bd-item">-->
@@ -30,10 +30,10 @@
             <div class="weui-tabbar__icon"><img src="/static/images/wx/customer_service.png" alt=""></div>
             <p class="weui-tabbar__label">求助</p>
         </a>
-        <#--<a id="tab3a" href="#tab3" class="weui-tabbar__item">-->
-            <#--<div class="weui-tabbar__icon"><img src="/static/images/wx/customer_service.png" alt=""></div>-->
-            <#--<p class="weui-tabbar__label">团购</p>-->
-        <#--</a>-->
+        <a id="tab3a" href="#tab3" class="weui-tabbar__item">
+            <div class="weui-tabbar__icon"><img src="/static/images/wx/customer_service.png" alt=""></div>
+            <p class="weui-tabbar__label">团购</p>
+        </a>
     <#--<a href="#tab3" class="weui-tabbar__item">-->
     <#--<div class="weui-tabbar__icon"> <img src="./images/icon_nav_article.png" alt=""> </div>-->
     <#--<p class="weui-tabbar__label">发现</p>-->

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

@@ -64,10 +64,10 @@ public class UserOpenController {
                              @RequestParam(value = "userType", required = false, defaultValue = "0") Integer userType) throws JsonProcessingException {
         List<UserRole> list = new ArrayList<>();
         if (userId == 0) {
-            UserOpen userOpen = homeService.getUserOpen();
-            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-//            list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
-//            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
+//            UserOpen userOpen = homeService.getUserOpen();
+//            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+            list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
+            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
             userId = userOpen.getUserId();
             model.put("user", userOpen);
             model.put("user_id", "\"" + userOpen.getUserId() + "\"");