| xqd
@@ -52,9 +52,10 @@ class AuthController extends Controller
|
|
|
// 查询用户是否存在
|
|
|
$user = User::query()
|
|
|
->where('account','=',$account)
|
|
|
+ ->orWhere('email','=',$request->email)
|
|
|
->first();
|
|
|
if($user){
|
|
|
- return $this->error('账号已存在!');
|
|
|
+ return $this->error('账号已存在或邮箱已被注册!');
|
|
|
}
|
|
|
if (CommonService::is_email($request->email)){ // 邮箱格式
|
|
|
if(!EmailController::isEmailCodeRight($request->email,$request->code)){
|