admin 2月15号

whepi-ui/templates/home/buyClient.ftl

@@ -98,7 +98,7 @@
     <#--返回-->
     function buyBack() {
         // window.history.back();
-        window.location.href = "/user/homeIndex.html?userId=" + $('#buyuserId').val() + "&userType=" + 1 + "&show=tuangou";
+        window.location.href = "/user/homeIndex.html?userId=" + $('#buyuserId').val() + "&userType=" + 1 + "&show=tuangou"+"&type="+2;
     }
 
     /*撤销*/

whepi-ui/templates/home/home.ftl

@@ -8,8 +8,8 @@
             <#include "/home/ribao.ftl" /></div>
         <div id="tab2" class="weui-tab__bd-item">
             <#include "/home/qiuzhu.ftl" /></div>
-        <div id="tab3" class="weui-tab__bd-item">
-    <#include "/home/buy.ftl" /></div>
+       <#-- <div id="tab3" class="weui-tab__bd-item">
+    <#include "/home/buy.ftl" /></div>-->
     <#--<div id="tab4" class="weui-tab__bd-item">-->
     <#--<h1>页面四</h1> </div>-->
     </div>
@@ -22,10 +22,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="jt3" href="#tab3" class="weui-tabbar__item" onclick="buyGroup()">
+      <#--  <a id="jt3" href="#tab3" class="weui-tabbar__item" onclick="buyGroup()">
             <div class="weui-tabbar__icon"><img src="/static/images/wx/upload.png" alt=""></div>
             <p class="weui-tabbar__label">商品团购</p>
-        </a>
+        </a>-->
     <#--<a href="#tab4" class="weui-tabbar__item">-->
     <#--<div class="weui-tabbar__icon"> <img src="./images/icon_nav_cell.png" alt=""> </div>-->
     <#--<p class="weui-tabbar__label">我</p>-->
@@ -84,20 +84,20 @@
         });
 
 
-        function selectTab() {
-            $("#tab1").removeClass('weui-tab__bd-item--active');
-            $("#jt1").removeClass('weui-bar__item--on');
-            $("#tab3").addClass('weui-tab__bd-item--active');
-            $("#jt3").addClass('weui-bar__item--on');
-            buyGroup();
-        }
+        <#--function selectTab() {-->
+            <#--$("#tab1").removeClass('weui-tab__bd-item--active');-->
+            <#--$("#jt1").removeClass('weui-bar__item--on');-->
+            <#--$("#tab3").addClass('weui-tab__bd-item--active');-->
+            <#--$("#jt3").addClass('weui-bar__item--on');-->
+            <#--buyGroup();-->
+        <#--}-->
 
-        var show = ${show!'"-"'};
+        <#--var show = ${show!'"-"'};-->
 
-        if (show == 'tuangou') {
-            selectTab();
+        <#--if (show == 'tuangou') {-->
+            <#--selectTab();-->
 
-        }
+        <#--}-->
     })(jQuery);
 
 

whepi-ui/templates/home/tuangouHome.ftl

@@ -1,8 +1,24 @@
 <#assign title="我的团购"/>
 <#include "/home/frag.head.ftl" />
 
-<#include "/home/buy.ftl" />
-
+<#--<#include "/home/buy.ftl" />-->
+<div class="weui-tab">
+    <input id="userId" type="text" hidden="hidden" value=${user_id!}/>
+    <div class="weui-tab__bd">
+        <div id="tab3" class="weui-tab__bd-item weui-tab__bd-item--active">
+    <#include "/home/buy.ftl" /></div>
+    </div>
+    <div class="weui-tabbar">
+        <a id="jt3" href="#tab3" class="weui-tabbar__item" onclick="buyGroup()">
+            <div class="weui-tabbar__icon"><img src="/static/images/wx/upload.png" alt=""></div>
+            <p class="weui-tabbar__label">商品团购</p>
+        </a>
+    <#--<a href="#tab4" class="weui-tabbar__item">-->
+    <#--<div class="weui-tabbar__icon"> <img src="./images/icon_nav_cell.png" alt=""> </div>-->
+    <#--<p class="weui-tabbar__label">我</p>-->
+    <#--</a>-->
+    </div>
+</div>
 </body>
 
 <#include "/home/frag.foot.ftl" />
@@ -20,6 +36,22 @@
                 $(data_toggle).addClass(moduleClass + "_weui_tab_bd_item_active");
             });
         });
+
+      /*  function selectTab() {
+           /!* $("#tab1").removeClass('weui-tab__bd-item--active');
+            $("#jt1").removeClass('weui-bar__item--on');*!/
+            $("#tab3").addClass('weui-tab__bd-item--active');
+            $("#jt3").addClass('weui-bar__item--on');
+            buyGroup();
+        }
+
+        var show = ${show!'"-"'};
+
+        if (show == 'tuangou') {
+            selectTab();
+        }*/
+        buyGroup();
+
     })(jQuery);
 
 </script>

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() + "\"");
@@ -120,8 +120,8 @@ public class UserOpenController {
         if (userId == 0) {
             UserOpen userOpen = homeService.getUserOpen();
             list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-//            list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
-//            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
+          /*  list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
+            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);*/
             userId = userOpen.getUserId();
             model.put("user", userOpen);
             model.put("user_id", "\"" + userOpen.getUserId() + "\"");

whepi-web/src/main/resources/mapper/BuyMapper.xml

@@ -15,7 +15,7 @@
        from sys_user_role a
        INNER JOIN sys_uptown_house b on a.property_id=b.house_id
        INNER JOIN sys_uptown_unit c on b.unit_id=c.unit_id
-       where a.user_id=#{userId} and a.role_id=1) ORDER BY jt.tg_end_time DESC
+       where a.user_id=#{userId} and a.role_id=1 limit 1 ) ORDER BY jt.tg_end_time DESC
     </select>
 
     <select id="MyGroup" resultType="com.bofeng.entity.Buy">