From 71d0fae3ac7113f813a73fdbcd76a608fce30e38 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 16 Jul 2020 15:50:33 +0800
Subject: [PATCH] 20200716  代码提交

---
 src/main/resources/templates/febs/views/modules/member/member.html |  289 ++++++++++++++++-----------------------------------------
 1 files changed, 80 insertions(+), 209 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/member/member.html b/src/main/resources/templates/febs/views/modules/member/member.html
index e987cae..4d807d3 100644
--- a/src/main/resources/templates/febs/views/modules/member/member.html
+++ b/src/main/resources/templates/febs/views/modules/member/member.html
@@ -13,40 +13,14 @@
                                         </div>
                                     </div>
                                     <div class="layui-inline">
-                                        <label class="layui-form-label layui-form-label-sm">创建时间</label>
-                                        <div class="layui-input-inline">
-                                            <input type="text" name="createTime" id="user-createTime" 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="accountType">
-                                                <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="accountStatus">
-                                                <option value=""></option>
-                                                <option value="0">禁用</option>
-                                                <option value="1">正常</option>
-                                            </select>
-                                        </div>
-                                    </div>
-                                    <div class="layui-inline">
-                                        <label class="layui-form-label layui-form-label-sm">实名状态</label>
+                                        <label class="layui-form-label layui-form-label-sm">审核状态</label>
                                         <div class="layui-input-inline">
                                             <select name="certifyStatus">
-                                                <option value=""></option>
+                                                <option value="">请选择</option>
                                                 <option value="0">未通过</option>
-                                                <option value="1">审核中</option>
+                                                <option value="1">待审核</option>
                                                 <option value="2">审核通过</option>
-                                                <option value="2">未实名</option>
+                                                <option value="3">未实名</option>
                                             </select>
                                         </div>
                                     </div>
@@ -59,10 +33,6 @@
                                 <div class="layui-btn layui-btn-sm layui-btn-primary febs-button-green-plain table-action" id="reset">
                                     <i class="layui-icon">&#xe79b;</i>
                                 </div>
-                                <div class="layui-btn layui-btn-sm layui-btn-primary table-action action-more"
-                                     shiro:hasAnyPermissions="user:add,user:update,user:password:reset,user:export">
-                                    <i class="layui-icon">&#xe875;</i>
-                                </div>
                             </div>
                         </div>
                     </form>
@@ -72,48 +42,13 @@
         </div>
     </div>
 </div>
-<!-- 表格字段状态格式化 start -->
-<script type="text/html" id="certify-status">
-    {{#
-    var certifyStatus = {
-    0: {title: '未通过', color: 'red'},
-    1: {title: '审核中', color: 'blue'},
-    2: {title: '审核通过', color: 'green'},
-    3: {title: '未实名', color: 'cyan'}
-    }[d.certifyStatus];
-    }}
-    <span class="layui-badge febs-tag-{{certifyStatus.color}}">{{ certifyStatus.title }}</span>
-</script>
-<script type="text/html" id="account-type">
-    {{#
-    var accountType = {
-    2: {title: '正常账号'},
-    1: {title: '测试账号'}
-    }[d.accountType];
-    }}
-    <span>{{ accountType.title }}</span>
-</script>
-<script type="text/html" id="account-status">
-    {{#
-    var accountStatus = {
-    1: {title: '正常', color : 'blue'},
-    0: {title: '禁用', color : 'red'}
-    }[d.accountStatus];
-    }}
-    <span class="layui-badge febs-bg-{{accountStatus.color}}">{{ accountStatus.title }}</span>
-</script>
-<!-- 表格字段状态格式化 start -->
-
 <!-- 表格操作栏 start -->
 <script type="text/html" id="user-option">
     <span shiro:lacksPermission="user:view,user:update,user:delete">
         <span class="layui-badge-dot febs-bg-orange"></span> 无权限
     </span>
-    <a lay-event="detail" shiro:hasPermission="user:view"><i
-            class="layui-icon febs-edit-area febs-green">&#xe7a5;</i></a>
     <a lay-event="edit" shiro:hasPermission="user:update"><i
-            class="layui-icon febs-edit-area febs-blue">&#xe7a4;</i></a>
-    <a lay-event="del" shiro:hasPermission="user:delete"><i class="layui-icon febs-edit-area febs-red">&#xe7f9;</i></a>
+            class="layui-icon febs-edit-area febs-blue">&#xe7a5;</i></a>
 </script>
 <!-- 表格操作栏 end -->
 <script data-th-inline="none" type="text/javascript">
@@ -124,127 +59,26 @@
             febs = layui.febs,
             form = layui.form,
             table = layui.table,
-            treeSelect = layui.treeSelect,
             dropdown = layui.dropdown,
             $view = $('#febs-user'),
             $query = $view.find('#query'),
             $reset = $view.find('#reset'),
             $searchForm = $view.find('form'),
-            sortObject = {field: 'createTime', type: null},
-            tableIns,
-            createTimeFrom,
-            createTimeTo;
+            sortObject = {field: 'phone', type: null},
+            tableIns;
 
         form.render();
 
         // 表格初始化
         initTable();
 
-        // 时间组件
-        laydate.render({
-            elem: '#user-createTime',
-            range: true,
-            trigger: 'click'
-        });
-
-        // 新增下拉组件
-        dropdown.render({
-            elem: $view.find('.action-more'),
-            click: function (name, elem, event) {
-                var checkStatus = table.checkStatus('userTable');
-                if (name === 'add') {
-                    febs.modal.open('新增用户', 'system/user/add', {
-                        btn: ['提交', '重置'],
-                        area: $(window).width() <= 750 ? '95%' : '50%',
-                        offset: '30px',
-                        yes: function (index, layero) {
-                            $('#user-add').find('#submit').trigger('click');
-                        },
-                        btn2: function () {
-                            $('#user-add').find('#reset').trigger('click');
-                            return false;
-                        }
-                    });
-                }
-                if (name === 'delete') {
-                    if (!checkStatus.data.length) {
-                        febs.alert.warn('请选择需要删除的用户');
-                    } else {
-                        febs.modal.confirm('删除用户', '确定删除该用户?', function () {
-                            var userIds = [];
-                            layui.each(checkStatus.data, function (key, item) {
-                                userIds.push(item.userId)
-                            });
-                            deleteUsers(userIds.join(','));
-                        });
-                    }
-                }
-                if (name === 'reset') {
-                    if (!checkStatus.data.length) {
-                        febs.alert.warn('请选择需要重置密码的用户');
-                    } else {
-                        var usernames = [];
-                        layui.each(checkStatus.data, function (key, item) {
-                            usernames.push(item.username)
-                        });
-                        febs.post(ctx + 'user/password/reset/' + usernames.join(','), null, function () {
-                            febs.alert.success('所选用户密码已重置为1234qwer');
-                        });
-                    }
-                }
-                if (name === 'export') {
-                    var params = $.extend(getQueryParams(), {field: sortObject.field, order: sortObject.type});
-                    params.pageSize = $view.find(".layui-laypage-limits option:selected").val();
-                    params.pageNum = $view.find(".layui-laypage-em").next().html();
-                    febs.download(ctx + 'user/excel', params, '用户信息表.xlsx');
-                }
-            },
-            options: [{
-                name: 'add',
-                title: '新增用户',
-                perms: 'user:add'
-            }, {
-                name: 'delete',
-                title: '删除用户',
-                perms: 'user:delete'
-            }, {
-                name: 'reset',
-                title: '密码重置',
-                perms: 'user:password:reset'
-            }, {
-                name: 'export',
-                title: '导出Excel',
-                perms: 'user:export'
-            }]
-        });
-
-        // 下拉框选择器
-        treeSelect.render({
-            elem: $view.find('#dept'),
-            type: 'get',
-            data: ctx + 'dept/select/tree',
-            placeholder: '请选择',
-            search: false
-        });
-
         // 初始化表格操作栏各个按钮功能
         table.on('tool(userTable)', function (obj) {
             var data = obj.data,
                 layEvent = obj.event;
-            if (layEvent === 'detail') {
-                febs.modal.view('用户信息', 'system/user/detail/' + data.username, {
-                    area: $(window).width() <= 750 ? '95%' : '660px'
-                });
-            }
-            if (layEvent === 'del') {
-                febs.modal.confirm('删除用户', '确定删除该用户?', function () {
-                    deleteUsers(data.userId);
-                });
-            }
+            
             if (layEvent === 'edit') {
-                febs.modal.open('修改用户', 'system/user/update/' + data.username, {
-                    area: $(window).width() <= 750 ? '90%' : '50%',
-                    offset: '30px',
+                febs.modal.open('身份认证', 'modules/member/memberDetail/' + data.id, {
                     btn: ['提交', '取消'],
                     yes: function (index, layero) {
                         $('#user-update').find('#submit').trigger('click');
@@ -254,7 +88,24 @@
                     }
                 });
             }
+            if (layEvent === 'see') {
+			   febs.modal.open( '身份认证', 'modules/member/memberDetail/' + 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();
+                   }
+               });
+             }
         });
+        
 
         // 查询按钮
         $query.on('click', function () {
@@ -265,10 +116,7 @@
         // 刷新按钮
         $reset.on('click', function () {
             $searchForm[0].reset();
-            treeSelect.revokeNode('dept');
             sortObject.type = 'null';
-            createTimeTo = null;
-            createTimeFrom = null;
             tableIns.reload({where: getQueryParams(), page: {curr: 1}, initSort: sortObject});
         });
 
@@ -278,48 +126,71 @@
                 id: 'userTable',
                 url: ctx + 'member/getList',
                 cols: [[
-                    {type: 'checkbox'},
-                    {field: 'phone', title: '手机号', minWidth: 165},
-                    {field: 'email', title: '邮箱', minWidth: 200},
-                    {field: 'inviteId', title: '邀请码'},
-                    {field: 'refererId', title: '上级邀请码'},
-                    {title: '账号类型', templet: '#account-type'},
-                    {title: '账号状态', templet: '#account-status'},
-                    {title: '审核状态', templet: '#certify-status'},
-                    {field: 'createTime', title: '注册时间', minWidth: 180},
-                    {title: '操作', toolbar: '#user-option', minWidth: 140, fixed : 'right'}
+                    {field: 'phone', title: '手机号', minWidth: 100,align:'left'},
+                    {field: 'email', title: '邮箱', minWidth: 200,align:'left'},
+                    {field: 'realName', title: '姓名', minWidth: 200,align:'left'},
+                    {field: 'inviteId', title: '邀请码UID', minWidth: 80,align:'center'},
+                    {field: 'refererId', title: '上级邀请码UID', minWidth: 80,align:'center'},
+                    {field: 'accountType', title: '账号类型',
+                    	templet: function (d) {
+                            if (d.accountType === 2) {
+                                return '<span style="color:green;">测试账号</span>'
+                            } else if (d.accountType === 1) {
+                                return '<span style="color:red;">正常账号</span>'
+                            }else{
+                                return ''
+                            }
+                        }, minWidth: 80,align:'center'},
+                    {field: 'refererId', title: '账号状态',
+                        	templet: function (d) {
+                                if (d.accountStatus === 1) {
+                                    return '<span style="color:green;">正常</span>'
+                                } else if (d.accountStatus === 0) {
+                                    return '<span style="color:red;">禁用</span>'
+                                }else{
+                                    return ''
+                                }
+                            }, minWidth: 80,align:'center'},
+                    {field: 'refererId', title: '审核状态',
+                            	templet: function (d) {
+                                    if (d.certifyStatus === 0) {
+                                        return '<span style="color:red;">未通过</span>'
+                                    } else if (d.certifyStatus === 1) {
+                                        return '<span style="color:blue;">待审核</span>'
+                                    } else if (d.certifyStatus === 2) {
+                                        return '<span style="color:green;">审核通过</span>'
+                                    } else if (d.certifyStatus === 3) {
+                                        return '<span>未实名</span>'
+                                    }else{
+                                        return ''
+                                    }
+                                }, minWidth: 80,align:'center'},
+                    {field: 'createTime', title: '注册时间', minWidth: 180,align:'center'},
+                    {title: '操作', 
+                    	templet: function (d) {
+                            if (d.certifyStatus === 1) {
+                            	return '<a lay-event="edit" shiro:hasPermission="user:update">审核认证</a>'
+                            	+'<i class="layui-icon febs-edit-area febs-blue">&#xe7a4;</i>'
+                            	+'<a lay-event="addCoin" shiro:hasPermission="user:update">拨币</a>'
+                            }else if(d.certifyStatus === 2){
+                            	return '<a lay-event="see" shiro:hasPermission="user:update">'
+                            	+'<i class="layui-icon febs-edit-area febs-blue">&#xe7a5;</i></a>'
+                            	+'<a lay-event="addCoin" shiro:hasPermission="user:update">拨币</a>'
+                            }else {
+                                return '<a lay-event="addCoin" shiro:hasPermission="user:update">拨币</a>'
+                            }
+                        },minWidth: 200,align:'center'}
                 ]]
             });
         }
 
         // 获取查询参数
         function getQueryParams() {
-            var createTime = $searchForm.find('input[name="createTime"]').val();
-            if (createTime) {
-                createTimeFrom = createTime.split(' - ')[0];
-                createTimeTo = createTime.split(' - ')[1];
-            }
             return {
-                startTime: createTimeFrom,
-                endTime: createTimeTo,
                 account: $searchForm.find('input[name="account"]').val().trim(),
-                accountStatus: $searchForm.find("select[name='accountStatus']").val(),
-                accountType: $searchForm.find("select[name='accountType']").val(),
                 certifyStatus: $searchForm.find("select[name='certifyStatus']").val(),
-                invalidate_ie_cache: new Date()
             };
         }
 
-        function deleteUsers(userIds) {
-            var currentUserId = currentUser.userId + '';
-            if (('' + userIds).split(',').indexOf(currentUserId) !== -1) {
-                febs.alert.warn('所选用户包含当前登录用户,无法删除');
-                return;
-            }
-            febs.get(ctx + 'user/delete/' + userIds, null, function () {
-                febs.alert.success('删除用户成功');
-                $query.click();
-            });
-        }
     })
 </script>
\ No newline at end of file

--
Gitblit v1.9.1