Compare commits

..

2 Commits

Author SHA1 Message Date
179a5ca27c Merge pull request '共通部品呼び出し修正' (#12) from main_higashide into main
All checks were successful
Deploy so-manager (auto) / deploy (push) Successful in 20s
Reviewed-on: #12
2025-09-09 13:51:48 +09:00
1c555a0a18 共通部品呼び出し修正 2025-09-09 13:48:42 +09:00
4 changed files with 70 additions and 8 deletions

View File

@ -17,7 +17,17 @@
<link rel="stylesheet" href="{{ asset('assets/css/mypage/tablesorter-blue.css') }}" type="text/css" media="print, projection, screen"> <link rel="stylesheet" href="{{ asset('assets/css/mypage/tablesorter-blue.css') }}" type="text/css" media="print, projection, screen">
<link href="{{ asset('assets/css/mypage/style.css') }}" rel="stylesheet"> <link href="{{ asset('assets/css/mypage/style.css') }}" rel="stylesheet">
<link href="{{ asset('assets/css/mypage/jquery-confirm.min.css') }}" rel="stylesheet"> <link href="{{ asset('assets/css/mypage/jquery-confirm.min.css') }}" rel="stylesheet">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.1/font/bootstrap-icons.css">
@yield('head') @yield('head')
<style>
#main-news.jumbotron {
margin-bottom: 0 !important;
}
footer.jumbotron {
margin-top: 0 !important;
}
</style>
</head> </head>
<body> <body>
@ -31,14 +41,15 @@
</main> </main>
{{-- フッターメニュー --}} {{-- フッターメニュー --}}
@include('partials.mypagefootermenu') @include('partials.mypagefootermenu')
{{-- ニュース・フッターiframe --}} {{-- ニュース --}}
<iframe src="{{ asset('news.html') }}" width="100%" height="450" scrolling="no" style="border:none; display:block; margin:0; padding:0;"></iframe> @include('partials.news')
<iframe src="{{ asset('footer.html') }}" width="100%" height="200" style="border:none; display:block; margin:0; padding:0;"></iframe> {{-- フッター --}}
@include('partials.footer')
</div> </div>
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" crossorigin="anonymous"></script> <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" crossorigin="anonymous"></script>
<script> <script>
window.jQuery || document.write('<script src="{{ asset(' var jqueryPath = "{{ asset('assets/js/vendor/jquery.min.js') }}";
assets / js / vendor / jquery.min.js ') }}"><\/script>') window.jQuery || document.write('<script src="' + jqueryPath + '"><\/script>');
</script> </script>
<script src="{{ asset('assets/js/vendor/popper.min.js') }}"></script> <script src="{{ asset('assets/js/vendor/popper.min.js') }}"></script>
<script src="{{ asset('bootstrap/js/bootstrap.min.js') }}"></script> <script src="{{ asset('bootstrap/js/bootstrap.min.js') }}"></script>

View File

@ -19,7 +19,7 @@ if (!isset($active_menu)) $active_menu = '';
<li class="nav-item {{ $active_menu == 'SWC-1-1' ? 'active' : '' }}"><a class="nav-link" href="{{ url('/user/info') }}">ユーザー情報確認</a></li> <li class="nav-item {{ $active_menu == 'SWC-1-1' ? 'active' : '' }}"><a class="nav-link" href="{{ url('/user/info') }}">ユーザー情報確認</a></li>
<li class="nav-item {{ $active_menu == 'SWC-3-1' ? 'active' : '' }}"><a class="nav-link" href="{{ url('/regular_contract/info') }}">定期契約情報</a></li> <li class="nav-item {{ $active_menu == 'SWC-3-1' ? 'active' : '' }}"><a class="nav-link" href="{{ url('/regular_contract/info') }}">定期契約情報</a></li>
<li class="nav-item {{ $active_menu == 'SWC-4-1' ? 'active' : '' }}"><a class="nav-link" href="{{ url('/regular_contract/update') }}">契約更新</a></li> <li class="nav-item {{ $active_menu == 'SWC-4-1' ? 'active' : '' }}"><a class="nav-link" href="{{ url('/regular_contract/update') }}">契約更新</a></li>
<li class="nav-item {{ $active_menu == 'SWC-6-1' ? 'active' : '' }}"><a class="nav-link" href="{{ url('SWC-6-1.html') }}">契約履歴</a></li> <li class="nav-item {{ $active_menu == 'SWC-6-1' ? 'active' : '' }}"><a class="nav-link" href="{{ url('/regular_contract/history') }}">契約履歴</a></li>
<li class="nav-item {{ $active_menu == 'SWC-8-1' ? 'active' : '' }}"><a class="nav-link" href="{{ url('/regular_contract/create') }}">新規定期契約</a></li> <li class="nav-item {{ $active_menu == 'SWC-8-1' ? 'active' : '' }}"><a class="nav-link" href="{{ url('/regular_contract/create') }}">新規定期契約</a></li>
<li class="nav-item {{ $active_menu == 'SWC-11-1' ? 'active' : '' }}"><a class="nav-link" href="{{ url('/park_waitlist') }}">空き待ち状況確認</a></li> <li class="nav-item {{ $active_menu == 'SWC-11-1' ? 'active' : '' }}"><a class="nav-link" href="{{ url('/park_waitlist') }}">空き待ち状況確認</a></li>
<li class="nav-item {{ $active_menu == 'SWC-10-1' ? 'active' : '' }}"><a class="nav-link" href="{{ url('SWC-10-1.html') }}">駐輪場検索</a></li> <li class="nav-item {{ $active_menu == 'SWC-10-1' ? 'active' : '' }}"><a class="nav-link" href="{{ url('SWC-10-1.html') }}">駐輪場検索</a></li>

View File

@ -26,7 +26,7 @@
</div> </div>
<div class="col-6 col-md-2 mb20"> <div class="col-6 col-md-2 mb20">
<div class="card text-center border-success"> <div class="card text-center border-success">
<a href="{{ url('SWC-6-1.html') }}" target="_top"> <a href="{{ url('regular_contract/history') }}" target="_top">
<figure><img src="{{ asset('assets/img/menu-rireki.png') }}" alt="" class="w-75 mt10"></figure> <figure><img src="{{ asset('assets/img/menu-rireki.png') }}" alt="" class="w-75 mt10"></figure>
<p class="text-success">定期契約履歴を<br>見る</p> <p class="text-success">定期契約履歴を<br>見る</p>
</a> </a>

View File

@ -151,5 +151,56 @@ Route::post('/login', function (Request $request) {
// ウェルネット決済画面(仮) // ウェルネット決済画面(仮)
Route::get('/wellnet/payment', function (): mixed { Route::get('/wellnet/payment', function (): mixed {
return '<h1>ウェルネット決済画面</h1>'; $html = <<<HTML
<!DOCTYPE html>
<html lang="ja">
<head>
<meta charset="UTF-8">
<title>ウェルネット決済画面(仮)</title>
<style>
body { background:#f7f7f7; font-family:sans-serif; }
.pay-container {
max-width:500px; margin:40px auto; background:#fff; border-radius:10px;
box-shadow:0 2px 8px rgba(0,0,0,0.08); padding:32px 24px;
}
.pay-title { font-size:1.2em; font-weight:bold; margin-bottom:12px; }
.pay-section { margin-bottom:24px; }
.pay-row { display:flex; align-items:center; margin-bottom:8px; }
.pay-label { width:140px; font-weight:bold; }
.pay-icons img { height:22px; margin-right:6px; vertical-align:middle; }
.pay-bank-icons img { height:18px; margin-right:4px; vertical-align:middle; }
.pay-box { background:#e6f7e6; border:1px solid #7ed957; border-radius:6px; padding:8px 12px; margin-bottom:8px; }
</style>
</head>
<body>
<div class="pay-container">
<div class="pay-section">
<div class="pay-title">クレジットでのお支払い</div>
<div class="pay-box">
<span class="pay-label">クレジット</span>
</div>
</div>
<div class="pay-section">
<div class="pay-title">コンビニでのお支払い</div>
<div class="pay-box"><span class="pay-label">ローソン</span><span class="pay-icons"></span></div>
<div class="pay-box"><span class="pay-label">ファミリーマート</span><span class="pay-icons"></span></div>
<div class="pay-box"><span class="pay-label">サークルKサンクス</span><span class="pay-icons"></span></div>
<div class="pay-box"><span class="pay-label">ミニストップ</span><span class="pay-icons"></span></div>
<div class="pay-box"><span class="pay-label">セイコーマート</span><span class="pay-icons"></span></div>
<div class="pay-box"><span class="pay-label">デイリーヤマザキ</span><span class="pay-icons"></span></div>
</div>
<div class="pay-section">
<div class="pay-title">銀行でのお支払い</div>
<div class="pay-box">
<span class="pay-label">ATM</span>
</div>
<div class="pay-box">
<span class="pay-label">ネットバンキング</span>
</div>
</div>
</div>
</body>
</html>
HTML;
return $html;
})->name('wellnet.payment'); })->name('wellnet.payment');