From 438ddb21ec3bcdf2ca01c408ce13bbeaca7deacb Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Thu, 23 Jun 2022 16:50:21 +0800
Subject: [PATCH] share header

---
 .../Shop/Http/Controllers/HomeController.php  |  1 -
 beike/Shop/Http/Resources/CategoryList.php    |  2 +-
 beike/Shop/Providers/ShopServiceProvider.php  | 21 ++++++++-----------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/beike/Shop/Http/Controllers/HomeController.php b/beike/Shop/Http/Controllers/HomeController.php
index aedc7264..e15f34d9 100644
--- a/beike/Shop/Http/Controllers/HomeController.php
+++ b/beike/Shop/Http/Controllers/HomeController.php
@@ -12,7 +12,6 @@ class HomeController extends Controller
     public function index()
     {
         $data = [
-            'categories' => CategoryRepo::getTwoLevelCategories(),
             'category_products' => ProductRepo::getProductsByCategories([100002, 100003, 100004, 100005]),
         ];
 
diff --git a/beike/Shop/Http/Resources/CategoryList.php b/beike/Shop/Http/Resources/CategoryList.php
index 948dda6a..d9631790 100644
--- a/beike/Shop/Http/Resources/CategoryList.php
+++ b/beike/Shop/Http/Resources/CategoryList.php
@@ -18,7 +18,7 @@ class CategoryList extends JsonResource
         $item = [
             'id' => $this->id,
             'name' => $this->description->name ?? '',
-            'url' => url()->route('shop.categories.show', ['category' => $this])
+            // 'url' => url()->route('shop.categories.show', ['category' => $this])
         ];
 
         if ($this->relationLoaded('children') && $this->children->count() > 0) {
diff --git a/beike/Shop/Providers/ShopServiceProvider.php b/beike/Shop/Providers/ShopServiceProvider.php
index ec2908a3..cd96a7c1 100644
--- a/beike/Shop/Providers/ShopServiceProvider.php
+++ b/beike/Shop/Providers/ShopServiceProvider.php
@@ -2,18 +2,11 @@
 
 namespace Beike\Shop\Providers;
 
-use Beike\Console\Commands\MakeRootAdminUser;
-use Beike\Models\AdminUser;
 use Beike\Models\Setting;
-use Beike\Admin\View\Components\Filter;
-use Beike\Admin\View\Components\Header;
-use Beike\Admin\View\Components\Sidebar;
-use Beike\Admin\View\Components\Form\Input;
-use Beike\Admin\View\Components\Form\InputLocale;
-use Beike\Admin\View\Components\Form\SwitchRadio;
-use Illuminate\Support\Facades\Config;
-use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Str;
+use Illuminate\Support\Facades\View;
+use Illuminate\Support\ServiceProvider;
+use Beike\Shop\Repositories\CategoryRepo;
 
 class ShopServiceProvider extends ServiceProvider
 {
@@ -26,10 +19,9 @@ class ShopServiceProvider extends ServiceProvider
         }
 
         $this->loadRoutesFrom(__DIR__ . '/../Routes/shop.php');
-
         $this->mergeConfigFrom(__DIR__ . '/../../Config/beike.php', 'beike');
-
         $this->loadSettings();
+        $this->loadShareView();
     }
 
     protected function loadSettings()
@@ -46,4 +38,9 @@ class ShopServiceProvider extends ServiceProvider
         config(['global' => $settings]);
     }
 
+    protected function loadShareView()
+    {
+        $menuCategories = CategoryRepo::getTwoLevelCategories();
+        View::share('categories', $menuCategories);
+    }
 }