经纪人登录修改

application/api_broker/controller/Broker.php

@@ -40,47 +40,45 @@ class Broker extends Basic
      * @throws \think\exception\DbException
      */
     public function login() {
+        $data['data']   = [];
 
-        $data['data']   = array();
-        $data['status'] = 101;
+        if (empty($this->params['phone']) && empty($this->params['pwd'])) {
+            return $this->response(101, '用户名或密码为空',$data['data']);
+        }
 
-        if ($this->params['phone'] && $this->params['pwd']) {
-            $field = 'id,device_id,store_id,auth_group_id,district_id,level,name,phone,password,sex,img,inviter_id,status';
-            $agents_data = $this->a_agents->getInfo($this->params['phone'], $this->params['pwd'], false, $field);
-
-            if (isset($agents_data['id']) && ($agents_data['status'] == 0)) {
-                if ($agents_data['password'] == md5($this->params['pwd'])) {
-                    $agents_data['device_id'] = $this->params['device_id'];
-                    $agents_data['last_login_ip'] = ip2long($this->request->ip());
-                    $agents_data['last_login_time'] = date('Y-m-d H:i:s');
-                    $agents_data->allowField(true)->save();
-
-                    if (!empty($agents_data['img'])) {
-                        $agents_data['img'] = AGENTHEADERIMGURL.$agents_data->img;
-                    }
-
-                    $jwt_data['id']    = $agents_data['id'];
-                    $jwt_data['name']  = $agents_data['name'];
-                    $jwt_data['phone'] = $agents_data['phone'];
-                    $jwt_data['level'] = $agents_data['level'];
-
-                    $jwt = new JwtUntils();
-                    $data['data'] = $agents_data->getData();
-                    $data['data']['last_login_ip'] = long2ip($data['data']['last_login_ip']);
-                    $data['data']['AuthToken'] = $jwt->createToken($jwt_data);
-                    $data['msg']    = '登陆成功';
-                    $data['status'] = 200;
-                } else {
-                    $data['msg'] = '密码错误';
-                }
-            } else {
-                $data['msg']    = '没有该用户';
-            }
-        } else {
-            $data['msg']    = '用户名或密码为空';
+        $field = 'id,device_id,store_id,auth_group_id,district_id,level,name,phone,password,sex,img,inviter_id,status';
+        $where['phone'] = $this->params['phone'];
+        $agents_data = $this->a_agents->getAgentInfo($field, '', $where);
+
+        if (empty($agents_data)) {
+            return $this->response(101, '没有该用户',$data['data']);
         }
 
-        return $this->response($data['status'], $data['msg'],$data['data']);
+        if ($agents_data['password'] != md5($this->params['pwd'])) {
+            return $this->response(101, '密码错误',$data['data']);
+        }
+
+        $agents_data['device_id'] = $this->params['device_id'];
+        $agents_data['last_login_ip'] = ip2long($this->request->ip());
+        $agents_data['last_login_time'] = date('Y-m-d H:i:s');
+        $agents_data->allowField(true)->save();
+
+        if (!empty($agents_data['img'])) {
+            $agents_data['img'] = AGENTHEADERIMGURL.$agents_data->img;
+        }
+
+        $jwt_data['id']    = $agents_data['id'];
+        $jwt_data['name']  = $agents_data['name'];
+        $jwt_data['phone'] = $agents_data['phone'];
+        $jwt_data['level'] = $agents_data['level'];
+
+        $jwt = new JwtUntils();
+        $data['data'] = $agents_data->getData();
+        $data['data']['last_login_ip'] = long2ip($data['data']['last_login_ip']);
+        $data['data']['AuthToken'] = $jwt->createToken($jwt_data);
+        $data['msg']    = '登陆成功';
+
+        return $this->response(200, $data['msg'], $data['data']);
     }
 
     /**