From 5b83f02098edeaafdae5c47875efbbfa2392adb6 Mon Sep 17 00:00:00 2001
From: pushuo <pushuo@guangda.work>
Date: Tue, 23 May 2023 03:10:13 +0000
Subject: [PATCH] !106 Fix the h5 navigation without links and click to jump to
 the home page * Fix the h5 navigation without links and click to jump to the
 home page

---
 public/catalog/demo/.DS_Store                | Bin 6148 -> 0 bytes
 resources/beike/shop/default/css/header.scss |   9 +++++++--
 themes/default/shared/menu-mobile.blade.php  |   6 ++++--
 3 files changed, 11 insertions(+), 4 deletions(-)
 delete mode 100644 public/catalog/demo/.DS_Store

diff --git a/public/catalog/demo/.DS_Store b/public/catalog/demo/.DS_Store
deleted file mode 100644
index 59592c80ef14baefa2a1cfb59c191841f7d07764..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHKJ5Iwu5Pb^~grAgjG)O)GNQ4?BCo+8?4JG6wKuY2$!PG7(IR~ep;0Bz75{Z&G
zyQ^TwNuWXq%~-Q<cXnny`)ql<08At4)_@9tGF5P8gUuX~dC`Kbc*{1?*fn|>_pfWM
zPCOVDyw&g*8IWhUhBmG+<W+cn`wz48gE)%X{kTngx&FTSc5(hvFZy)9^%>n{-;+Zw
zfpv^9MvN{Jba0n@la61LqDMBDNi}{>TrM-~4C1eB7JKFLIcZ8hJD3O~xW_H?>2Y*m
zdohN&+;H@`+&i0R^JB02bY?kQvVJz_pGD;Ihs|I1prQ;Y1IoZW23WI2%3BV#RR)v+
zWnjvHd>;a;VCXS*Xg?in>=A%iqS*@j73mNIkD<rZA!jJYg%Vw;@kb2f!f6k@U+6J)
z=)z(A;lubl8-GGE_U>Fiu<kISLv57-WgySMsvB0M{+}*B|L22rqzotn|B3-qids>F
zTk^HFusNx<0riq9B7UjEX$U*E6w_Bq@h;U0?SXWNp~uuAEfoC`urz3+4E!nspXD`o
A@&Et;

diff --git a/resources/beike/shop/default/css/header.scss b/resources/beike/shop/default/css/header.scss
index 5f922b70..cd28f9a8 100644
--- a/resources/beike/shop/default/css/header.scss
+++ b/resources/beike/shop/default/css/header.scss
@@ -384,12 +384,17 @@ header {
 
           .children-group {
             .children-title {
+              height: 44px;
               span {
-                width: 26px;
-                height: 26px;
+                margin-right: -10px;
+                width: 44px;
+                height: 42px;
                 display: flex;
                 align-items: center;
                 justify-content: center;
+                &:active {
+                  background-color: #eee;
+                }
 
                 &[aria-expanded="true"] {
                   i::before {
diff --git a/themes/default/shared/menu-mobile.blade.php b/themes/default/shared/menu-mobile.blade.php
index ffba3c1a..b781f093 100644
--- a/themes/default/shared/menu-mobile.blade.php
+++ b/themes/default/shared/menu-mobile.blade.php
@@ -3,7 +3,7 @@
     @if ($menu['name'])
       <div class="accordion-item">
         <div class="nav-item-text">
-          <a class="nav-link" target="{{ isset($menu['new_window']) && $menu['new_window'] ? '_blank' : '_self' }}" href="{{ $menu['link'] ?? '' }}">
+          <a class="nav-link" target="{{ isset($menu['new_window']) && $menu['new_window'] ? '_blank' : '_self' }}" href="{{ $menu['link'] ?: '#flush-menu-' . $key }}" data-bs-toggle="{{  !$menu['link'] ? 'collapse' : ''}}">
             {{ $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'] }}">
@@ -20,9 +20,11 @@
           @forelse ($menu['children_group'] as $c_key => $group)
           <div class="children-group">
             @if ($group['name'])
-            <div class="d-flex justify-content-between align-items-center py-2 children-title">
+            <div class="d-flex justify-content-between align-items-center children-title" data-bs-toggle="collapse" data-bs-target="#children-menu-{{ $key }}-{{ $c_key }}">
               <div>{{ $group['name'] }}</div>
+              @if ($group['children'])
               <span class="collapsed" data-bs-toggle="collapse" data-bs-target="#children-menu-{{ $key }}-{{ $c_key }}"><i class="bi bi-plus-lg"></i></span>
+              @endif
             </div>
             @endif
             <div class="accordion-collapse collapse {{ !$group['name'] ? 'd-block' : '' }}" id="children-menu-{{ $key }}-{{ $c_key }}" data-bs-parent="#flush-menu-{{ $key }}">