diff --git a/app/Http/Controllers/LoginController.php b/app/Http/Controllers/LoginController.php index 30d4aee..d03ccae 100644 --- a/app/Http/Controllers/LoginController.php +++ b/app/Http/Controllers/LoginController.php @@ -157,7 +157,7 @@ public function memberNormalLogin(Request $request) return redirect()->route('member.index'); } else { - return redirect()->route('front.login.view')->with('error', '帳號密碼錯誤'); + return redirect()->route('login')->with('error', '帳號密碼錯誤'); } } diff --git a/app/Http/Controllers/front/RegisterController.php b/app/Http/Controllers/front/RegisterController.php index e83e65c..819ab8d 100644 --- a/app/Http/Controllers/front/RegisterController.php +++ b/app/Http/Controllers/front/RegisterController.php @@ -35,14 +35,8 @@ public function create(Request $request) 'phone' => $request->phone ?? '', ]); - if (isset($newUser->email)) { + return redirect()->route('login')->with('sucess', '完成註冊,請登入'); - return redirect()->route('member.index')->with('sucess', '完成註冊'); - - } else { - - return redirect()->route('member.profile')->with('sucess', '完成註冊,請完善你得資料'); - } } diff --git a/resources/views/admin/login.blade.php b/resources/views/admin/login.blade.php index f0094d7..45532d9 100644 --- a/resources/views/admin/login.blade.php +++ b/resources/views/admin/login.blade.php @@ -231,6 +231,14 @@ + + + + + + + + @if (session('error')) -@endif - - - - - - - +@endif \ No newline at end of file diff --git a/resources/views/front/member/auth-register.blade.php b/resources/views/front/member/auth-register.blade.php index a1bcdda..4f4238f 100644 --- a/resources/views/front/member/auth-register.blade.php +++ b/resources/views/front/member/auth-register.blade.php @@ -157,7 +157,7 @@

已經有帳號? - + 由此登入

@@ -388,6 +388,11 @@ function validateEmailField(field) { // 如果所有欄位均有效,執行表單提交 if (isFormValid && isPhoneValid) { + $.ajaxSetup({ + headers: { + 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') + } +}); $.ajax({ url: "{{ route('member.register.create') }}", type: 'POST',