Merge pull request '1/26 ログイン画面修正' (#57) from main_watanabe into main

Reviewed-on: #57

app/Http/Controllers/LoginController.php

@@ -12,18 +12,18 @@ use Illuminate\Support\Facades\Log;
 class LoginController extends Controller
 {
     // ログイン処理
-    public function login(Request $request)
+    public function login(Request $request, $management_code)
     {
         // ID・パスワードチェック
         $existingMember = User::where('user_primemail', $request->input('login_id'))->where('user_quit_flag', 0)->first();
         if (!$existingMember || !CommonFunction::verifyPassword($existingMember->user_seq, $request->input('password'), $existingMember->user_pass)) {
-            return redirect('swo8_1')
+            return redirect("{$management_code}/swo8_1")
                 ->withErrors(['login' => 'ID/パスワードが間違っています'])
                 ->withInput();
         }
 
         // セッションにユーザ情報を保存してマイページトップへ遷移
         session(['user_id' => $existingMember->user_id]);
-        return redirect()->intended(route('mypage'));
+        return redirect()->intended(route('mypage', ['management_code' => $management_code]));
     }
 }

resources/views/general/swo8_1.blade.php

@@ -21,7 +21,7 @@
                     <div class="col-12 col-lg-6 text-lg-center offset-0 offset-lg-3 mt30 mb50">
                       <div class="text-danger">@if ($errors->any()) @foreach ($errors->all() as $error) {{ $error }} @endforeach @endif</div><br />
                       <input type="submit" name="submit" class="btn btn-block btn-lg btn-success" value="ログイン" /><br>
-                      <a href="{{route('swo2_1',['management_code' => request()->route('management_code')])}}" class="text-secondary mt20">新規会員登録はこちら 〉</a><br>
+                      <a href="{{route('member_regist',['management_code' => request()->route('management_code')])}}" class="text-secondary mt20">新規会員登録はこちら 〉</a><br>
                       <a href="{{route('swo8_2',['management_code' => request()->route('management_code')])}}" class="text-secondary mt20">パスワードを忘れた方はこちら 〉</a>
                     </div>
                     @csrf