更新

app/controller/admin/User.php

@@ -21,20 +21,7 @@ class User extends Admin {
 	 * @author 麦当苗儿 <zuojiazi@vip.qq.com>
 	 */
 	public function index(Member $member) {
-		$param = $this->request->param();
-		$map[] = ['status', '>=', 0];
-		if (isset($param['nickname']) && $param['nickname']) {
-			$map['nickname'] = array('like', '%' . $param['nickname'] . '%');
-		}
-		if (isset($param['username']) && $param['username']) {
-			$map['username'] = array('like', '%' . (string) $param['nickname'] . '%');
-		}
-
-		$order = "uid desc";
-		$list = $member->where($map)->order($order)
-			->paginate(15, false, array(
-				'param' => $param,
-			));
+		$list = $member->getUserList($this->request);
 
 		$this->data['list'] = $list;
 		$this->data['page'] = $list->render();
@@ -46,24 +33,18 @@ class User extends Admin {
 	 * @title 添加用户
 	 * @author colin <molong@tensent.cn>
 	 */
-	public function add() {
-		$model = \think\Loader::model('Member');
+	public function add(Member $member) {
 		if ($this->request->isPost()) {
 			$data = $this->request->param();
 			//创建注册用户
-			$result = $model->register($data['username'], $data['password'], $data['repassword'], $data['email'], false);
+			$result = $member->register($data['username'], $data['password'], $data['repassword'], $data['email'], false);
 			if ($result) {
 				return $this->success('用户添加成功！', url('admin/user/index'));
 			} else {
 				return $this->error($model->getError());
 			}
 		} else {
-			$data = array(
-				'keyList' => $model->addfield,
-			);
-			$this->assign($data);
-			$this->setMeta("添加用户");
-			return $this->fetch('public/edit');
+			return $this->fetch('admin/public/edit');
 		}
 	}