账号锁定修改密码

Application/Sdk/Controller/UserController.class.php

@@ -272,7 +272,7 @@ class UserController extends BaseController
         switch ($result) {
 
             case - 1:
-                $this -> set_message(1004, "fail", "用户不存在或被禁用");
+                $this -> set_message(1004, "fail", "密码错误");
                 break;
             case - 2:
                 $this -> set_message(1005, "fail", "密码错误");
@@ -1535,6 +1535,10 @@ class UserController extends BaseController
         } elseif ($data['reg'] == 4) {/* 解绑检查 */
 
         } 
+        $user = M('user', 'tab_')->field('account,lock_status')->where(['phone' => $phone])->find();
+        if(isset($user['account']) && $user['lock_status'] == 0) {
+            $this -> new_set_message(200, "success");
+        }
         $this -> sms_send($phone);
 
 
@@ -1571,8 +1575,12 @@ class UserController extends BaseController
 
         }
         if (empty($data)) {
-
+            $data = $model->field('account,nickname,phone,phone,email')->where(['account' => $user['user_id']])->find();
-            $this -> new_set_message(1004, "帐号不存在或被禁用！", []);
+            if (empty($data)) {
+                $this -> new_set_message(1004, "帐号不存在！", []);
+            } else {
+                $this->new_set_message(200, 'success', $data);
+            }
 
         }
         $unread_count = 0;