update

application/index/controller/Cabinet.php

@@ -244,6 +244,8 @@ class Cabinet extends Base
             $selectResult[$key]['status_text'] = $box_status[$vo['box_status']];
             if($vo['enter_time'] == null){
                 $selectResult[$key]['enter_time'] = '';
+            }else{
+                $selectResult[$key]['enter_time'] = date("m-d H:i",strtotime($vo['enter_time']));
             }
         }
         $return['total'] = $BoxModel->getAllCounts();  //总数量

application/index/controller/User.php

@@ -70,6 +70,28 @@ class User extends Base{
         if($flag['code'] != 1){
             return json(json_error_exception('1006',$flag['msg']));
         }
-        json_return(200,[],'success');
+        json_success([]);
+    }
+
+    public function EditPwd(){
+        $param = input('param.');
+        $valid = $this->validate($param,'PwdValidate');
+        if($valid!== true){
+            return json(json_error_exception('1007',$valid));
+        }
+        $userid = session('id');
+        $user = UserModel::find($userid);
+        $password = md5($param['password']);
+        if($user['password'] == $password){
+            json_success([]);
+        }else{
+            $model = new UserModel();
+            $ret = $model->save(['password' => $password] , ['id' => $userid]);
+            if($ret == false){
+                return json(json_error_exception('1006'));
+            }else{
+                json_success([]);
+            }
+        }
     }
 }

application/index/validate/PwdValidate.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace app\index\validate;
+
+use think\Validate;
+
+class PwdValidate extends Validate
+{
+    protected $rule = array(
+        'password'   => 'require',
+        'repassword' => 'require|confirm:password'
+    );
+    protected $message = array(
+        'password.require' => '新密码必须',
+        'repassword.require' => '确认密码必须',
+        'repassword.confirm'    => '确认密码和密码必须一致',
+    );
+}

route/route.php

@@ -5,6 +5,7 @@
         'UserAdd'                   => 'index/user/UserAdd',
         'UserList'                  => 'index/user/UserList',
         'UserDel'                   => 'index/user/UserDel',
+        'EditPwd'                   => 'index/user/EditPwd',
 
         'AddCabinet'                => 'index/cabinet/AddCabinet',