From 44757d45a037d1800f9d16489e6614e020f92458 Mon Sep 17 00:00:00 2001
From: TL <mengwb@opencart.cn>
Date: Tue, 28 Jun 2022 10:51:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E7=99=BB=E5=BD=95=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Shop/Http/Controllers/account/LoginController.php   | 4 ++--
 .../Shop/Http/Controllers/account/RegisterController.php  | 3 ++-
 beike/Shop/Http/Requests/LoginRequest.php                 | 8 ++++----
 beike/Shop/Http/Requests/RegisterRequest.php              | 8 ++++----
 themes/default/login.blade.php                            | 8 ++++----
 themes/default/register.blade.php                         | 8 ++++----
 6 files changed, 20 insertions(+), 19 deletions(-)

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 @@
 
               <div class="mb-4">
                 <label class="form-label" for="email_1">Email</label>
-                <input type="text" name="email" class="form-control" value="{{ old('email') }}" placeholder="邮箱地址">
-                @error('email')
+                <input type="text" name="login[email]" class="form-control" value="{{ old('login.email') }}" placeholder="邮箱地址">
+                @error('login.email')
                   <x-admin::form.error :message="$message" />
                 @enderror
               </div>
 
               <div class="mb-4">
                 <label class="form-label" for="email_1">Password</label>
-                <input type="password" name="password" class="form-control" placeholder="密码">
-                @error('password')
+                <input type="password" name="login[password]" class="form-control" placeholder="密码">
+                @error('login.password')
                   <x-admin::form.error :message="$message" />
                 @enderror
               </div>
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 @@
                     <div class="input-group-prepend">
                         <span class="input-group-text" id="email">邮箱</span>
                     </div>
-                    <input type="text" name="email" class="form-control" value="{{ old('email') }}" placeholder="邮箱地址">
+                    <input type="text" name="register[email]" class="form-control" value="{{ old('register.email') }}" placeholder="邮箱地址">
                 </div>
-                @error('email')
+                @error('register.email')
                 <x-admin::form.error :message="$message"/>
                 @enderror
             </div>
@@ -23,9 +23,9 @@
                     <div class="input-group-prepend">
                         <span class="input-group-text" id="password">密码</span>
                     </div>
-                    <input type="password" name="password" class="form-control" placeholder="密码">
+                    <input type="password" name="register[password]" class="form-control" placeholder="密码">
                 </div>
-                @error('password')
+                @error('register.password')
                 <x-admin::form.error :message="$message"/>
                 @enderror
             </div>