|
|
@@ -96,7 +96,7 @@ class MemberController extends FrontController
|
|
|
if (empty($code_ret)) {
|
|
|
return $this->apiResponseError($send_server->getErrorMsg() ?: '验证码错误');
|
|
|
}
|
|
|
- $member = Member::where('phone', $mobile)->where('status',1)->select(['id', 'token_str'])->first();
|
|
|
+ $member = Member::where('address', $mobile)->where('status',1)->select(['id', 'token_str'])->first();
|
|
|
if ($member) {
|
|
|
$token_str = PassServer::creatServer()->getMemberToken($member->{'id'});
|
|
|
Member::where('id', $member->{'id'})->update(['token_str' => $token_str]);
|
|
|
@@ -121,25 +121,17 @@ class MemberController extends FrontController
|
|
|
*/
|
|
|
function login()
|
|
|
{
|
|
|
- $mobile = request()->input('phone', '13900139110');
|
|
|
+ $mobile = request()->input('address', '');
|
|
|
if (empty($mobile)) {
|
|
|
- return $this->apiResponseError('请输入手机号码');
|
|
|
- }
|
|
|
- $password = request()->input('password', '123456');
|
|
|
- if (empty($password)) {
|
|
|
- return $this->apiResponseError('请输入登录密码');
|
|
|
+ return $this->apiResponseError('地址信息错误');
|
|
|
}
|
|
|
- $member = Member::where('phone', $mobile)->where('status',1)->select(['id', 'password', 'encrypt'])->first();
|
|
|
+ $member = Member::where('address', $mobile)->where('status',1)->select(['id', 'password', 'encrypt'])->first();
|
|
|
if (empty($member)) {
|
|
|
return $this->apiResponseError('当前账户未注册');
|
|
|
}
|
|
|
- $pass_server = PassServer::creatServer($password, $member->{'encrypt'});
|
|
|
- if (!$pass_server->verifyPass($member->{'password'})) {
|
|
|
- return $this->apiResponseError('登陆密码错误');
|
|
|
- }
|
|
|
$token_str = PassServer::creatServer()->getMemberToken($member->{'id'});
|
|
|
Member::where('id', $member->{'id'})->update(['token_str' => $token_str]);
|
|
|
- return $this->apiResponseSuccess('登陆成功', ['m_id' => $member->{'id'}, 'token' => $token_str]);
|
|
|
+ return $this->apiResponseSuccess('登陆成功', ['token' => $token_str]);
|
|
|
}
|
|
|
|
|
|
|