mkm/work
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
vilson 2020-02-20 21:51:15 +08:00
commit 0b9b4c19ae
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/project/controller/Login.php
View File

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