diff --git a/app/Service/v3/Implementations/SearchService.php b/app/Service/v3/Implementations/SearchService.php index a188446..a6bc224 100644 --- a/app/Service/v3/Implementations/SearchService.php +++ b/app/Service/v3/Implementations/SearchService.php @@ -28,9 +28,11 @@ class SearchService implements SearchServiceInterface ->where([ ''.$storeTable.'.is_open' => StoreConstants::IS_OPEN_YES, ''.$storeTable.'.status' => StoreConstants::STATUS_PASS, - ''.$storeTable.'.is_rest' => StoreConstants::IS_REST_NO - ]) - ->where([ + ]); + if(!isset($params['frompage']) || $params['frompage'] != 'zh_cjdianc/pages/takeout/takeoutindex'){ + $builder->where(''.$storeTable.'.is_rest',StoreConstants::IS_REST_NO); + } + $builder->where([ ''.$goodsTable.'.market_id' => $params['market_id'], ''.$goodsTable.'.on_sale' => GoodsConstants::ON_SALE_YES ])