From 822df952900d1f971fe3c532cfda87129b3bf99a Mon Sep 17 00:00:00 2001
From: pushuo <229102104@qq.com>
Date: Thu, 18 Aug 2022 16:08:20 +0800
Subject: [PATCH] https://guangdagit.com/beike/beikeshop/issues/104

---
 .../components/account/sidebar.blade.php      | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/themes/default/components/account/sidebar.blade.php b/themes/default/components/account/sidebar.blade.php
index ebfd7adc..78bbe6b1 100644
--- a/themes/default/components/account/sidebar.blade.php
+++ b/themes/default/components/account/sidebar.blade.php
@@ -5,18 +5,25 @@
       <div class="account-name">{{ $customer->name }}</div>
       <div class="account-email">{{ $customer->email }}</div>
     </div>
+
     <nav class="list-group account-links">
-      <a class="list-group-item d-flex justify-content-between align-items-center active" href="{{ shop_route('account.index') }}">
+      <a class="list-group-item d-flex justify-content-between align-items-center {{ equal_route('shop.account.index') ? 'active' : '' }}"
+        href="{{ shop_route('account.index') }}">
         <span>{{ __('shop/account.index') }}</span></a>
-      <a class="list-group-item d-flex justify-content-between align-items-center" href="{{ shop_route('account.edit.index') }}">
+      <a class="list-group-item d-flex justify-content-between align-items-center {{ equal_route('shop.account.edit.index') ? 'active' : '' }}"
+        href="{{ shop_route('account.edit.index') }}">
         <span>修改个人信息</span></a>
-      <a class="list-group-item d-flex justify-content-between align-items-center" href="{{ shop_route('account.order.index') }}">
+      <a class="list-group-item d-flex justify-content-between align-items-center {{ equal_route('shop.account.order.index') || equal_route('shop.account.order.show') ? 'active' : '' }}"
+        href="{{ shop_route('account.order.index') }}">
         <span>我的订单</span></a>
-      <a class="list-group-item d-flex justify-content-between align-items-center" href="{{ shop_route('account.addresses.index') }}">
+      <a class="list-group-item d-flex justify-content-between align-items-center {{ equal_route('shop.account.addresses.index') ? 'active' : '' }}"
+        href="{{ shop_route('account.addresses.index') }}">
         <span>我的地址</span></a>
-      <a class="list-group-item d-flex justify-content-between align-items-center" href="{{ shop_route('account.wishlist.index') }}">
+      <a class="list-group-item d-flex justify-content-between align-items-center {{ equal_route('shop.account.wishlist.index') ? 'active' : '' }}"
+        href="{{ shop_route('account.wishlist.index') }}">
         <span>我的收藏</span></a>
-      <a class="list-group-item d-flex justify-content-between align-items-center" href="{{ shop_route('account.rma.index') }}">
+      <a class="list-group-item d-flex justify-content-between align-items-center {{ equal_route('shop.account.rma.index') || equal_route('shop.account.rma.show') ? 'active' : '' }}"
+        href="{{ shop_route('account.rma.index') }}">
         <span>我的售后</span></a>
       <a class="list-group-item d-flex justify-content-between align-items-center" href="{{ shop_route('logout') }}">
         <span>退出登录</span></a>