Merge branch 'blnka' of http://120.27.238.55:7000/r/xc-mall into blnka

KKSU

2024-02-26 9b0211dcf5bf657307b72f7fb1e9c2e607ecc35c

 src/main/resources/templates/febs/views/modules/mallMember/mallMemberList.html

@@ -19,16 +19,16 @@
                                            <input type="text" placeholder="手机号码" name="account" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
<!--                                    <div class="layui-inline">-->
<!--                                        <label class="layui-form-label layui-form-label-sm">账户状态</label>-->
<!--                                        <div class="layui-input-inline">-->
<!--                                            <select name="accountStatus">-->
<!--                                                <option value="">请选择</option>-->
<!--                                                <option value="1">正常</option>-->
<!--                                                <option value="2">禁用</option>-->
<!--                                            </select>-->
<!--                                        </div>-->
<!--                                    </div>-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label layui-form-label-sm">会员类型</label>
                                        <div class="layui-input-inline">
                                            <select name="level">
                                                <option value="">请选择</option>
                                                <option value="ZERO_LEVEL">普通用户</option>
                                                <option value="FIRST_LEVEL">城市合伙人</option>
                                            </select>
                                        </div>
                                    </div>
<!--                                    <div class="layui-inline">-->
<!--                                        <label class="layui-form-label layui-form-label-sm">会员类型</label>-->
<!--                                        <div class="layui-input-inline">-->
@@ -95,22 +95,26 @@
    <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="switchDirector">
    {{# } }}
</script>

<script type="text/html" id="isSalesmanSwitch">
    {{# if(d.isSale === 1) { }}
    <input type="checkbox" value={{d.id}} lay-text="是|否" checked lay-skin="switch" lay-filter="isSalesmanSwitch">
    {{# } else { }}
    <input type="checkbox" value={{d.id}} lay-text="是|否" lay-skin="switch" lay-filter="isSalesmanSwitch">
    {{# } }}
</script>
<style>
    .layui-form-onswitch {
        background-color: #5FB878 !important;
    }
</style>
<!--<script type="text/html" id="toolbar">-->
<!--    <div class="layui-btn-container">-->
<!--        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="registMember">添加会员</button>-->
<!--        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="balance">拨付余额</button>-->
<!--        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="score">拨付赠送积分</button>-->
<!--        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="prizeScore">拨付竞猜积分</button>-->
<!--        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="resetPwd">重置登录密码</button>-->
<!--        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="resetPayPwd">重置支付密码</button>-->
<!--        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="agentLevel">设置代理等级</button>-->
<!--    </div>-->
<!--</script>-->
<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="updateReferer">修改推荐人</button>
        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="updateVipLevel">修改会员等级</button>
        <button class="layui-btn layui-btn-normal layui-btn-sm" type="button" lay-event="addCoupon">优惠券派送</button>
    </div>
</script>
<!-- 表格操作栏 end -->
<script data-th-inline="none" type="text/javascript">
    // 引入组件并初始化
@@ -135,6 +139,12 @@
        table.on('tool(userTable)', function (obj) {
            var data = obj.data,
                layEvent = obj.event;

            if (layEvent === 'memberOut') {
                febs.modal.confirm('注销', '确认注销该账号？', function () {
                    memberOut(data.id);
                });
            }

            if (layEvent === 'close') {
                febs.modal.confirm('禁用', '确认禁用该账号？', function () {
@@ -189,19 +199,15 @@
                });
            }

            if (layEvent == 'updateReferer') {
                febs.modal.open( '修改推荐人', 'modules/mallMember/updateReferer/' + data.id, {
                    btn: ['提交', '取消'],
                    yes: function (index, layero) {
                        $('#referer-update').find('#submit').trigger('click');
                    },
                    btn2: function () {
                        layer.closeAll();
                    }
                });
            }


        });
        function memberOut(id) {
            febs.get(ctx + 'admin/mallMember/memberOut/' + id, null, function () {
                febs.alert.success('操作成功');
                $query.click();
            });
        }
        function closeAccount(id) {
            febs.get(ctx + 'admin/mallMember/closeAccount/' + id, null, function () {
                febs.alert.success('禁用成功');
@@ -235,6 +241,26 @@
            });
        }

        form.on('switch(isSalesmanSwitch)', function (data) {
            if (data.elem.checked) {
                upSale(data.value);
            } else {
                downSale(data.value);
            }
        })

        function upSale(id) {
            febs.get(ctx + 'admin/mallMember/upSale/' + id, null, function () {
                febs.alert.success('操作成功');
                $query.click();
            });
        }
        function downSale(id) {
            febs.get(ctx + 'admin/mallMember/downSale/' + id, null, function () {
                febs.alert.success('操作成功');
                $query.click();
            });
        }

        // 查询按钮
        $query.on('click', function () {
@@ -254,21 +280,21 @@
                elem: $view.find('table'),
                id: 'userTable',
                url: ctx + 'admin/mallMember/getMallMemberList',
                // toolbar:"#toolbar",
                toolbar:"#toolbar",
                defaultToolbar:[],
                cols: [[
                    // {type: 'checkbox'},
                    {type: 'checkbox'},
                    {field: 'phone', title: '手机号码', minWidth: 150,align:'left'},
                    {field: 'name', title: '用户昵称', minWidth: 100,align:'left'},
                    {field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
                    {field: 'balance', title: '余额', minWidth: 100,align:'left'},
                    // {field: 'score', title: '赠送积分', minWidth: 100,align:'left'},
                    // {field: 'prizeScore', title: '竞猜积分', minWidth: 100,align:'left'},
                    {field: 'prizeScore', title: '积分', minWidth: 100,align:'left'},
                    // {field: 'commission', title: '佣金', minWidth: 100,align:'left'},
                    {field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
                    {field: 'levelName', title: '会员等级', minWidth: 100,align:'left'},
                    // {field: 'referrerName', title: '推荐人', minWidth: 100,align:'left'},
                    {field: 'levelName', title: '会员类型', minWidth: 100,align:'left'},
                    {field: 'salesmansName', title: '推销员', minWidth: 100,align:'left'},
                    // {field: 'storeMaster', title: '店长', templet:'#switchStoreMaster', minWidth: 100},
                    {field: 'isSalesman', title: '推销员设置', templet: '#isSalesmanSwitch', minWidth: 100,align:'center'},
                    // {field: 'director', title: '总监', templet:'#switchDirector', minWidth: 100},
                    // {field: 'accountType', title: '账号类型',
                    //     templet: function (d) {
@@ -296,11 +322,11 @@
                    {field: 'createdTime', title: '注册时间', minWidth: 180,align:'center'},
                    {title: '操作',
                        templet: function (d) {
                            return  '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="agentSelect" shiro:hasPermission="user:update">推销员设置</button>'
                                // '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="moneyFlow" shiro:hasPermission="user:update">资金流水</button>'
                            return  ''
                                +'<button class="layui-btn layui-btn-normal layui-btn-xs febs-bg-red" lay-event="memberOut" shiro:hasPermission="user:update">注销</button>'
                                // + '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="addLeader" shiro:hasPermission="user:update">设置为团长</button>'

                        },minWidth: 200,align:'center', fixed:"right"}
                        },minWidth: 200,align:'center'}
                ]]
            });
        }
@@ -327,6 +353,43 @@
            if (checkData.length <= 0) {
                febs.alert.warn('请选择需要的用户');
                return;
            }

            if (layEvent == 'updateReferer') {
                if (checkData.length > 1) {
                    febs.alert.warn('每次只能修改一个用户');
                    return;
                }
                febs.modal.open( '修改推荐人', 'modules/mallMember/updateReferer/' + checkData[0].id, {
                    btn: ['提交', '取消'],
                    yes: function (index, layero) {
                        $('#referer-update').find('#submit').trigger('click');
                    },
                    btn2: function () {
                        layer.closeAll();
                    }
                });
            }

            if (layEvent === 'updateVipLevel') {
                var checkData = table.checkStatus('userTable').data;
                if (checkData.length > 1) {
                    febs.alert.warn('每次只能修改一个用户');
                    return;
                }
                // var idList = [];
                // for (var i = 0; i < checkData.length; i++) {
                //     idList.push(checkData[i].id);
                // }
                febs.modal.open('设置会员等级', 'modules/mallMember/vipLevelSetting/' + checkData[0].id, {
                    btn: ['确认', '取消'],
                    yes: function (index, layero) {
                        $('#vip-level-set').find('#submit').trigger('click');
                    },
                    btn2: function () {
                        layer.closeAll();
                    }
                });
            }

            if (layEvent === 'resetPwd') {
@@ -382,6 +445,18 @@
                    }
                });
            }

            if (layEvent === 'addCoupon') {
                febs.modal.open('添加优惠券', 'modules/mallMember/addCoupon/' + checkData[0].id, {
                    btn: ['确认', '取消'],
                    yes: function (index, layero) {
                        $('#member-coupon-select').find('#submit').trigger('click');
                    },
                    btn2: function () {
                        layer.closeAll();
                    }
                });
            }
        });

        function systemPay(text, id, type) {
@@ -401,7 +476,7 @@
            return {
                name: $searchForm.find('input[name="name"]').val().trim(),
                account: $searchForm.find('input[name="account"]').val().trim(),
                accountStatus: $searchForm.find("select[name='accountStatus']").val(),
                level: $searchForm.find("select[name='level']").val(),
                // level: $searchForm.find("select[name='level']").val(),
            };
        }