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

Helius

2021-09-26 858466c28185d1900c6ef332e5b0e4bc9e7701dd

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

@@ -87,36 +87,13 @@
                    openAccount(data.id);
                });
            }

            if (layEvent === 'edit') {
                febs.modal.open('身份认证', 'modules/member/memberDetail/' + data.id, {
                    btn: ['提交', '取消'],
                    yes: function (index, layero) {
                        $('#user-update').find('#submit').trigger('click');
                    },
                    btn2: function () {
                        layer.closeAll();
                    }
                });
            }
            if (layEvent === 'see') {
                febs.modal.open( '个人信息', 'modules/mallMember/detail/' + data.id, {
                    maxmin: true,
                });
            }
            if (layEvent === 'addCoin') {
                febs.modal.open( '拨币', 'modules/member/addCoin/' + data.id, {
                    btn: ['提交', '取消'],
                    yes: function (index, layero) {
                        $('#user-update').find('#submit').trigger('click');
                    },
                    btn2: function () {
                        layer.closeAll();
                    }
                });
            }
            if (layEvent === 'examine') {
                febs.modal.open( '个人数据详情', 'modules/member/memberDetailInfo/' + data.inviteId, {
            if (layEvent === 'moneyFlow') {
                febs.modal.open( '用户资金流水', 'modules/mallMember/moneyFlow/' + data.id, {
                    maxmin: true,
                });
            }
@@ -155,7 +132,7 @@
                url: ctx + 'admin/mallMember/getMallMemberList',
                cols: [[
                    {field: 'phone', title: '手机号', minWidth: 150,align:'left'},
                    {field: 'email', title: '邮箱', minWidth: 150,align:'left'},
                    // {field: 'email', title: '邮箱', minWidth: 150,align:'left'},
                    {field: 'name', title: '名称', minWidth: 100,align:'left'},
                    {field: 'inviteId', title: '邀请码', minWidth: 100,align:'left'},
                    {field: 'referrerId', title: '推荐人邀请码', minWidth: 100,align:'left'},
@@ -185,10 +162,12 @@
                            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'}