From 52fa511d52da128766811b43a57cee1863ccf0de Mon Sep 17 00:00:00 2001 From: pushuo <229102104@qq.com> Date: Mon, 22 Aug 2022 17:12:18 +0800 Subject: [PATCH] no message --- beike/Admin/Http/Controllers/ProductController.php | 2 ++ .../beike/admin/views/pages/products/index.blade.php | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/beike/Admin/Http/Controllers/ProductController.php b/beike/Admin/Http/Controllers/ProductController.php index 77617904..282c8492 100644 --- a/beike/Admin/Http/Controllers/ProductController.php +++ b/beike/Admin/Http/Controllers/ProductController.php @@ -25,6 +25,7 @@ class ProductController extends Controller $data = [ 'categories' => CategoryRepo::flatten(locale()), 'products' => $products, + 'type' => 'products', ]; if ($request->expectsJson()) { @@ -44,6 +45,7 @@ class ProductController extends Controller $data = [ 'categories' => CategoryRepo::flatten(locale()), 'products' => $products, + 'type' => 'trashed', ]; if ($request->expectsJson()) { diff --git a/resources/beike/admin/views/pages/products/index.blade.php b/resources/beike/admin/views/pages/products/index.blade.php index 1c7a5608..be52f30c 100644 --- a/resources/beike/admin/views/pages/products/index.blade.php +++ b/resources/beike/admin/views/pages/products/index.blade.php @@ -173,11 +173,18 @@ } const query = Object.keys(filter).map(key => key + '=' + filter[key]).join('&'); - const url = @json(admin_route('products.index')); + // const url = @json(admin_route('products.index')); + + @if ($type == 'products') + const url = @json(admin_route('products.index')); + @else + const url = @json(admin_route('products.trashed')); + @endif if (query) { return url + '?' + query; } + return url; } },