From 0ef7d1ac36aa7182a33cfa1a0cb07bfac83b5ff5 Mon Sep 17 00:00:00 2001
From: Lemon <15040771@qq.com>
Date: Fri, 23 Oct 2020 16:59:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=95=86=E5=93=81=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=AF=86=E5=88=AB=E8=AF=B7=E6=B1=82=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Service/v3/Implementations/SearchService.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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
             ])