update

application/index/controller/Cabinet.php

@@ -227,17 +227,24 @@ class Cabinet extends Base
     }
 
     public function BoxList(){
+        $param = input('param.');
         $cabinet_number = input('param.cabinet_number');
         if(empty($cabinet_number)){
             json_error(1007 , '柜子号码不能为空');
         }
         $BoxModel = new BoxModel();
         $where['sc_box.cabinet_number'] = $cabinet_number;
-        $selectResult = $BoxModel->getBoxsByWhere($where);
+        $limit = isset($param['pageSize']) ? $param['pageSize'] : 10;
+        $param['pageNumber'] = isset($param['pageNumber']) ? $param['pageNumber'] : 1;
+        $offset = ($param['pageNumber'] - 1) * $limit;
+        $selectResult = $BoxModel->getBoxsByWhere($where, $offset, $limit);
         $box_status = ['打开','关闭'];
         // 拼装参数
         foreach($selectResult as $key=>$vo){
             $selectResult[$key]['status_text'] = $box_status[$vo['box_status']];
+            if($vo['enter_time'] == null){
+                $selectResult[$key]['enter_time'] = '';
+            }
         }
         $return['total'] = $BoxModel->getAllCounts();  //总数量
         $return['rows'] = $selectResult;

application/index/controller/Order.php

@@ -127,6 +127,9 @@ class Order extends Base
         // 拼装参数
         foreach($selectResult as $key=>$vo){
             $selectResult[$key]['order_status'] = $order_status[$vo['order_status']];
+            if($vo['out_time'] == null){
+                $selectResult[$key]['out_time'] = '';
+            }
         }
         $return['total'] = $OrderModel->getAllCounts();  //总数量
         $return['rows'] = $selectResult;

application/index/controller/User.php

@@ -18,21 +18,27 @@ class User extends Base{
 
         $where = [];
         if (!empty($param['searchText'])) {
-            $where['user_name'] = ['like', '%' . $param['searchText'] . '%'];
+            $where['username'] = ['like', '%' . $param['searchText'] . '%'];
         }
         $user = new UserModel();
         $selectResult = $user->getUsersByWhere($where, $offset, $limit);
 
-        $status = config('user_status');
+        $status = ['1' => '启用' , '2' => '禁用'];
 
         // 拼装参数
         foreach($selectResult as $key=>$vo){
-            $selectResult[$key]['status'] = $status[$vo['status']];
+            $selectResult[$key]['status_text'] = $status[$vo['status']];
+            if($vo['last_login_time'] == null){
+                $selectResult[$key]['last_login_time'] = '';
+            }
+            if($vo['update_timestamp'] == null){
+                $selectResult[$key]['update_timestamp'] = '';
+            }
         }
 
         $return['total'] = $user->getAllUsers($where);  //总数据
         $return['rows'] = $selectResult;
-        json_return(200 , $return , 'success');
+        json_success($return);
     }
 
     // 添加用户
@@ -57,7 +63,9 @@ class User extends Base{
     public function UserDel()
     {
         $id = input('param.id');
-
+        if($id == session('id')){
+            json_error(1006,'不可删除当前登录用户');
+        }
         $UserModel = new UserModel();
         $flag = $UserModel->delUser($id);
         if($flag['code'] != 1){

application/index/model/BoxModel.php

@@ -50,9 +50,9 @@ class BoxModel extends Model {
      * @param $offset
      * @param $limit
      */
-    public function getBoxsByWhere($where)
+    public function getBoxsByWhere($where, $offset, $limit)
     {
-        return $this->Order()->haswhere($where)->order('sc_box.box_number asc')->field('sc_box.*,OrderModel.enter_time')->select();
+        return $this->Order()->haswhere($where)->order('sc_box.box_number asc')->field('sc_box.*,OrderModel.enter_time')->limit($offset, $limit)->select();
     }
 
     /**

application/index/model/UserModel.php

@@ -16,8 +16,8 @@ class UserModel extends Model{
     public function checkUser($userName)
     {
         return $this->alias('u')
-            ->field('u.id,u.user_name,u.password,u.status')
-            ->where('u.user_name', $userName)
+            ->field('u.id,u.username,u.password,u.status')
+            ->where('u.username', $userName)
             ->find();
     }
 
@@ -29,7 +29,7 @@ class UserModel extends Model{
      */
     public function getUsersByWhere($where, $offset, $limit)
     {
-        return $this->where($where)->limit($offset, $limit)->order('id desc')->select();
+        return $this->where($where)->limit($offset, $limit)->order('id desc')->field('id,username,register_timestamp,last_login_ip,last_login_time,status,update_timestamp')->select();
     }
 
     /**
@@ -84,7 +84,6 @@ class UserModel extends Model{
         try{
             $this->where('id', $id)->delete();
             return msg(1, '', '删除管理员成功');
-
         }catch( PDOException $e){
             return msg(-1, '', $e->getMessage());
         }

application/index/validate/UserValidate.php

@@ -7,13 +7,13 @@ use think\Validate;
 class UserValidate extends Validate
 {
     protected $rule = array(
-        'user_name'   => 'require|unique:user',
+        'username'   => 'require|unique:user',
         'password'   => 'require',
         'repassword' => 'require|confirm:password'
     );
     protected $message = array(
-        'user_name.require'     => '用户名必须',
-        'user_name.unique'      => '用户名已存在',
+        'username.require'     => '用户名必须',
+        'username.unique'      => '用户名已存在',
         'password.require'      => '密码必须',
         'repassword.require'    => '确认密码和密码必须一致',
     );