diff --git a/beike/Shop/Http/Controllers/account/LoginController.php b/beike/Shop/Http/Controllers/account/LoginController.php index b1291cf1..e0ab353b 100644 --- a/beike/Shop/Http/Controllers/account/LoginController.php +++ b/beike/Shop/Http/Controllers/account/LoginController.php @@ -29,9 +29,9 @@ class LoginController extends Controller public function store(LoginRequest $request) { - $credentials = $request->only('email', 'password'); + $credentials = $request->only('login'); - if (auth(Customer::AUTH_GUARD)->attempt($credentials)) { + if (auth(Customer::AUTH_GUARD)->attempt($credentials['login'])) { return redirect(shop_route('account.index')); } diff --git a/beike/Shop/Http/Controllers/account/RegisterController.php b/beike/Shop/Http/Controllers/account/RegisterController.php index d1948f10..d80d88fc 100644 --- a/beike/Shop/Http/Controllers/account/RegisterController.php +++ b/beike/Shop/Http/Controllers/account/RegisterController.php @@ -28,7 +28,8 @@ class RegisterController extends Controller public function store(RegisterRequest $request) { - AccountService::register($request->only('email', 'password')); + $data = $request->only('register'); + AccountService::register($data['register']); return redirect(shop_route('login.index')); } diff --git a/beike/Shop/Http/Requests/LoginRequest.php b/beike/Shop/Http/Requests/LoginRequest.php index 16790318..c587fedd 100644 --- a/beike/Shop/Http/Requests/LoginRequest.php +++ b/beike/Shop/Http/Requests/LoginRequest.php @@ -24,16 +24,16 @@ class LoginRequest extends FormRequest public function rules() { return [ - 'email' => 'required|email:rfc,dns', - 'password' => 'required', + 'login.email' => 'required|email:rfc,dns', + 'login.password' => 'required', ]; } public function attributes() { return [ - 'email' => '邮箱地址', - 'password' => '密码' + 'login.email' => '邮箱地址', + 'login.password' => '密码' ]; } } diff --git a/beike/Shop/Http/Requests/RegisterRequest.php b/beike/Shop/Http/Requests/RegisterRequest.php index 9dd29f2a..209fa6ea 100644 --- a/beike/Shop/Http/Requests/RegisterRequest.php +++ b/beike/Shop/Http/Requests/RegisterRequest.php @@ -24,16 +24,16 @@ class RegisterRequest extends FormRequest public function rules() { return [ - 'email' => 'required|email:rfc,dns|unique:customers,email', - 'password' => 'required|confirmed', + 'register.email' => 'required|email:rfc,dns|unique:customers,email', + 'register.password' => 'required|confirmed', ]; } public function attributes() { return [ - 'email' => '邮箱地址', - 'password' => '密码' + 'register.email' => '邮箱地址', + 'register.password' => '密码' ]; } } diff --git a/themes/default/login.blade.php b/themes/default/login.blade.php index d7d2cfa2..02559394 100644 --- a/themes/default/login.blade.php +++ b/themes/default/login.blade.php @@ -29,16 +29,16 @@
- - @error('email') + + @error('login.email') @enderror
- - @error('password') + + @error('login.password') @enderror
diff --git a/themes/default/register.blade.php b/themes/default/register.blade.php index a2c6a364..2e18ea6f 100644 --- a/themes/default/register.blade.php +++ b/themes/default/register.blade.php @@ -11,9 +11,9 @@
邮箱
- + - @error('email') + @error('register.email') @enderror @@ -23,9 +23,9 @@
密码
- + - @error('password') + @error('register.password') @enderror