From 0935d95e978f08203a3e5835d3b3d25798cf777c Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Mon, 15 Aug 2022 10:25:30 +0800
Subject: [PATCH] wip

---
 beike/Repositories/MenuRepo.php                             | 3 ++-
 .../beike/admin/views/pages/design/builder/menu.blade.php   | 2 +-
 themes/default/layout/header.blade.php                      | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/beike/Repositories/MenuRepo.php b/beike/Repositories/MenuRepo.php
index a7d2151a..a22c67ed 100644
--- a/beike/Repositories/MenuRepo.php
+++ b/beike/Repositories/MenuRepo.php
@@ -43,6 +43,8 @@ class MenuRepo
 
             if ($menu['childrenGroup']) {
                 foreach ($menu['childrenGroup'] as $group_index => $childrenGroup) {
+                    $menus[$index]['childrenGroup'][$group_index]['name'] = $childrenGroup['name'][$locale];
+
                     if ($childrenGroup['type'] == 'image') {
                         $menus[$index]['childrenGroup'][$group_index]['image']['image'] = image_origin($childrenGroup['image']['image'][$locale]);
                         $menus[$index]['childrenGroup'][$group_index]['image']['link'] = type_route($childrenGroup['image']['link']['type'], $childrenGroup['image']['link']['value']);
@@ -53,7 +55,6 @@ class MenuRepo
                     if (empty($childrenGroup['children'])) {
                         unset($menus[$index]['childrenGroup'][$group_index]);
                     } else {
-                        $menus[$index]['childrenGroup'][$group_index]['name'] = $childrenGroup['name'][$locale];
                         if ($childrenGroup['children']) {
                             foreach ($childrenGroup['children'] as $children_index => $children) {
                                 $menus[$index]['childrenGroup'][$group_index]['children'][$children_index]['link'] = self::handleLink($children['link']);
diff --git a/resources/beike/admin/views/pages/design/builder/menu.blade.php b/resources/beike/admin/views/pages/design/builder/menu.blade.php
index 24aa6aa8..0984fd34 100644
--- a/resources/beike/admin/views/pages/design/builder/menu.blade.php
+++ b/resources/beike/admin/views/pages/design/builder/menu.blade.php
@@ -99,7 +99,7 @@
                   <text-i18n v-model="group.name" class="mb-3"></text-i18n>
                   <div class="group-children">
                     <div v-if="group.type == 'image'">
-                      <pb-image-selector v-model="group.image.image"></pb-image-selector>
+                      <pb-image-selector v-model="group.image.image" class="mb-2"></pb-image-selector>
                       <link-selector v-model="group.image.link"></link-selector>
                     </div>
                     <template v-else>
diff --git a/themes/default/layout/header.blade.php b/themes/default/layout/header.blade.php
index 1524cfac..329205f9 100644
--- a/themes/default/layout/header.blade.php
+++ b/themes/default/layout/header.blade.php
@@ -70,12 +70,12 @@
                         <div class="row">
                           @forelse ($menu['childrenGroup'] as $group)
                             <div class="col-6 col-md">
+                              @if ($group['name'])
+                                <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>
                               @else
-                                @if ($group['name'])
-                                  <div class="mb-3 fw-bold group-name">{{ $group['name'] }}</div>
-                                @endif
                                 <ul class="nav flex-column ul-children">
                                   @foreach ($group['children'] as $children)
                                     @if (!is_array($children['link']['text']))