1

application/admin/controller/Index.php

@@ -90,44 +90,41 @@ class Index extends Base
     // 修改管理员密码
     public function changePassword()
     {
-        $token = input("param.token/s");
+        $token = session('token');
         $res = model('Admins')->checktoken($token);
         if($res == -1){
             return $res;
         }
         $user_id = $res;
 
+        //$user_id = session('user_id');
+
         if(request()->isPost()){
 
             $param = input('post.');
-            $reLogin = false;
 
-            if(empty($param['old_pwd']) && !empty($param['password'])){
+            if(empty($param['old_pwd'])){
                 return json(['code' => -2, 'data' => '', 'msg' => '请输入旧密码']);
             }
 
-            if(!empty($param['old_pwd']) && empty($param['password'])){
+            if(empty($param['password'])){
                 return json(['code' => -3, 'data' => '', 'msg' => '请输入新密码']);
             }
 
-            if(!empty($param['old_pwd']) && !empty($param['password'])){
-
-                $userPwd = db('admins')->where('id', $user_id)->find();
-                if(empty($userPwd)){
-                    return json(['code' => -4, 'data' => '', 'msg' => '管理员不存在']);
-                }
-
-                if(md5($param['old_pwd'] . config('salt')) != $userPwd['password']){
-                    return json(['code' => -1, 'data' => '', 'msg' => '旧密码错误']);
-                }
+            $userPwd = db('admins')->where('id', $user_id)->find();
+            if(empty($userPwd)){
+                return json(['code' => -4, 'data' => '', 'msg' => '管理员不存在']);
+            }
 
-                $info['password'] = md5($param['password'] . config('salt'));
-                $reLogin = true;
+            if(md5($param['old_pwd'] . config('salt')) != $userPwd['password']){
+                return json(['code' => -1, 'data' => '', 'msg' => '旧密码错误']);
             }
 
+            $info['password'] = md5($param['password'] . config('salt'));
+
             db('admins')->where('id', $user_id)->setField('password', $info['password']);
 
-            return json(['code' => 1, 'data' => $reLogin, 'msg' => '修改信息成功']);
+            return json(['code' => 1, 'data' => '', 'msg' => '修改密码成功']);
         }
     }
 

application/admin/view/index.html

@@ -236,7 +236,7 @@
 
         <div class="form-group">
             <div class="col-sm-4 col-sm-offset-8">
-                <button class="btn btn-primary" type="submit">确认修改</button>
+                <button class="btn btn-primary btn-sm" type="submit">确认修改</button>
             </div>
         </div>
     </form>