diff --git a/README.md b/README.md index 28b2ed2..543a64e 100755 --- a/README.md +++ b/README.md @@ -63,5 +63,6 @@ putenv composer require phpoffice/phpspreadsheet composer require yzalis/identicon +composer require topthink/think-image php think UserStatisticsHour diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php index 753fe4a..600031e 100755 --- a/app/admin/controller/User.php +++ b/app/admin/controller/User.php @@ -37,7 +37,6 @@ class User extends Base public function list() { $param = $this->request->param(); - // 构建查询条件 $where = []; if (!empty($param['user_id'])) { @@ -56,6 +55,9 @@ class User extends Base $times = explode(' - ', $param['addtime']); $where[] = ['addtime', 'between', [strtotime($times[0]), strtotime($times[1])]]; } + if (!empty($param['pid'])) { + $where[] = ['pid', '=', intval($param['pid']) - 1260]; + } $field = '*'; $order = 'id desc'; $data = UserModel::getList($where, $field, $order, $this->page); diff --git a/app/admin/view/User/index.html b/app/admin/view/User/index.html index 64b4195..dde2a8b 100755 --- a/app/admin/view/User/index.html +++ b/app/admin/view/User/index.html @@ -12,6 +12,13 @@ class="layui-input"> + +