diff --git a/application/admin/controller/Node.php b/application/admin/controller/Node.php index af2700aa5..ec4d4ad8a 100644 --- a/application/admin/controller/Node.php +++ b/application/admin/controller/Node.php @@ -62,9 +62,9 @@ class Node extends BasicAdmin { $tmp = explode('/', $thr); $one = $tmp[0]; $two = "{$tmp[0]}/{$tmp[1]}"; - $nodes[$one] = array_merge(isset($alias[$one]) ? $alias[$one] : ['node' => $one, 'title' => $thr, 'is_menu' => 0, 'is_auth' => 0], ['pnode' => '']); - $nodes[$two] = array_merge(isset($alias[$two]) ? $alias[$two] : ['node' => $two, 'title' => $thr, 'is_menu' => 0, 'is_auth' => 0], ['pnode' => $one]); - $nodes[$thr] = array_merge(isset($alias[$thr]) ? $alias[$thr] : ['node' => $thr, 'title' => $thr, 'is_menu' => 1, 'is_auth' => 0], ['pnode' => $two]); + $nodes[$one] = array_merge(isset($alias[$one]) ? $alias[$one] : ['node' => $one, 'title' => '', 'is_menu' => 0, 'is_auth' => 0], ['pnode' => '']); + $nodes[$two] = array_merge(isset($alias[$two]) ? $alias[$two] : ['node' => $two, 'title' => '', 'is_menu' => 0, 'is_auth' => 0], ['pnode' => $one]); + $nodes[$thr] = array_merge(isset($alias[$thr]) ? $alias[$thr] : ['node' => $thr, 'title' => '', 'is_menu' => 0, 'is_auth' => 0], ['pnode' => $two]); } $this->assign('nodes', Tools::arr2table($nodes, 'node', 'pnode')); } @@ -75,15 +75,13 @@ class Node extends BasicAdmin { public function save() { if ($this->request->isPost()) { $post = $this->request->post(); - foreach ($post as $key => $vo) { - if (stripos($key, 'title_') !== 0) { - continue; - } - $node = substr($key, strlen('title_')); - $data = ['node' => $node, 'title' => $vo, 'is_menu' => intval(!empty($post["menu_{$node}"])), 'is_auth' => intval(!empty($post["auth_{$node}"]))]; + if (isset($post['name']) && isset($post['value'])) { + $nameattr = explode('.', $post['name']); + $field = array_shift($nameattr); + $data = ['node' => join(',', $nameattr), $field => $post['value']]; Data::save($this->table, $data, 'node'); + $this->success('参数保存成功！', ''); } - $this->success('参数保存成功！', ''); } else { $this->error('访问异常，请重新进入...'); } diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php index 117b89ccb..8956c98ef 100644 --- a/application/admin/controller/User.php +++ b/application/admin/controller/User.php @@ -15,6 +15,8 @@ namespace app\admin\controller; use controller\BasicAdmin; +use library\Data; +use think\Db; /** * 系统用户管理控制器 @@ -25,10 +27,104 @@ use controller\BasicAdmin; */ class User extends BasicAdmin { + /** + * 指定当前数据表 + * @var string + */ protected $table = 'SystemUser'; public function index() { - parent::_list($this->table); + $this->title = '用户管理'; + $db = Db::name($this->table)->where('is_deleted', '0'); + parent::_list($db); + } + + /** + * 用户添加 + */ + public function add() { + return $this->_form($this->table, 'form'); + } + + /** + * 用户编辑 + */ + public function edit() { + return $this->add(); + } + + /** + * 用户密码修改 + */ + public function pass() { + if (in_array('10000', explode(',', $this->request->post('id')))) { + $this->error('系统超级账号禁止操作！'); + } + if ($this->request->isGet()) { + return $this->_form($this->table, 'pass'); + } + $data = $this->request->post(); + if ($data['password'] !== $data['repassword']) { + $this->error('两次输入的密码不一致！'); + } + if (Data::save($this->table, ['id' => $data['id'], 'password' => md5($data['password'])], 'id')) { + $this->success('密码修改成功，下次请使用新密码登录！', ''); + } else { + $this->error('密码修改失败，请稍候再试！'); + } + } + + /** + * 表单数据默认处理 + * @param type $data + */ + public function _form_filter(&$data) { + if ($this->request->isPost()) { + if (isset($data['id'])) { + unset($data['username']); + } elseif (Db::name($this->table)->where('username', $data['username'])->find()) { + $this->error('用户账号已经存在，请使用其它账号！'); + } + } + } + + /** + * 删除用户 + */ + public function del() { + if (in_array('10000', explode(',', $this->request->post('id')))) { + $this->error('系统超级账号禁止删除！'); + } + if (Data::update($this->table)) { + $this->success("用户删除成功！", ''); + } else { + $this->error("用户删除失败，请稍候再试！"); + } + } + + /** + * 用户禁用 + */ + public function forbid() { + if (in_array('10000', explode(',', $this->request->post('id')))) { + $this->error('系统超级账号禁止操作！'); + } + if (Data::update($this->table)) { + $this->success("用户禁用成功！", ''); + } else { + $this->error("用户禁用失败，请稍候再试！"); + } + } + + /** + * 用户禁用 + */ + public function resume() { + if (Data::update($this->table)) { + $this->success("用户启用成功！", ''); + } else { + $this->error("用户启用失败，请稍候再试！"); + } } } diff --git a/application/admin/view/auth.form.html b/application/admin/view/auth.form.html index b7927d650..a266f4b24 100644 --- a/application/admin/view/auth.form.html +++ b/application/admin/view/auth.form.html @@ -18,7 +18,7 @@
{if isset($vo['id'])}{/if} - +
diff --git a/application/admin/view/auth.index.html b/application/admin/view/auth.index.html index d78431a78..4fcb98e8a 100644 --- a/application/admin/view/auth.index.html +++ b/application/admin/view/auth.index.html @@ -1,12 +1,13 @@ {extend name='extra@admin/content' /} -{block name="content"} - -
+{block name="button"} +
+{/block} +{block name="content"}
diff --git a/application/admin/view/menu.form.html b/application/admin/view/menu.form.html index 046448134..7a50871f3 100644 --- a/application/admin/view/menu.form.html +++ b/application/admin/view/menu.form.html @@ -38,7 +38,7 @@
{if isset($vo['id'])}{/if} - +
- + $('input.check-box').on('click', function () { + $.form.load('{:url("save")}', {name: this.name, value: this.checked ? 1 : 0}, 'POST', function (ret) { + return false; + }); + }); + }); + +{/if} {/block} \ No newline at end of file diff --git a/application/admin/view/user.form.html b/application/admin/view/user.form.html new file mode 100644 index 000000000..be60de231 --- /dev/null +++ b/application/admin/view/user.form.html @@ -0,0 +1,43 @@ + + +
+ +
+ {if $vo and $vo.username} + + {else/} + + {/if} +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ {if isset($vo['id'])}{/if} + + +
+ + diff --git a/application/admin/view/user.index.html b/application/admin/view/user.index.html new file mode 100644 index 000000000..b161777a5 --- /dev/null +++ b/application/admin/view/user.index.html @@ -0,0 +1,73 @@ +{extend name='extra@admin/content' /} + +{block name="button"} +
+ + +
+{/block} + +{block name="content"} + + +
+ + + + + + + + + + + + + + {foreach $list as $key=>$vo} + + + + + + + + + + + {/foreach} + +
+ + 用户账号手机号电子邮箱登录次数最后登录状态操作
+ + {$vo.username}{$vo.phone|default="还没有设置手机号"}{$vo.mail|default="还没有设置邮箱"}{$vo.login_num|default="从未登录"}{$vo.login_at|default="从未登录"} + {if $vo.status eq 0} + 已禁用 + {elseif $vo.status eq 1} + 使用中 + {/if} + + {if auth("$classuri/edit")} + | + 编辑 + {/if} + {if auth("$classuri/edit")} + | + 密码 + {/if} + {if $vo.status eq 1 and auth("$classuri/forbid")} + | + 禁用 + {elseif auth("$classuri/resume")} + | + 启用 + {/if} + {if auth("$classuri/del")} + | + 删除 + {/if} +
+ {if isset($page)}

{$page}

{/if} + +{/block} \ No newline at end of file diff --git a/application/admin/view/user.pass.html b/application/admin/view/user.pass.html new file mode 100644 index 000000000..b3be5b6a7 --- /dev/null +++ b/application/admin/view/user.pass.html @@ -0,0 +1,36 @@ +
+ +
+ +
+ {if $vo and $vo.username} + + {else/} + + {/if} +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ {if isset($vo['id'])}{/if} + + +
+ +
diff --git a/application/extra/view/admin.content.html b/application/extra/view/admin.content.html index 707b72dae..6c968e142 100644 --- a/application/extra/view/admin.content.html +++ b/application/extra/view/admin.content.html @@ -2,16 +2,10 @@ {if isset($title)}
{$title}
+ {block name="button"}{/block}
{/if}
- {if isset($alert)}