diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index d1805de9..ae1f45b0 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -617,6 +617,7 @@ STATUS: 'Status', NORMAL: 'normal', BANNED: 'banned', + INACTIVE: 'inactive', BTN_BAN: 'Ban', BTN_UNBAN: 'Unban', BTN_CREATE_MAKER: 'Create Maker', diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index 6c8d29c5..9afa57ca 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -617,6 +617,7 @@ STATUS: '帐号状态', NORMAL: '正常', BANNED: '被禁止', + INACTIVE: '未激活', BTN_BAN: '禁止', BTN_UNBAN: '解禁', BTN_CREATE_MAKER: '创建小组', diff --git a/modules/users/client/controllers/admin/list-users.client.controller.js b/modules/users/client/controllers/admin/list-users.client.controller.js index 23481452..6bf0c2c9 100644 --- a/modules/users/client/controllers/admin/list-users.client.controller.js +++ b/modules/users/client/controllers/admin/list-users.client.controller.js @@ -17,7 +17,7 @@ vm.searchVip = false; vm.searchAdmin = false; vm.searchOper = false; - + vm.userStatus = 'normal'; /** * buildPager */ @@ -53,7 +53,8 @@ isVip: vm.searchVip || undefined, isOper: vm.searchOper || undefined, isAdmin: vm.searchAdmin || undefined, - keys: vm.search + keys: vm.search, + status: vm.userStatus ? vm.userStatus : 'normal' }, function (data) { mtDebug.info(data); callback(data); diff --git a/modules/users/server/controllers/admin.server.controller.js b/modules/users/server/controllers/admin.server.controller.js index a6e24a3a..aede5f19 100644 --- a/modules/users/server/controllers/admin.server.controller.js +++ b/modules/users/server/controllers/admin.server.controller.js @@ -92,6 +92,7 @@ exports.list = function (req, res) { var isVip = false; var isOper = false; var isAdmin = false; + var status = undefined; if (req.query.skip !== undefined) { skip = parseInt(req.query.skip, 10); @@ -108,6 +109,9 @@ exports.list = function (req, res) { if (req.query.isAdmin !== undefined) { isAdmin = req.query.isAdmin; } + if (req.query.status !== undefined) { + status = req.query.status; + } if (req.query.keys && req.query.keys.length > 0) { var keysS = req.query.keys + ''; @@ -130,6 +134,9 @@ exports.list = function (req, res) { if (isOper === 'true' && isAdmin === 'true') { condition.roles = {$in: ['oper', 'admin']}; } + if (status !== undefined) { + condition.status = status; + } if (keysA.length > 0) { condition.$or = [