From 180f6f0b2cfb9c2aa5d826453815901d318f2eca Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Mon, 22 Aug 2022 17:31:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=AF=BC=E8=88=AA=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=96=B0=E7=AA=97=E5=8F=A3=E6=89=93=E5=BC=80=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Repositories/MenuRepo.php        |  1 +
 themes/default/layout/header.blade.php | 24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/beike/Repositories/MenuRepo.php b/beike/Repositories/MenuRepo.php
index 61907b9b..36e2712d 100644
--- a/beike/Repositories/MenuRepo.php
+++ b/beike/Repositories/MenuRepo.php
@@ -33,6 +33,7 @@ class MenuRepo
             $menu['link'] = handle_link($menu['link'])['link'] ?? '';
             $menu['name'] = $menu['name'][$locale] ?? '';
             $menu['badge']['name'] = $menu['badge']['name'][$locale] ?? '';
+            $menu['new_window'] = $menu['link']['new_window'] ?? false;
 
             if ($menu['childrenGroup']) {
                 $menu['children_group'] = self::handleChildrenGroup($menu['childrenGroup']);
diff --git a/themes/default/layout/header.blade.php b/themes/default/layout/header.blade.php
index f7a8be79..1bc4e7b9 100644
--- a/themes/default/layout/header.blade.php
+++ b/themes/default/layout/header.blade.php
@@ -52,7 +52,9 @@
           @foreach ($menu_content as $menu)
             <li
               class="nav-item {{ isset($menu['children_group']) ? 'dropdown' : '' }} {{ isset($menu['isFull']) && $menu['isFull'] ? 'position-static' : '' }}">
-              <a class="nav-link fw-bold {{ isset($menu['children_group']) ? 'dropdown-toggle' : '' }}" href="{{ $menu['link'] ?? '' }}">
+              <a class="nav-link fw-bold {{ isset($menu['children_group']) ? 'dropdown-toggle' : '' }}"
+                target="{{ isset($menu['new_window']) && $menu['new_window'] ? '_blank' : '_self' }}"
+                href="{{ $menu['link'] ?? '' }}">
                 {{ $menu['name'] }}
                 @if (isset($menu['badge']) && $menu['badge']['name'])
                   <span class="badge"
@@ -62,7 +64,8 @@
                 @endif
               </a>
               @if (isset($menu['children_group']) && $menu['children_group'])
-                <div class="dropdown-menu {{ $menu['isFull'] ? 'w-100' : '' }}" style="min-width: {{ count($menu['children_group']) * 200 }}px">
+                <div class="dropdown-menu {{ $menu['isFull'] ? 'w-100' : '' }}"
+                  style="min-width: {{ count($menu['children_group']) * 200 }}px">
                   <div class="card card-lg">
                     <div class="card-body">
                       <div class="container">
@@ -73,15 +76,20 @@
                                 <div class="mb-3 fw-bold group-name">{{ $group['name'] }}</div>
                               @endif
                               @if ($group['type'] == 'image')
-                                <a href="$group['image']['link']"><img src="{{ $group['image']['image'] }}" class="img-fluid"></a>
+                                <a
+                                target="{{ isset($group['image']['link']['new_window']) && $group['image']['link']['new_window'] ? '_blank' : '_self' }}"
+                                href="$group['image']['link']"><img src="{{ $group['image']['image'] }}"
+                                    class="img-fluid"></a>
                               @else
                                 <ul class="nav flex-column ul-children">
                                   @foreach ($group['children'] as $children)
                                     @if (!is_array($children['link']['text']))
-                                    <li class="nav-item">
-                                      <a class="nav-link px-0"
-                                      href="{{ $children['link']['link'] }}">{{ $children['link']['text'] }}</a>
-                                    </li>
+                                      <li class="nav-item">
+                                        <a
+                                        target="{{ isset($children['link']['new_window']) && $children['link']['new_window'] ? '_blank' : '_self' }}"
+                                        class="nav-link px-0"
+                                          href="{{ $children['link']['link'] }}">{{ $children['link']['text'] }}</a>
+                                      </li>
                                     @endif
                                   @endforeach
                                 </ul>
@@ -147,7 +155,7 @@
     <div class="mobile-content">
       <div class="left"><i class="bi bi-list"></i></div>
       <div class="center"><a href="{{ shop_route('home.index') }}">
-        <img src="{{ image_origin(system_setting('base.logo')) }}" class="img-fluid"></a>
+          <img src="{{ image_origin(system_setting('base.logo')) }}" class="img-fluid"></a>
       </div>
       <div class="right">
         <a href="{{ shop_route('account.index') }}" class="nav-link"><i class="iconfont">&#xe619;</i></a>