Skip to content

Commit

Permalink
完成修改密码，添加用户，主播搜索
Browse files Browse the repository at this point in the history
  • Loading branch information
@wuceyang
wuceyang committed Feb 13, 2017
1 parent 4196729 commit e03f14e
Show file tree
Hide file tree
Showing 8 changed files with 401 additions and 100 deletions.
13 changes: 12 additions & 1 deletion app/C/Admin/Actor.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,20 @@ public function index(Request $req, Response $resp){

$talents = $mTalent->getList();

$talentName = '';

if($talent){

$talentInfo = $mTalent->getInfoById($talent);

$talentName = $talentInfo ? $talentInfo['TalentName'] : '';
}

$actor = new mActor();

$total = 0;

$actress = $actor->getQualifiedActress($gender, $mintall, $maxtall, $city, $talent, $page, $pagesize);
$actress = $actor->getQualifiedActress($gender, $mintall, $maxtall, $city, $talentName, $page, $pagesize);

if($actress){

Expand Down Expand Up @@ -75,6 +84,8 @@ public function index(Request $req, Response $resp){
'total' => $total,
'list' => $actress,
'gender' => Enum::Gender,
'talent' => $talents,
'get' => $req->get(),
];

return $resp->withView('admin/actor_list.html')->withVars($htmlParam)->display();
Expand Down
8 changes: 5 additions & 3 deletions app/C/Admin/Base.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ protected function initViewVars($req, $resp){
define('__RESPATH__', Config::get('global.resPrefix'));

$params = [
'menu' => $this->initSideBar(),
'menu' => $this->initSideBar(),
'userinfo' => $this->userinfo,
];

$resp->withVars($params);
Expand Down Expand Up @@ -258,9 +259,10 @@ private function initSideBar(){
[
'text' => '系统管理',
'icon' => '',
'flag' => 'system',
'flag' => 'user',
'sub' => [
'系统管理' => '/admin/system/index',
'系统管理' => '/admin/user/index',
'修改密码' => '/admin/user/reset-pwd',
]
]
];
Expand Down
103 changes: 36 additions & 67 deletions app/C/Admin/User.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ public function resetPwd(Request $req, Response $resp){
return $resp->withView('admin/reset_passwd.html')->display();
}

$oldPass = trim($req->post('oldpass'));
$oldPass = trim($req->post('oldpwd'));

$newPass = trim($req->post('newpass'));
$newPass = trim($req->post('newpwd'));

$cnfPass = trim($req->post('cnfpass'));
$cnfPass = trim($req->post('cnfpwd'));

if(!$oldPass){

Expand All @@ -91,20 +91,25 @@ public function resetPwd(Request $req, Response $resp){

$user = new mUser();

if($this->userinfo['passwd'] != $user->passwdEncrypt($this->userinfo['account'],$oldPass)){
if($this->userinfo['Passwd'] != $user->passwdEncrypt($this->userinfo['Account'],$oldPass)){

return $this->error("原始密码错误，请检查输入", 102);
}

if(!$user->updateUserInfo($this->userinfo['id'], ['passwd' => $user->passwdEncrypt($this->userinfo['account'], $newPass)])){
if(!$user->updateUserInfo($this->userinfo['ID'], ['Passwd' => $user->passwdEncrypt($this->userinfo['Account'], $newPass)])){

return $this->error("密码更新失败", 201);
}

return $this->success("密码更新成功", "/admin/user/index");
return $this->success("密码更新成功,您需要重新登录", "/admin/user/logout");
}

public function allUser(Request $req, Response $resp){
public function index(Request $req, Response $resp){

if(!$this->userinfo['IsFixed']){

return $this->error('您无权限访问当前页面', 403);
}

$page = intval($req->get('page'));

Expand All @@ -116,70 +121,38 @@ public function allUser(Request $req, Response $resp){

$groupId = [];

$userList = $user->userList(null, null, $page, $pagesize);

foreach ($userList as $k => $v) {

$gid = explode(',', trim($v['group_id'], ','));

$userList[$k]['groupid'] = $gid;

$groupId = array_merge($groupId, $gid);
}

$userGroup = new UserGroup();

$groups = $userGroup->getGroupsById($groupId);
$userList = $user->getList([], [], $page, $pagesize);

foreach ($groups as $k => $v) {

$groupMap[$v['id']] = $v['group_name'];
}

foreach ($userList as $k => $v) {

$v['groups'] = [];

foreach ($v['groupid'] as $sk => $sv) {

if(isset($groupMap[$sv])){
$totalUser = $user->getTotal([], []);

$v['groups'][] = $groupMap[$sv];
}
}

$userList[$k] = $v;
}

$totalUser = $user->getTotalUser(null);

$pageInfo = $this->getPageInfo("/admin/user/all-user", $page, $totalUser, [], $pagesize);

$allGroups = $userGroup->getAllGroups();
$pageParam = $this->getPageInfo("/admin/user/index", $page, $totalUser, [], $pagesize);

$params = [
'list' => $userList,

'groups' => $allGroups
'list' => $userList,
'pageParam' => $pageParam,
'total' => $totalUser,
];

$params = $params + $pageInfo;

return $resp->withVars($params)->withView("admin/user_list.html")->display();

}

public function addUser(Request $req, Response $resp){
public function addNew(Request $req, Response $resp){

$username = trim($req->post('username'));
if(!$this->userinfo['IsFixed']){

return $this->error('您无权限访问当前页面', 403);
}

$truename = trim($req->post('truename'));

$account = trim($req->post('account'));

$mobile = trim($req->post('mobile'));

$passwd = trim($req->post('passwd'));

$groupid = $req->post('groupid');

if(!$username){
if(!$truename){

return $this->error('用户姓名不能为空', 101, 'javascript:history.back();');
}
Expand All @@ -189,25 +162,21 @@ public function addUser(Request $req, Response $resp){
return $this->error('登录帐号不能为空', 101, 'javascript:history.back();');
}

if(!$groupid){
if(!$passwd || strlen($passwd) < 6){

return $this->error('请给帐号设置分组', 101, 'javascript:history.back();');
return $this->error('请输入登录密码，不能少于6个自负', 101, 'javascript:history.back();');
}

$groupid = array_map('intval', $groupid);

$groupid = array_unique($groupid);

$user = new mUser();

$passwd = $user->passwdEncrypt($account, $passwd);

if(!$user->addUser($username, $account, $passwd, $groupid)){
if(!$user->addUser($truename, $account, $passwd, $mobile)){

return $this->error('帐号添加失败', 101, 'javascript:history.back();');
}

return $this->success('帐号添加成功', '/admin/user/all-user');
return $this->success('帐号添加成功', '/admin/user/index');
}

public function editUser(Request $req, Response $resp){
Expand Down Expand Up @@ -270,15 +239,15 @@ public function editUser(Request $req, Response $resp){
return $this->success('帐号信息更新成功', 'javascript:history.back();');
}

public function switchUser(Request $req, Response $resp){
public function switchStatus(Request $req, Response $resp){

$userid = intval($req->post('id'));
$userid = intval($req->get('id'));

$status = intval($req->post('status'));
$status = intval($req->get('status'));

$user = new mUser();

if(!in_array($status, [Enum::STATUS_NORMAL, Enum::STATUS_DISABLED])){
if(!in_array($status, [Enum::Status['normal'], Enum::Status['disable']])){

return $this->error('帐号目标状态不正确', 101, 'javascript:history.back();');
}
Expand Down
32 changes: 10 additions & 22 deletions app/M/User.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,30 +15,27 @@ public function userLogin($account, $passwd){
return $this->where('account = ? AND passwd = ?', [$account, $this->passwdEncrypt($account, $passwd)])->getRow();
}

public function addUser($username, $account, $passwd, $groupid){
public function addUser($username, $account, $passwd, $mobile){

$params = [

'account' => $account,
'Account' => $account,

'username' => $username,
'UserName' => $username,

'passwd' => $this->passwdEncrypt($account, $passwd),
'Passwd' => $this->passwdEncrypt($account, $passwd),

'group_id' => ',' . implode(',', $groupid) . ',',

'reg_time' => time(),
'Mobile' => $mobile,
];

return $this->insert($params);
}

/**
*获取用户列表
*@param int $groupId 用户所在分组
*@return array
*/
public function userList($groupId, $status = null, $page = 0, $pagesize = 20){
public function userList($status = null, $page = 0, $pagesize = 20){

$where = $param = [];

Expand All @@ -47,13 +44,6 @@ public function userList($groupId, $status = null, $page = 0, $pagesize = 20){
$where = ['status = ' . intval($status)];
}

if($groupId){

$where[] = 'group_id LIKE ?';

$param[] = '%,' . caddslahshes($groupId, '%-') . ',%';
}

$this->orderBy(['id DESC']);

if($where){
Expand All @@ -74,17 +64,15 @@ public function updateUserInfo($userId, $updateInfo){
return $this->where('id = ?', [intval($userId)])->update($updateInfo);
}

public function getTotalUser($groupId){
public function getTotalUser($status = null){

$where = $param = [];

$where = ['status = 1'];

if($groupId){
if($status && is_numeric($status)){

$where[] = 'group_id LIKE ?';
$where[] = 'status = ?';

$param[] = '%,' . caddslahshes($groupId, '%-') . ',%';
$param[] = intval($status);
}

if($where){
Expand Down
58 changes: 52 additions & 6 deletions app/V/admin/actor_list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,58 @@

<define name="content"/>
<div class="star-text">
<fieldset class="layui-elem-field layui-field-title" style="margin-top: 50px; margin-right: 120px;">
<legend>主播列表</legend>
</fieldset>
<span class="star-tool">
<button class="layui-btn layui-btn-normal" data-max="1" id="addnewbtn" data-bucket="image"><i class="layui-icon">&#xe642;</i> 图片添加</button>
</span>
<fieldset class="layui-elem-field layui-field-title" style="margin-top: 50px; margin-right: 120px;">
<legend>主播列表</legend>
</fieldset>
<span class="star-tool">
<button class="layui-btn layui-btn-normal" data-max="1" id="addnewbtn" data-bucket="image"><i class="layui-icon">&#xe642;</i> 图片添加</button>
</span>
<div class="layui-form-item">
<form action="/admin/actor/index" method="get">
<div class="layui-inline">
<label class="layui-form-label" style="width: 40px;">性别:</label>
<div class="layui-input-inline" style="width: 80px;">
<select name="gender" class="layui-input" lay-verify="">
<option value="">选择性别</option>
<loop $gender $k $v />
<option value="<=$k/>"<=isset($get.gender) && $get.gender == $k ? ' selected' : ''/>><=$v/></option>
</loop/>
</select>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 40px;">身高:</label>
<div class="layui-input-inline" style="width: 100px;">
<input type="text" name="mintall" value="<=isset($get.maxtall) ? $get.maxtall : ''/>" autocomplete="off" class="layui-input">
</div>
<div class="layui-form-mid">-</div>
<div class="layui-input-inline" style="width: 100px;">
<input type="text" name="maxtall" value="<=isset($get.mintall) ? $get.mintall : ''/>" autocomplete="off" class="layui-input">
</div>
<div class="layui-form-mid">厘米</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 40px;">城市:</label>
<div class="layui-input-inline" style="width: 100px;">
<input name="city" value="<=isset($get.city) ? $get.city : ''/>" class="layui-input" />
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">直播特长:</label>
<div class="layui-input-inline" style="width: 80px;">
<select name="talent" class="layui-input" lay-verify="">
<option value="">选择特长</option>
<loop $talent $k $v />
<option value="<=$v.ID/>" <=isset($get.talent) && $get.talent == $v.ID ? ' selected' : ''/>><=$v.TalentName/></option>
</loop/>
</select>
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" type="submit">搜索</button>
</div>
</form>
</div>
<table class="layui-table" lay-skin="line">
<colgroup>
<col width="50">
Expand Down
Loading

0 comments on commit e03f14e

Please sign in to comment.