Helius
2021-09-27 2c74d176be9d103bf47f69868ca7975a3a73256d
Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
3 files added
19 files modified
413 ■■■■ changed files
src/main/java/cc/mrbird/febs/common/runner/FebsStartedUpRunner.java 2 ●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java 25 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java 14 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/mapper/DataDictionaryCustomMapper.java 3 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java 8 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java 5 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java 14 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/AdminAgentLevelOptionTreeVo.java 13 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/AdminAgentMemberVo.java 29 ●●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/mall/vo/AdminAgentVo.java 2 ●●●●● patch | view | raw | blame | history
src/main/resources/mapper/modules/DataDictionaryCustomMapper.xml 6 ●●●●● patch | view | raw | blame | history
src/main/resources/mapper/modules/MallMemberMapper.xml 10 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/error/403.html 2 ●●● patch | view | raw | blame | history
src/main/resources/templates/error/404.html 2 ●●● patch | view | raw | blame | history
src/main/resources/templates/error/500.html 2 ●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/index.html 140 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/layout.html 3 ●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/login.html 4 ●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/mallMember/agentAllMember.html 55 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/mallMember/agentLevelUpdate.html 6 ●●●●● patch | view | raw | blame | history
src/main/resources/templates/febs/views/modules/mallMember/agentList.html 66 ●●●● patch | view | raw | blame | history
src/main/resources/templates/index.html 2 ●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/common/runner/FebsStartedUpRunner.java
@@ -63,7 +63,7 @@
            log.info("/ /`  / / \\ | |\\/| | |_) | |   | |_   | |  | |_  ");
            log.info("\\_\\_, \\_\\_/ |_|  | |_|   |_|__ |_|__  |_|  |_|__ ");
            log.info("                                                      ");
            log.info("FEBS 权限系统启动完毕,地址:{}", url);
            log.info("全民商城 权限系统启动完毕,地址:{}", url);
            boolean auto = febsProperties.isAutoOpenBrowser();
            if (auto && StringUtils.equalsIgnoreCase(active, FebsConstant.DEVELOP)) {
src/main/java/cc/mrbird/febs/mall/controller/AdminMallMemberController.java
@@ -8,6 +8,8 @@
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.entity.MallOrderRefund;
import cc.mrbird.febs.mall.service.IAdminMallMemberService;
import cc.mrbird.febs.mall.vo.AdminAgentLevelOptionTreeVo;
import cc.mrbird.febs.mall.vo.AdminMallGoodsCategoryTreeVo;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
@@ -15,6 +17,7 @@
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
import java.util.List;
import java.util.Map;
@Slf4j
@@ -152,6 +155,28 @@
        return mallMemberService.agentLevelUpdate(agentLevelUpdateDto);
    }
    /**
     * 代理-等级选择Option
     */
    @GetMapping("getAgentLevelOption/tree")
    @ControllerEndpoint(exceptionMessage = "获取等级失败")
    public List<AdminAgentLevelOptionTreeVo> getAgentLevelOption(){
        return mallMemberService.getAgentLevelOption();
    }
    /**
     * 代理列表-全部成员
     */
    @GetMapping("/agentChild")
    public FebsResponse agentChild(QueryRequest request, MallMember mallMember, Integer parentId) {
        if(parentId==null){
            ViewMallMemberController.idFromAgentAllMember=0;
        }
        mallMember.setId(ViewMallMemberController.idFromAgentAllMember);
        Map<String, Object> dataTable = getDataTable(mallMemberService.agentChild(request, mallMember));
        return new FebsResponse().success().data(dataTable);
    }
}
src/main/java/cc/mrbird/febs/mall/controller/ViewMallMemberController.java
@@ -25,6 +25,8 @@
    public static long idFromMoneyFlow;
    public static long idFromAgentAllMember;
    /**
     * 会员列表
     * @return
@@ -129,6 +131,18 @@
        return FebsUtil.view("modules/mallMember/agentLevelUpdate");
    }
    /**
     * 代理级别-全部成员
     * @param id
     * @param model
     * @return
     */
    @GetMapping("agentAllMember/{id}")
    public String agentAllMember(@PathVariable long id, Model model) {
        idFromAgentAllMember = id;
        return FebsUtil.view("modules/mallMember/agentAllMember");
    }
src/main/java/cc/mrbird/febs/mall/mapper/DataDictionaryCustomMapper.java
@@ -2,6 +2,7 @@
import cc.mrbird.febs.mall.dto.PayMethodDto;
import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
import cc.mrbird.febs.mall.vo.AdminAgentLevelOptionTreeVo;
import cc.mrbird.febs.mall.vo.AdminMallPayMethodEditVo;
import cc.mrbird.febs.mall.vo.AdminPayMethodVo;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -22,4 +23,6 @@
    DataDictionaryCustom selectNextAgentLevelInfo(@Param("level") String agentLevel);
    DataDictionaryCustom selectDicDataByTypeAndCode(@Param("type") String type, @Param("code") String code);
    List<AdminAgentLevelOptionTreeVo> getAgentLevelOption();
}
src/main/java/cc/mrbird/febs/mall/mapper/MallMemberMapper.java
@@ -3,10 +3,7 @@
import cc.mrbird.febs.mall.dto.AgentDto;
import cc.mrbird.febs.mall.dto.AgentLevelDto;
import cc.mrbird.febs.mall.entity.MallMember;
import cc.mrbird.febs.mall.vo.AdminAgentLevelVo;
import cc.mrbird.febs.mall.vo.AdminAgentVo;
import cc.mrbird.febs.mall.vo.MallMemberVo;
import cc.mrbird.febs.mall.vo.TeamListVo;
import cc.mrbird.febs.mall.vo.*;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -52,5 +49,8 @@
    List<MallMember> selectAllChildAgentListByInviteId(@Param("inviteId")String inviteId);
    List<MallMember> selectMemberParentAgentList(@Param("list") List<String> inviteIds);
    IPage<AdminAgentLevelVo> getAgentLevelListInPage(Page<AdminAgentLevelVo> page, @Param("record")AgentLevelDto agentLevelDto);
    IPage<AdminAgentMemberVo> getAgentChildInPage(Page<AdminAgentMemberVo> page, @Param("record")MallMember mallMember);
}
src/main/java/cc/mrbird/febs/mall/service/IAdminMallMemberService.java
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import javax.validation.constraints.NotNull;
import java.util.List;
public interface IAdminMallMemberService extends IService<MallMember> {
@@ -39,4 +40,8 @@
    AdminAgentLevelUpdateInfoVo getAgentLevelUpdateInfoById(long id);
    FebsResponse agentLevelUpdate(AgentLevelUpdateDto agentLevelUpdateDto);
    List<AdminAgentLevelOptionTreeVo> getAgentLevelOption();
    IPage<AdminAgentMemberVo> agentChild(QueryRequest request, MallMember mallMember);
}
src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallMemberServiceImpl.java
@@ -208,4 +208,18 @@
        return new FebsResponse().success();
    }
    @Override
    public List<AdminAgentLevelOptionTreeVo> getAgentLevelOption() {
        return dataDictionaryCustomMapper.getAgentLevelOption();
    }
    @Override
    public IPage<AdminAgentMemberVo> agentChild(QueryRequest request, MallMember mallMember) {
        Long memberId = mallMember.getId();
        mallMember = mallMemberMapper.selectById(memberId);
        Page<AdminAgentMemberVo> page = new Page<>(request.getPageNum(), request.getPageSize());
        IPage<AdminAgentMemberVo> adminAgentMemberVos = this.baseMapper.getAgentChildInPage(page, mallMember);
        return adminAgentMemberVos;
    }
}
src/main/java/cc/mrbird/febs/mall/vo/AdminAgentLevelOptionTreeVo.java
New file
@@ -0,0 +1,13 @@
package cc.mrbird.febs.mall.vo;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@Data
@ApiModel(value = "AdminAgentLevelOptionTreeVo", description = "信息返回类")
public class AdminAgentLevelOptionTreeVo {
    private Long id;
    private String name;
}
src/main/java/cc/mrbird/febs/mall/vo/AdminAgentMemberVo.java
New file
@@ -0,0 +1,29 @@
package cc.mrbird.febs.mall.vo;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@Data
@ApiModel(value = "AdminAgentMemberVo", description = "信息返回类")
public class AdminAgentMemberVo {
    private Long id;
    private String name;
    private String phone;
    private String level;
    private String levelName;
    /**
     * 邀请码
     */
    private String inviteId;
    /**
     * 父级邀请码
     */
    private String referrerId;
}
src/main/java/cc/mrbird/febs/mall/vo/AdminAgentVo.java
@@ -15,6 +15,8 @@
    private String level;
    private String levelName;
    /**
     * 邀请码
     */
src/main/resources/mapper/modules/DataDictionaryCustomMapper.xml
@@ -28,4 +28,10 @@
        select * from data_dictionary_custom a
        where a.type=#{type} and a.code=#{code}
    </select>
    <select id="getAgentLevelOption" resultType="cc.mrbird.febs.mall.vo.AdminAgentLevelOptionTreeVo">
        select a.code id,a.description name from data_dictionary_custom a
        where a.type='AGENT_LEVEL'
    </select>
</mapper>
src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -115,7 +115,8 @@
    </select>
    <select id="getAgentListInPage" resultType="cc.mrbird.febs.mall.vo.AdminAgentVo">
        SELECT * FROM mall_member m
        SELECT m.*,a.description levelName FROM mall_member m
        left join data_dictionary_custom a on a.code = m.level
        <where>
            <if test="record != null" >
                <if test="record.name!=null and record.name!=''">
@@ -129,6 +130,7 @@
                </if>
            </if>
        </where>
        group by m.id
        order by m.CREATED_TIME desc
    </select>
@@ -160,4 +162,10 @@
        ORDER BY
            a.CREATED_TIME DESC
    </select>
    <select id="getAgentChildInPage" resultType="cc.mrbird.febs.mall.vo.AdminAgentMemberVo">
        select m.*,a.description levelName from mall_member m
            left join data_dictionary_custom a on a.code = m.level
        where  find_in_set(#{record.inviteId}, m.referrer_ids)
    </select>
</mapper>
src/main/resources/templates/error/403.html
@@ -2,7 +2,7 @@
<html xmlns:th="http://www.thymeleaf.org">
<head>
    <meta charset="utf-8">
    <title>FEBS 权限系统</title>
    <title>全民商城 权限系统</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
src/main/resources/templates/error/404.html
@@ -2,7 +2,7 @@
<html xmlns:th="http://www.thymeleaf.org">
<head>
    <meta charset="utf-8">
    <title>FEBS 权限系统</title>
    <title>全民商城 权限系统</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
src/main/resources/templates/error/500.html
@@ -2,7 +2,7 @@
<html xmlns:th="http://www.thymeleaf.org">
<head>
    <meta charset="utf-8">
    <title>FEBS 权限系统</title>
    <title>全民商城 权限系统</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
src/main/resources/templates/febs/views/index.html
@@ -128,146 +128,6 @@
                </div>
            </div>
        </div>
        <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
            <div class="layui-card">
                <div class="layui-card-body">
                    <table class="project-table">
                        <tr>
                            <td style="padding: .8rem;">进行中的项目</td>
                            <td style="padding: .8rem;text-align: right">
                                <a target="_blank" href="https://github.com/wuyouzhuguli?tab=repositories">所有项目</a>
                            </td>
                        </tr>
                        <tr>
                            <td class="project-table-td">
                                <div class="layui-row">
                                    <div class="layui-col-md12 layui-col-xs12">
                                        <div class="layui-row">
                                            <div class="layui-col-md12">
                                                <a target="_blank" href="https://github.com/wuyouzhuguli/FEBS-Cloud">FEBS
                                                    Cloud</a>
                                            </div>
                                            <div class="project-desc">
                                                Spring Cloud 微服务权限管理系统。
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </td>
                            <td class="project-table-td">
                                <div class="layui-row">
                                    <div class="layui-col-md12 layui-col-xs12">
                                        <div class="layui-row">
                                            <div class="layui-col-md12">
                                                <a target="_blank" href="https://github.com/wuyouzhuguli/FEBS-Cloud-Web">FEBS
                                                    Cloud Web</a>
                                            </div>
                                            <div class="project-desc">
                                                FEBS-Cloud前端,使用 vue-element-admin 构建。
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </td>
                        </tr>
                        <tr>
                            <td class="project-table-td">
                                <div class="layui-row">
                                    <div class="layui-col-md12 layui-col-xs12">
                                        <div class="layui-row">
                                            <div class="layui-col-md12">
                                                <a target="_blank" href="https://github.com/wuyouzhuguli/FEBS-Shiro">FEBS
                                                    Shiro</a>
                                            </div>
                                            <div class="project-desc">
                                                Spring Boot 2.0.4 & Shiro1.4.0 权限管理系统。
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </td>
                            <td class="project-table-td">
                                <div class="layui-row">
                                    <div class="layui-col-md12 layui-col-xs12">
                                        <div class="layui-row">
                                            <div class="layui-col-md12">
                                                <a target="_blank" href="https://github.com/wuyouzhuguli/FEBS-Security">FEBS
                                                    Security</a>
                                            </div>
                                            <div class="project-desc">
                                                Spring Boot 2.0.4 & Spring Security 5.0.7 权限管理系统。
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </td>
                        </tr>
                        <tr>
                            <td class="project-table-td">
                                <div class="layui-row">
                                    <div class="layui-col-md12 layui-col-xs12">
                                        <div class="layui-row">
                                            <div class="layui-col-md12">
                                                <a target="_blank" href="https://github.com/wuyouzhuguli/FEBS-Actuator">FEBS
                                                    Cloud K8S</a>
                                            </div>
                                            <div class="project-desc">
                                                FEBS Cloud K8S集群部署脚本。
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </td>
                            <td class="project-table-td">
                                <div class="layui-row">
                                    <div class="layui-col-md12 layui-col-xs12">
                                        <div class="layui-row">
                                            <div class="layui-col-md12">
                                                <a target="_blank" href="https://github.com/wuyouzhuguli/SpringAll">SpringAll</a>
                                            </div>
                                            <div class="project-desc">
                                                循序渐进学习Spring Boot、Spring Cloud与Spring Security。
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </td>
                        </tr>
                        <tr>
                            <td class="project-table-td">
                                <div class="layui-row">
                                    <div class="layui-col-md12 layui-col-xs12">
                                        <div class="layui-row">
                                            <div class="layui-col-md12">
                                                <a target="_blank" href="https://github.com/wuyouzhuguli/FEBS-Vue">FEBS
                                                    Vue</a>
                                            </div>
                                            <div class="project-desc">
                                                FEBS-Shiro前后端分离版本,前端架构采用Vue全家桶。
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </td>
                            <td class="project-table-td">
                                <div class="layui-row">
                                    <div class="layui-col-md12 layui-col-xs12">
                                        <div class="layui-row">
                                            <div class="layui-col-md12">
                                                <a target="_blank" href="https://github.com/wuyouzhuguli/FEBS-Actuator">FEBS Actuator</a>
                                            </div>
                                            <div class="project-desc">
                                                使用Spring Boot Admin 2.0.2构建,用于监控FEBS。
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </td>
                        </tr>
                    </table>
                </div>
            </div>
        </div>
    </div>
</div>
<script data-th-inline="javascript" type="text/javascript">
src/main/resources/templates/febs/views/layout.html
@@ -26,7 +26,6 @@
                    <dl class="layui-nav-child">
                        <dd><a class="layui-nav-child-href" id="user-profile">个人中心</a></dd>
                        <dd><a class="layui-nav-child-href" id="password-update">密码修改</a></dd>
                        <dd><a class="layui-nav-child-href" target="_blank" href="https://github.com/wuyouzhuguli/FEBS-Shiro">项目地址</a></dd>
                        <hr/>
                        <dd><a class="layui-nav-child-href" data-th-href="@{logout}">退出登录</a></dd>
                    </dl>
@@ -65,7 +64,7 @@
        <div class="layui-side-scroll">
            <div class="layui-logo" style="cursor: pointer">
                <img data-th-src="@{febs/images/logo.png}">
                <span>FEBS 权限系统</span>
                <span>全民商城 权限系统</span>
            </div>
            <script
                    type="text/html"
src/main/resources/templates/febs/views/login.html
@@ -2,7 +2,7 @@
<html xmlns:th="http://www.thymeleaf.org">
<head>
    <meta charset="utf-8">
    <title>FEBS 权限系统</title>
    <title>全民商城 权限系统</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@@ -19,7 +19,7 @@
        <div class="layui-container">
            <div class="layui-row">
                <div class="layui-col-xs12 layui-col-lg4 layui-col-lg-offset4 febs-tc">
                    <div class="layui-logo"><span><b>FEBS</b> 权限系统</span></div>
                    <div class="layui-logo"><span><b>全民商城</b> 权限系统</span></div>
                </div>
                <div class="layui-col-xs12 layui-col-lg4 layui-col-lg-offset4" id="login-div">
                    <div class="layui-form" lay-filter="login-form">
src/main/resources/templates/febs/views/modules/mallMember/agentAllMember.html
New file
@@ -0,0 +1,55 @@
<div class="layui-fluid layui-anim febs-anim" id="febs-agent-child" lay-title="全部成员">
    <div class="layui-row febs-container">
        <div class="layui-col-md12">
            <div class="layui-card">
                <div class="layui-card-body febs-table-full">
                    <table lay-filter="agentChild" lay-data="{id: 'agentChild'}"></table>
                </div>
            </div>
        </div>
    </div>
</div>
<script data-th-inline="none" type="text/javascript">
    layui.use(['dropdown', 'jquery', 'laydate', 'form', 'table', 'febs', 'treeSelect' ,'eleTree'], function () {
        var $ = layui.jquery,
            laydate = layui.laydate,
            febs = layui.febs,
            form = layui.form,
            table = layui.table,
            treeSelect = layui.treeSelect,
            dropdown = layui.dropdown,
            $view = $('#febs-agent-child'),
            $query = $view.find('#queryChild'),
            $searchForm = $view.find('formChild'),
            sortObject = {field: 'createTime', type: null},
            tableIns,
            createTimeFrom,
            createTimeTo;
        form.render();
        initTable();
        laydate.render({
            elem: '#user-createTime',
            range: true,
            trigger: 'click'
        });
        function initTable() {
            tableIns = febs.table.init({
                elem: $view.find('table'),
                id: 'agentChild',
                url: ctx + 'admin/mallMember/agentChild?parentId=1',
                cols: [[
                    {field: 'name', title: '姓名', minWidth: 150,align:'center'},
                    {field: 'phone', title: '电话', minWidth: 150,align:'center'},
                    {field: 'inviteId', title: '邀请码', minWidth: 150,align:'center'},
                    {field: 'levelName', title: '等级', minWidth: 150,align:'center'},
                ]]
            });
        }
    })
</script>
src/main/resources/templates/febs/views/modules/mallMember/agentLevelUpdate.html
@@ -55,12 +55,18 @@
            </div>
        </div>
        <div class="layui-form-item">
            <div style="text-align:center;color: red">提示:【团队收益】如果选择【比例】,请输入百分比数字,如:80%,请输入80</div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label febs-form-item-require">团队收益:</label>
            <div class="layui-input-block">
                <input type="number" name="teamIncome" class="layui-input">
            </div>
        </div>
        <div class="layui-form-item">
            <div style="text-align:center;color: red">提示:【直推收益】请输入百分比数字,如:80%,请输入80</div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label febs-form-item-require">直推收益:</label>
            <div class="layui-input-block">
                <input type="number" name="directIncome" class="layui-input">
src/main/resources/templates/febs/views/modules/mallMember/agentList.html
@@ -22,8 +22,12 @@
                                        <div class="layui-input-inline">
                                            <select name="level">
                                                <option value="">请选择</option>
                                                <option value="FIRST_LEVEL">FIRST_LEVEL</option>
                                                <option value="SECOND_LEVEL">SECOND_LEVEL</option>
                                                <option value="FIRST_LEVEL">普通会员</option>
                                                <option value="SECOND_LEVEL">业务经理</option>
                                                <option value="THIRD_LEVEL">区域代理</option>
                                                <option value="FOUR_LEVEL">代理</option>
                                                <option value="FIFTH_LEVEL">总代</option>
                                                <option value="SIX_LEVEL">董事</option>
                                            </select>
                                        </div>
                                    </div>
@@ -77,40 +81,12 @@
        table.on('tool(userAgentTable)', function (obj) {
            var data = obj.data,
                layEvent = obj.event;
            // if (layEvent === 'close') {
            //     febs.modal.confirm('禁用', '确认禁用该账号?', function () {
            //         closeAccount(data.id);
            //     });
            // }
            // if (layEvent === 'open') {
            //     febs.modal.confirm('开启', '确认开启该账号?', function () {
            //         openAccount(data.id);
            //     });
            // }
            // if (layEvent === 'see') {
            //     febs.modal.open( '个人信息', 'modules/mallMember/detail/' + data.id, {
            //         maxmin: true,
            //     });
            // }
            // if (layEvent === 'moneyFlow') {
            //     febs.modal.open( '用户资金流水', 'modules/mallMember/moneyFlow/' + data.id, {
            //         maxmin: true,
            //     });
            // }
            if (layEvent === 'agentAllMember') {
                febs.modal.open( '全部成员', 'modules/mallMember/agentAllMember/' + data.id, {
                    maxmin: true,
                });
            }
        });
        // function closeAccount(id) {
        //     febs.get(ctx + 'admin/mallMember/closeAccount/' + id, null, function () {
        //         febs.alert.success('禁用成功');
        //         $query.click();
        //     });
        // }
        // function openAccount(id) {
        //     febs.get(ctx + 'admin/mallMember/openAccount/' + id, null, function () {
        //         febs.alert.success('开启成功');
        //         $query.click();
        //     });
        // }
        // 查询按钮
        $query.on('click', function () {
@@ -134,23 +110,13 @@
                    {field: 'phone', title: '手机号', minWidth: 150,align:'left'},
                    {field: 'name', title: '名称', minWidth: 100,align:'left'},
                    {field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
                    {field: 'level', title: '代理层级', minWidth: 100,align:'left'},
                    {field: 'levelName', title: '代理层级', minWidth: 100,align:'left'},
                    {field: 'memberNum', title: '下级', minWidth: 100,align:'left'},
                    {field: 'allMemberNum', title: '我的团队总数', minWidth: 100,align:'left'},
                    // {title: '操作',
                    //     templet: function (d) {
                    //         if (d.accountStatus === 1) {
                    //             return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="see" shiro:hasPermission="user:update">详情</button>'
                    //                 +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="close" shiro:hasPermission="user:update">禁用</button>'
                    //                 +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="moneyFlow" shiro:hasPermission="user:update">资金流水</button>'
                    //
                    //         }else{
                    //             return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="see" shiro:hasPermission="user:update">详情</button>'
                    //                 +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="open" shiro:hasPermission="user:update">启用</button>'
                    //                 +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="moneyFlow" shiro:hasPermission="user:update">资金流水</button>'
                    //
                    //         }
                    //     },minWidth: 300,align:'center'}
                    {title: '操作',
                        templet: function (d) {
                                return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agentAllMember" shiro:hasPermission="user:update">全部成员</button>'
                        },minWidth: 300,align:'center'}
                ]]
            });
        }
src/main/resources/templates/index.html
@@ -3,7 +3,7 @@
      xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
    <meta charset="utf-8">
    <title>FEBS 权限系统</title>
    <title>全民商城 权限系统</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">