diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 45573967..d103177f 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -643,12 +643,12 @@ class AuthController extends Controller $username = trim($request->get('username')); if (!$username) { - return Response::json(['status' => 'fail', 'data' => '', 'message' => '请输入用户名']); + return Response::json(['status' => 'fail', 'data' => '', 'message' => '请填入邮箱']); } // 校验账号合法性 if (false === filter_var($username, FILTER_VALIDATE_EMAIL)) { - return Response::json(['status' => 'fail', 'data' => '', 'message' => '用户名必须是合法邮箱,请重新输入']); + return Response::json(['status' => 'fail', 'data' => '', 'message' => '邮箱地址不合法,请重新输入']); } // 校验域名邮箱是否在敏感词中 diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index 93433334..7cd0f19b 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -107,13 +107,18 @@ // 发送注册验证码 function sendVerifyCode() { var flag = true; // 请求成功与否标记 - var token = '{{csrf_token()}}'; var username = $("#username").val(); + + if (username == '' || username == undefined) { + layer.msg("请填入邮箱", {time: 1000}); + return false; + } + $.ajax({ type: "POST", url: "{{url('sendCode')}}", async: false, - data: {_token: token, username: username}, + data: {_token: '{{csrf_token()}}', username: username}, dataType: 'json', success: function (ret) { if (ret.status == 'fail') { @@ -127,7 +132,7 @@ } }, error: function (ret) { - layer.msg('请求异常,请重试', {time: 1000}); + layer.msg('请求异常,请刷新页面重试', {time: 1000}); flag = false; } });