From 2a8bf320f3d06fd97f51d27d30eeb8795c565e3c Mon Sep 17 00:00:00 2001
From: zhanglingsheng <zhanglingsheng@qq.com>
Date: Thu, 12 Dec 2019 16:05:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E9=94=81=E5=AE=9A=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sdk/Controller/UserController.class.php        | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/Application/Sdk/Controller/UserController.class.php b/Application/Sdk/Controller/UserController.class.php
index f0b7aa54..8e93194b 100644
--- a/Application/Sdk/Controller/UserController.class.php
+++ b/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)) {
-
-            $this -> new_set_message(1004, "帐号不存在或被禁用！", []);
+            $data = $model->field('account,nickname,phone,phone,email')->where(['account' => $user['user_id']])->find();
+            if (empty($data)) {
+                $this -> new_set_message(1004, "帐号不存在！", []);
+            } else {
+                $this->new_set_message(200, 'success', $data);
+            }
 
         }
         $unread_count = 0;