diff --git a/app/Admin/Controllers/HomeController.php b/app/Admin/Controllers/HomeController.php index 2f14885f..7b2f259e 100644 --- a/app/Admin/Controllers/HomeController.php +++ b/app/Admin/Controllers/HomeController.php @@ -54,7 +54,7 @@ class HomeController extends Controller // 'title' => $menu->title, // 'uri' => $menu->uri, // ]); - // dump($activeMenu->isActive($menu->toArray(), 'dealer-orders/21')); + // dump($activeMenu->isActive($menu->toArray(), 'dealer-earnings-manage?filter-earningable_type%5B0%5D=dealer_manage_subsidy&_pjax=%23pjax-container&page=2')); // } // dd(123465); // } diff --git a/app/Admin/Renderable/Grid/Filter/DealerEarningStatusIn.php b/app/Admin/Renderable/Grid/Filter/DealerEarningStatusIn.php index a5554fee..eb140bc2 100644 --- a/app/Admin/Renderable/Grid/Filter/DealerEarningStatusIn.php +++ b/app/Admin/Renderable/Grid/Filter/DealerEarningStatusIn.php @@ -60,7 +60,7 @@ class DealerEarningStatusIn extends Filter $query->where('status', 1); break; case 5: - $query->where('status', 1); + $query->where('status', 5); break; } } diff --git a/app/Models/Admin/Layout/Menu.php b/app/Models/Admin/Layout/Menu.php index 2fb822ab..88265897 100644 --- a/app/Models/Admin/Layout/Menu.php +++ b/app/Models/Admin/Layout/Menu.php @@ -26,6 +26,12 @@ class Menu extends DcatLayoutMenu if (empty($_uri) && $path !== 'admin') { return false; } + if (strpos($path, '?')) { + $path = substr($path, 0, strpos($path, '?')); + } + if (strpos($_uri, '?')) { + $_uri = substr($_uri, 0, strpos($_uri, '?')); + } return strpos('/'.$path, $_uri) !== false; } @@ -34,6 +40,12 @@ class Menu extends DcatLayoutMenu if (empty($_uri) && $path !== 'admin') { return false; } + if (strpos($path, '?')) { + $path = substr($path, 0, strpos($path, '?')); + } + if (strpos($_uri, '?')) { + $_uri = substr($_uri, 0, strpos($_uri, '?')); + } if (strpos('/'.$path, $_uri) !== false) { return true; }