Merge remote-tracking branch 'origin/master' into akun

@@ -67,6 +67,9 @@ class UserLogic extends BaseLogic
             $this->param['password'] = base64_encode(md5($this->param['password'] ?? '123456'));
             $this->param['password'] = base64_encode(md5($this->param['password'] ?? '123456'));
             $rs = $this->model->add($this->param);
             $rs = $this->model->add($this->param);
         }
         }
+        if(isset($this->param['is_password'])){
+            $this->model->edit(['is_password'=>$this->param['is_password']],['mobile'=>$this->param['mobile']]);
+        }
         if ($rs === false) {
         if ($rs === false) {
             $this->fail('添加失败');
             $this->fail('添加失败');
         }
         }

@@ -37,7 +37,7 @@ class UserLoginLogic
      */
      */
     public function login(){
     public function login(){
         //先验证手机号是否在项目中存在
         //先验证手机号是否在项目中存在
-        $info = $this->model->read(['mobile'=>$this->param['mobile'],'status'=>$this->model::STATUS_ZERO],['id','is_password','project_id']);
+        $info = $this->model->list(['mobile'=>$this->param['mobile'],'status'=>$this->model::STATUS_ZERO],['id','is_password']);
         if($info === false){
         if($info === false){
             $this->fail('当前用户不存在或者被禁用',Code::USER_REGISTER_ERROE);
             $this->fail('当前用户不存在或者被禁用',Code::USER_REGISTER_ERROE);
         }
         }