diff --git a/beike/Admin/Http/Controllers/ProductController.php b/beike/Admin/Http/Controllers/ProductController.php index 9fafdfc7..c8a9f3a3 100644 --- a/beike/Admin/Http/Controllers/ProductController.php +++ b/beike/Admin/Http/Controllers/ProductController.php @@ -17,21 +17,21 @@ class ProductController extends Controller public function index(Request $request) { + // $product = ProductRepo::list($request->all()); $product = ProductRepo::list($request->all()); - // if ($request->expectsJson()) { - // return ProductResource::collection($products); - // } + // dd($product->getItems()); // dd(ProductResource::collection($productitem)); + // dd(ProductResource::collection($product)->jsonSerialize()); $data = [ 'categories' => CategoryRepo::flatten(locale()), - 'product' => $product, + 'product' => ProductResource::collection($product), ]; if ($request->expectsJson()) { return ProductResource::collection($product); - return json_success('成功', ProductResource::collection($product)); - return json_success('成功', $product); + // return json_success('成功', ProductResource::collection($product)); + // return json_success('成功', $product); } return view('admin::pages.products.index', $data); diff --git a/resources/beike/admin/views/pages/products/index.blade.php b/resources/beike/admin/views/pages/products/index.blade.php index 426661d6..f925233e 100644 --- a/resources/beike/admin/views/pages/products/index.blade.php +++ b/resources/beike/admin/views/pages/products/index.blade.php @@ -172,6 +172,7 @@ return url; } }, + watch: { page: function() { this.loadData(); @@ -183,9 +184,8 @@ }, methods: { loadData: function() { - const url = this.url; - // window.history.pushState('', '', url); - $http.get(url).then((res) => { + window.history.pushState('', '', this.url); + $http.get(this.url).then((res) => { this.product = res.data; }) },