wuhui_zzw
/
wyyl
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed trashed

This commit is contained in:
Edward Yang 2022-08-16 13:57:55 +08:00
parent 630c4e193e
commit 5d6a84a473
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
beike/Admin/Http/Controllers/ProductController.php
View File

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