修改文字

whepi-ui/templates/home/tuangouHome.ftl

@@ -0,0 +1,25 @@
+<#assign title="我的团购"/>
+<#include "/home/frag.head.ftl" />
+
+<#include "/home/buy.ftl" />
+
+</body>
+
+<#include "/home/frag.foot.ftl" />
+<script>
+    (function ($) {
+
+        $(function () {
+            $('.weui-navbar__item').on('click', function () {
+                $(this).addClass('weui-bar__item_on').siblings('.weui-bar__item_on').removeClass('weui-bar__item_on');
+                //内容切换
+                var moduleClass = jQuery(this).attr("module");
+                var ss = ".weui-tab__panel ." + moduleClass + "_weui_tab_bd_item_active";
+                $(ss).removeClass(moduleClass + '_weui_tab_bd_item_active');
+                var data_toggle = jQuery(this).attr("target");
+                $(data_toggle).addClass(moduleClass + "_weui_tab_bd_item_active");
+            });
+        });
+    })(jQuery);
+
+</script>

whepi-ui/templates/user/changeRole.ftl

@@ -72,8 +72,8 @@
             $.alert("请选择用户角色！")
             return false;
         }
-        <#if (type?? )&&(type = 1) >window.location.href = "/user/homeIndex.html?userId=" + $("#userId").val() + "&userType=" + userType;</#if>
-        <#if (type?? )&&(type = 2) >window.location.href = "/user/homeIndex.html?userId=" + $("#userId").val() + "&userType=" + userType;</#if>
+        <#if (type?? )&&(type = 1) >window.location.href = "/user/homeIndex.html?userId=" + $("#userId").val() + "&userType=" + userType + "&type=1";</#if>
+        <#if (type?? )&&(type = 2) >window.location.href = "/user/homeIndex.html?userId=" + $("#userId").val() + "&userType=" + userType + "&type=2";</#if>
 
     }
 </script>

whepi-ui/templates/yeweihui/tuangouHome.ftl

@@ -0,0 +1,26 @@
+<#assign title="我的团购"/>
+<#include "/home/frag.head.ftl" />
+
+<#include "/yeweihui/tuangou.ftl" />
+
+</body>
+
+<#include "/home/frag.foot.ftl" />
+<script>
+    <#include "/yeweihui/tuangou.js" />
+    (function ($) {
+        $(function () {
+            $('.weui-navbar__item').on('click', function () {
+                $(this).addClass('weui-bar__item_on').siblings('.weui-bar__item_on').removeClass('weui-bar__item_on');
+                //内容切换
+                var moduleClass = jQuery(this).attr("module");
+                var ss = ".weui-tab__panel ." + moduleClass + "_weui_tab_bd_item_active";
+                $(ss).removeClass(moduleClass + '_weui_tab_bd_item_active');
+                var data_toggle = jQuery(this).attr("target");
+                $(data_toggle).addClass(moduleClass + "_weui_tab_bd_item_active");
+            });
+
+        });
+    })(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() + "\"");
@@ -100,6 +100,47 @@ public class UserOpenController {
                 model.put("msReport", new JsonWapper(msReport));
                 return new ModelAndView("/home/home.ftl", model);
             } else if (userType == 2) {
+                model.put("type", 1);
+                return new ModelAndView("/user/changeRole.ftl", model);
+            }
+        }
+        return null;
+    }
+
+
+    @ApiOperation("商品团购")
+    @ApiImplicitParams({@ApiImplicitParam(name = "userId", value = "用户ID", required = false, dataType = "Long", paramType = "query"),
+            @ApiImplicitParam(name = "userType", value = "用户类型", required = false, dataType = "Integer", paramType = "query")
+    })
+    @GetMapping("/tuangou/home.html")
+    public ModelAndView tuangouHome(ModelMap model, @RequestParam(value = "userId", required = false, defaultValue = "0") Long userId,
+                             @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);
+            userId = userOpen.getUserId();
+            model.put("user", userOpen);
+            model.put("user_id", "\"" + userOpen.getUserId() + "\"");
+            if (list.size() == 0) {
+                return new ModelAndView("/user/home.ftl", model);
+            }
+            if (list.size() == 1) {
+                return new ModelAndView("/tuangou/home.ftl", model);
+            }
+            if (list.size() == 2) {
+                model.put("type", 2);
+                return new ModelAndView("/user/changeRole.ftl", model);
+            }
+        } else {
+            model.put("user", userOpenMapper.selectByUserId(userId));
+            model.put("user_id", "\"" + userId + "\"");
+            if (userType == 1) {
+                return new ModelAndView("/tuangou/home.ftl", model);
+            } else if (userType == 2) {
+                model.put("type", 2);
                 return new ModelAndView("/user/changeRole.ftl", model);
             }
         }
@@ -108,7 +149,9 @@ public class UserOpenController {
 
     @GetMapping("/user/homeIndex.html")
     public ModelAndView homeIndex(ModelMap model, @RequestParam(value = "userId", required = false, defaultValue = "0") Long userId,
-                                  @RequestParam(value = "userType", required = false, defaultValue = "0") Integer userType, @RequestParam(value = "show", required = false, defaultValue = "-") String show) throws JsonProcessingException {
+                                  @RequestParam(value = "userType", required = false, defaultValue = "0") Integer userType,
+                                  @RequestParam(value = "type", required = false, defaultValue = "1") Integer type,
+                                  @RequestParam(value = "show", required = false, defaultValue = "-") String show) throws JsonProcessingException {
         if (userId != 0 && userType != 0) {
             model.put("user_id", "\"" + userId + "\"");
             List<Uptown> uptowns = rbMapper.selectUptown(userId);
@@ -122,13 +165,18 @@ public class UserOpenController {
                 MsReport msReport = msReportService.getReportByDateNow(userId);
                 model.put("msReport", new JsonWapper(msReport));
                 model.put("show", "\"" + show + "\"");
+                if (type == 2) {
+                    return new ModelAndView("/home/tuangouHome.ftl", model);
+                }
                 return new ModelAndView("/home/home.ftl", model);
             } else if (userType == 2) {
                 List<QzTask> taskList = qzTaskService.selectAll(userId);
                 model.put("taskList", YvanUtil.toJsonPretty(taskList));
                 List<sysUptownUnit> rbList = rbService.selectAll(userId);
                 model.put("rbList", YvanUtil.toJsonPretty(rbList));
-
+                if (type == 2) {
+                    return new ModelAndView("/yeweihui/tuangouHome.ftl", model);
+                }
                 return new ModelAndView("/yeweihui/home.ftl", model);
             }
         }