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

Helius

2021-12-17 bdf9983a1e03986e5304d1b87f1c6f80a5d908ed

 src/main/resources/templates/febs/views/videoMember/memberList.html

@@ -98,34 +98,58 @@
                    resetPwd(data.id);
                });
            }

            if (layEvent === 'cancelVip') {
                if(data.isVip == 1){
                    febs.modal.confirm('会员设置', '是否取消用户会员资格？', function () {
                        cancelVip(data.id);
                    });
                }else if(data.isVip == 2){
                    febs.alert.success('当前用户还不是会员，无法取消');
                }else{
                    febs.alert.success('请刷新页面重试');
                }
            }
            if (layEvent === 'setVip') {
                febs.modal.open('系统拨付', 'videoMember/setVip/' + data.id, {
                    btn: ['提交', '取消'],
                    yes: function (index, layero) {
                        $('#setVip-update').find('#submit').trigger('click');
                    },
                    btn2: function () {
                        layer.closeAll();
                    }
                });
                if(data.isVip == 2){
                    febs.modal.open('会员设置', 'videoMember/setVip/' + data.id, {
                        btn: ['提交', '取消'],
                        yes: function (index, layero) {
                            $('#setVip-update').find('#submit').trigger('click');
                        },
                        btn2: function () {
                            layer.closeAll();
                        }
                    });
                }else if(data.isVip == 1){
                    febs.alert.success('当前用户已经是会员，无法重新设置');
                }else{
                    febs.alert.success('请刷新页面重试');
                }
            }
        });
        function closeAccount(id) {
            febs.get(ctx + 'admin/videoMember/closeAccount/' + id, null, function () {
                febs.alert.success('禁用成功');
                febs.alert.success('成功');
                $query.click();
            });
        }
        function openAccount(id) {
            febs.get(ctx + 'admin/videoMember/openAccount/' + id, null, function () {
                febs.alert.success('开启成功');
                febs.alert.success('成功');
                $query.click();
            });
        }

        function resetPwd(id) {
            febs.post(ctx + 'admin/videoMember/resetPwd/' + id, null, function () {
                febs.alert.success('重置成功');
                febs.alert.success('成功');
                $query.click();
            });
        }
        function cancelVip(id) {
            febs.get(ctx + 'admin/videoMember/cancelVip/' + id, null, function () {
                febs.alert.success('成功');
                $query.click();
            });
        }
@@ -189,6 +213,7 @@
                                return '<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="resetPwd" 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="setVip" shiro:hasPermission="user:update">设置会员</button>'
                                    +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="cancelVip" shiro:hasPermission="user:update">取消会员</button>'
                            }else{
                                return'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="resetPwd" shiro:hasPermission="user:update">重置密码</button>'
                                    +'<button class="layui-btn layui-btn-normal layui-btn-xs" lay-event="open" shiro:hasPermission="user:update">启用</button>'