From b549299d171e33de1a086cf1add2f6cf2bc65069 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Thu, 30 Jun 2022 20:19:39 +0800
Subject: [PATCH] fixed header menu

---
 beike/Admin/View/Components/Header.php        | 13 +++++----
 beike/Helpers.php                             | 12 ++++++++
 .../migrations/2022_06_30_112601_order.php    | 28 +++++++++++++++++++
 .../admin/views/layouts/header.blade.php      | 28 -------------------
 4 files changed, 47 insertions(+), 34 deletions(-)
 create mode 100644 database/migrations/2022_06_30_112601_order.php

diff --git a/beike/Admin/View/Components/Header.php b/beike/Admin/View/Components/Header.php
index a784c9c8..e84c80b7 100644
--- a/beike/Admin/View/Components/Header.php
+++ b/beike/Admin/View/Components/Header.php
@@ -15,12 +15,13 @@ class Header extends Component
      */
     public function __construct()
     {
-        $this->addLink('管理首页', admin_route('home.index'), true);
-        $this->addLink('订单管理', admin_route('home.index'));
-        $this->addLink('商品管理', admin_route('products.index'));
-        $this->addLink('会员管理', admin_route('customers.index'));
-        $this->addLink('插件管理', admin_route('plugins.index'));
-        $this->addLink('系统设置', admin_route('home.index'));
+        $this->addLink('管理首页', admin_route('home.index'), equal_route('admin.home.index'));
+        $this->addLink('订单管理', admin_route('home.index'), equal_route('admin.home.index'));
+        $this->addLink('商品管理', admin_route('products.index'), equal_route('admin.home.index'));
+        $this->addLink('会员管理', admin_route('customers.index'), equal_route('admin.home.index'));
+        $this->addLink('营销管理', admin_route('home.index'), equal_route('admin.home.index'));
+        $this->addLink('插件管理', admin_route('plugins.index'), equal_route('admin.home.index'));
+        $this->addLink('系统设置', admin_route('home.index'), equal_route('admin.home.index'));
     }
 
     /**
diff --git a/beike/Helpers.php b/beike/Helpers.php
index 26989f30..4b85a1a3 100644
--- a/beike/Helpers.php
+++ b/beike/Helpers.php
@@ -2,6 +2,7 @@
 
 use Beike\Models\AdminUser;
 use Beike\Models\Customer;
+use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Str;
 use Illuminate\Contracts\Auth\Authenticatable;
 
@@ -42,6 +43,17 @@ function shop_route($route, $params = []): string
     return route('shop.' . $route, $params);
 }
 
+/**
+ * 是否为当前访问路由
+ *
+ * @param $routeName
+ * @return bool
+ */
+function equal_route($routeName): bool
+{
+    return $routeName == Route::getCurrentRoute()->getName();
+}
+
 /**
  * 获取后台当前登录用户
  *
diff --git a/database/migrations/2022_06_30_112601_order.php b/database/migrations/2022_06_30_112601_order.php
new file mode 100644
index 00000000..1b14dce2
--- /dev/null
+++ b/database/migrations/2022_06_30_112601_order.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class Order extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        //
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+}
diff --git a/resources/beike/admin/views/layouts/header.blade.php b/resources/beike/admin/views/layouts/header.blade.php
index 5890f8a1..e69de29b 100644
--- a/resources/beike/admin/views/layouts/header.blade.php
+++ b/resources/beike/admin/views/layouts/header.blade.php
@@ -1,28 +0,0 @@
-<div class="header-wrap">
-  <div class="header-left">
-    <div class="logo">
-      {{-- <img src="http://dummyimage.com/200x50" class="img-fluid"> --}}
-      <div class="text-center"><h5 class="mb-0">beike admin</h5></div>
-    </div>
-  </div>
-  <div class="header-right">
-    <ul class="navbar navbar-right">
-      <li class="nav-item"><a href="{{ admin_route('home.index') }}" class="nav-link">管理首页</a></li>
-      <li class="nav-item"><a href="" class="nav-link">订单管理</a></li>
-      <li class="nav-item active"><a href="{{ admin_route('products.index') }}" class="nav-link">商品管理</a></li>
-      <li class="nav-item"><a href="" class="nav-link">会员管理</a></li>
-      <li class="nav-item"><a href="" class="nav-link">营销管理</a></li>
-      <li class="nav-item"><a href="" class="nav-link">系统设置</a></li>
-    </ul>
-    <ul class="navbar">
-      <li class="nav-item"><a href="{{ admin_route('logout.index') }}" class="nav-link">退出登录</a></li>
-      <li class="nav-item">
-
-        <a href="" class="nav-link">
-          <img src="http://dummyimage.com/100x100" class="avatar img-fluid rounded-circle me-1">
-          <span class="text-dark ml-2">{{ auth()->user()->name }}</span>
-        </a>
-      </li>
-    </ul>
-  </div>
-</div>