From 0ea1809b24c25009d08a70b2d87ba22f3cf312bc Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 8 Sep 2022 15:26:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E8=88=AA=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 themes/default/shared/menu-mobile.blade.php | 57 +--------------------
 themes/default/shared/menu-pc.blade.php     |  2 +-
 2 files changed, 2 insertions(+), 57 deletions(-)

diff --git a/themes/default/shared/menu-mobile.blade.php b/themes/default/shared/menu-mobile.blade.php
index b3815177..b99c2c84 100644
--- a/themes/default/shared/menu-mobile.blade.php
+++ b/themes/default/shared/menu-mobile.blade.php
@@ -1,58 +1,3 @@
-{{-- <ul class="navbar-nav">
-  @foreach ($menu_content as $menu)
-    <li
-      class="nav-item">
-      <div class="nav-item-text">
-        <a class="nav-link"
-          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"
-              style="background-color: {{ $menu['badge']['bg_color'] }}; color: {{ $menu['badge']['text_color'] }}; border-color: {{ $menu['badge']['bg_color'] }}">
-              {{ $menu['badge']['name'] }}
-            </span>
-          @endif
-        </a>
-        @if (isset($menu['children_group']) && $menu['children_group'])
-        <span><i class="bi bi-chevron-right"></i></span>
-        @endif
-      </div>
-      @if (isset($menu['children_group']) && $menu['children_group'])
-        <div class="dropdown-menu">
-          @forelse ($menu['children_group'] as $group)
-            <div class="children-group">
-              @if ($group['name'])
-                <div class="mb-3 fw-bold group-name">{{ $group['name'] }}</div>
-              @endif
-              @if ($group['type'] == 'image')
-                <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
-                        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>
-              @endif
-            </div>
-          @endforeach
-        </div>
-      @endif
-    </li>
-  @endforeach
-</ul> --}}
-
-
 <div class="accordion accordion-flush" id="menu-accordion">
   @foreach ($menu_content as $key => $menu)
     <div class="accordion-item">
@@ -87,7 +32,7 @@
               @else
                 <ul class="nav flex-column ul-children">
                   @foreach ($group['children'] as $children)
-                    @if (!is_array($children['link']['text']))
+                    @if (!is_array($children['link']['text']) && $children['link']['text'])
                       <li class="nav-item">
                         <a
                         target="{{ isset($children['link']['new_window']) && $children['link']['new_window'] ? '_blank' : '_self' }}"
diff --git a/themes/default/shared/menu-pc.blade.php b/themes/default/shared/menu-pc.blade.php
index 012a6eff..8e859781 100644
--- a/themes/default/shared/menu-pc.blade.php
+++ b/themes/default/shared/menu-pc.blade.php
@@ -33,7 +33,7 @@
                       @else
                         <ul class="nav flex-column ul-children">
                           @foreach ($group['children'] as $children)
-                            @if (!is_array($children['link']['text']))
+                            @if (!is_array($children['link']['text']) && $children['link']['text'])
                               <li class="nav-item">
                                 <a
                                 target="{{ isset($children['link']['new_window']) && $children['link']['new_window'] ? '_blank' : '_self' }}"