头部显示用户名称错误

This commit is contained in:
pushuo 2022-08-10 14:06:21 +08:00
parent 476a7c89dc
commit 7310e822c5
1 changed files with 50 additions and 32 deletions

View File

@ -14,7 +14,9 @@
<div class="dropdown-menu" aria-labelledby="currency-dropdown"> <div class="dropdown-menu" aria-labelledby="currency-dropdown">
@foreach (currencies() as $currency) @foreach (currencies() as $currency)
<a class="dropdown-item" href="{{ shop_route('currency.switch', [$currency->code]) }}">{{ $currency->symbol_left }} {{ $currency->name }}</a> <a class="dropdown-item"
href="{{ shop_route('currency.switch', [$currency->code]) }}">{{ $currency->symbol_left }}
{{ $currency->name }}</a>
@endforeach @endforeach
</div> </div>
</div> </div>
@ -26,7 +28,8 @@
<div class="dropdown-menu" aria-labelledby="language-dropdown"> <div class="dropdown-menu" aria-labelledby="language-dropdown">
@foreach ($languages as $language) @foreach ($languages as $language)
<a class="dropdown-item" href="{{ shop_route('lang.switch', [$language->code]) }}">{{ $language->name }}</a> <a class="dropdown-item"
href="{{ shop_route('lang.switch', [$language->code]) }}">{{ $language->name }}</a>
@endforeach @endforeach
</div> </div>
</div> </div>
@ -41,52 +44,67 @@
<div class="header-content py-3"> <div class="header-content py-3">
<div class="container navbar-expand-lg"> <div class="container navbar-expand-lg">
<div class="logo"><a href="{{ shop_route('home.index') }}"><img src="{{ asset('image/logo.png') }}" class="img-fluid"></a></div> <div class="logo"><a href="{{ shop_route('home.index') }}"><img src="{{ asset('image/logo.png') }}"
class="img-fluid"></a></div>
<div class="menu-wrap"> <div class="menu-wrap">
<ul class="navbar-nav mx-auto"> <ul class="navbar-nav mx-auto">
@foreach ($categories as $category) @foreach ($categories as $category)
<li class="dropdown"> <li class="dropdown">
<a <a target="{{ (isset($category['new_window']) and $category['new_window']) ? '_blank' : '_self' }}"
target="{{ (isset($category['new_window']) and $category['new_window']) ? '_blank' : '_self' }}" class="nav-link {{ (isset($category['children']) and $category['children']) ? 'dropdown-toggle' : '' }}"
class="nav-link {{ (isset($category['children']) and $category['children']) ? 'dropdown-toggle' : '' }}" href="{{ $category['url'] }}">
href="{{ $category['url'] }}"> {{ $category['name'] }}
{{ $category['name'] }} </a>
</a> @if (isset($category['children']) and $category['children'])
@if (isset($category['children']) and $category['children']) <ul class="dropdown-menu">
<ul class="dropdown-menu"> @forelse ($category['children'] as $child)
@forelse ($category['children'] as $child) <li><a target="{{ (isset($child['new_window']) and $child['new_window']) ? '_blank' : '_self' }}"
<li><a target="{{ (isset($child['new_window']) and $child['new_window']) ? '_blank' : '_self' }}" href="{{ $child['url'] }}" class="dropdown-item">{{ $child['name'] }}</a></li> href="{{ $child['url'] }}" class="dropdown-item">{{ $child['name'] }}</a></li>
@endforeach @endforeach
</ul> </ul>
@endif @endif
</li> </li>
@endforeach @endforeach
</ul> </ul>
{{-- <a href="{{ shop_route('categories.show', $category) }}">{{ $category->description->name }}</a> --}} {{-- <a href="{{ shop_route('categories.show', $category) }}">{{ $category->description->name }}</a> --}}
</div> </div>
<div class="right-btn"> <div class="right-btn">
<ul class="navbar-nav flex-row"> <ul class="navbar-nav flex-row">
<li class="nav-item"><a href="#offcanvas-search-top" data-bs-toggle="offcanvas" aria-controls="offcanvasExample" class="nav-link"><i class="iconfont">&#xe8d6;</i></a></li> <li class="nav-item"><a href="#offcanvas-search-top" data-bs-toggle="offcanvas"
<li class="nav-item"><a href="{{ shop_route('account.wishlist.index') }}" class="nav-link"><i class="iconfont">&#xe662;</i></a></li> aria-controls="offcanvasExample" class="nav-link"><i class="iconfont">&#xe8d6;</i></a></li>
<li class="nav-item"><a href="{{ shop_route('account.wishlist.index') }}" class="nav-link"><i
class="iconfont">&#xe662;</i></a></li>
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a href="{{ shop_route('account.index') }}" class="nav-link"><i class="iconfont">&#xe619;</i></a> <a href="{{ shop_route('account.index') }}" class="nav-link"><i class="iconfont">&#xe619;</i></a>
<ul class="dropdown-menu dropdown-menu-end"> <ul class="dropdown-menu dropdown-menu-end">
@auth('web_shop') @auth('web_shop')
<li class="dropdown-item"><h6 class="mb-0">Pu Shuo</h6></li> <li class="dropdown-item">
<li><hr class="dropdown-divider"></li> <h6 class="mb-0">{{ current_customer()->name }}</h6>
<li><a href="{{ shop_route('account.index') }}" class="dropdown-item"><i class="bi bi-person me-1"></i> 个人中心</a></li> </li>
<li><a href="{{ shop_route('account.order.index') }}" class="dropdown-item"><i class="bi bi-clipboard-check me-1"></i> 我的订单</a></li> <li>
<li><a href="{{ shop_route('account.wishlist.index') }}" class="dropdown-item"><i class="bi bi-heart me-1"></i> 我的收藏</a></li> <hr class="dropdown-divider">
<li><hr class="dropdown-divider"></li> </li>
<li><a href="{{ shop_route('logout') }}" class="dropdown-item"><i class="bi bi-box-arrow-left me-1"></i> 退出登录</a></li> <li><a href="{{ shop_route('account.index') }}" class="dropdown-item"><i class="bi bi-person me-1"></i>
个人中心</a></li>
<li><a href="{{ shop_route('account.order.index') }}" class="dropdown-item"><i
class="bi bi-clipboard-check me-1"></i> 我的订单</a></li>
<li><a href="{{ shop_route('account.wishlist.index') }}" class="dropdown-item"><i
class="bi bi-heart me-1"></i> 我的收藏</a></li>
<li>
<hr class="dropdown-divider">
</li>
<li><a href="{{ shop_route('logout') }}" class="dropdown-item"><i class="bi bi-box-arrow-left me-1"></i>
退出登录</a></li>
@else @else
<li><a href="{{ shop_route('login.index') }}" class="dropdown-item"><i class="bi bi-box-arrow-right me-1"></i> 登录/注册</a></li> <li><a href="{{ shop_route('login.index') }}" class="dropdown-item"><i
class="bi bi-box-arrow-right me-1"></i> 登录/注册</a></li>
@endauth @endauth
</ul> </ul>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" data-bs-toggle="offcanvas" href="#offcanvas-right-cart" role="button" aria-controls="offcanvasExample"> <a class="nav-link" data-bs-toggle="offcanvas" href="#offcanvas-right-cart" role="button"
aria-controls="offcanvasExample">
<i class="iconfont">&#xe634;</i> <i class="iconfont">&#xe634;</i>
<div class="navbar-icon-link-badge"></div> <div class="navbar-icon-link-badge"></div>
</a> </a>
@ -118,9 +136,9 @@
<div class="offcanvas offcanvas-top" tabindex="-1" id="offcanvas-search-top" aria-labelledby="offcanvasTopLabel"> <div class="offcanvas offcanvas-top" tabindex="-1" id="offcanvas-search-top" aria-labelledby="offcanvasTopLabel">
<div class="offcanvas-header"> <div class="offcanvas-header">
<input type="text" class="form-control input-group-lg border-0 fs-4" focus placeholder="Type your search here" aria-label="Type your search here" aria-describedby="button-addon2"> <input type="text" class="form-control input-group-lg border-0 fs-4" focus
placeholder="Type your search here" aria-label="Type your search here" aria-describedby="button-addon2">
<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button> <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
</div> </div>
</div> </div>
</header> </header>