Merge remote-tracking branch 'origin/master'

This commit is contained in:
vilson 2020-02-20 21:51:15 +08:00
commit 0b9b4c19ae

View File

@ -84,6 +84,8 @@ class Login extends BasicApi
// }
$member = Member::where(['mobile' => $mobile])->order('id asc')->find();
} else {
!$data['password'] && $this->error('登录密码不能为空!');
!$data['account'] && $this->error('登录账号不能为空!');
$member = Member::where(['account' => $data['account']])->whereOr(['email' => $data['account']])->order('id asc')->find();
}
empty($member) && $this->error('账号或密码错误', 201);