From 5d6a84a473deb624544a1f705a54e71326e00f41 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Tue, 16 Aug 2022 13:57:55 +0800
Subject: [PATCH] fixed trashed

---
 .../Admin/Http/Controllers/ProductController.php  | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/beike/Admin/Http/Controllers/ProductController.php b/beike/Admin/Http/Controllers/ProductController.php
index bd7687d1..8c09d8b0 100644
--- a/beike/Admin/Http/Controllers/ProductController.php
+++ b/beike/Admin/Http/Controllers/ProductController.php
@@ -17,7 +17,8 @@ class ProductController extends Controller
 
     public function index(Request $request)
     {
-        $productList = ProductRepo::list($request->all());
+        $requestData = $request->all();
+        $productList = ProductRepo::list($requestData);
         $products = ProductResource::collection($productList)->resource;
 
         $data = [
@@ -36,14 +37,18 @@ class ProductController extends Controller
     {
         $requestData = $request->all();
         $requestData['trashed'] = true;
+        $productList = ProductRepo::list($requestData);
+        $products = ProductResource::collection($productList)->resource;
 
-        if ($request->expectsJson()) {
-            $products = ProductRepo::list($requestData);
-            return ProductResource::collection($products);
-        }
         $data = [
             'categories' => CategoryRepo::flatten(locale()),
+            'products' => $products,
         ];
+
+        if ($request->expectsJson()) {
+            return $products;
+        }
+
         return view('admin::pages.products.index', $data);
     }