diff --git a/app/admin/controller/v1/Product.php b/app/admin/controller/v1/Product.php index 1326bc78..9644b012 100644 --- a/app/admin/controller/v1/Product.php +++ b/app/admin/controller/v1/Product.php @@ -18,7 +18,7 @@ class Product 'spu', 'category_id', 'created_at', - 'is_sale', + 'is_show', 'page/d' => 1, 'size/d' => 10 ]); @@ -48,10 +48,10 @@ class Product ->withSearch(['name_nullable', 'spu_nullable', 'created_at_nullable'], [ 'name_nullable' => $param['name']??null, 'spu_nullable' => $param['spu']??null, - 'created_at_nullable' => $param['created_at']??null, + 'created_at_nullable' => !empty($param['created_at']) ? explode(',', $param['created_at']) : null, ]) ->categoryNullable($param['category_id']??null) - ->isSaleNullable(isset($param['is_sale']) ? (bool)$param['is_sale'] : null) + ->isShowNullable(isset($param['is_show']) ? (bool)$param['is_show'] : null) ->order(['sort' => 'asc', 'id' => 'desc']) ->paginate([ 'list_rows' => $param['size'], diff --git a/app/admin/model/v1/ProductModel.php b/app/admin/model/v1/ProductModel.php index e0aa1ee6..d6ef2410 100644 --- a/app/admin/model/v1/ProductModel.php +++ b/app/admin/model/v1/ProductModel.php @@ -71,11 +71,11 @@ class ProductModel extends ProductBaseModel } // 上架状态查询 - public function scopeIsSaleNullable($query, bool|null $value) + public function scopeIsShowNullable($query, bool|null $value) { if (is_null($value)) { return; } - $query->where('is_sale', '=', (int)$value); + $query->where('is_show', '=', (int)$value); } }