first

app/controller/api/store/merchant/Merchant.php

@@ -43,7 +43,7 @@ class Merchant extends BaseController
     {
         [$page, $limit] = $this->getPage();
         $where = $this->request->params(['keyword', 'order', 'is_best', 'location', 'category_id']);
-        if (!$where['location']) {
+        if (!$where['location'] && $this->userInfo) {
             $where['location'] = $this->userInfo['now_local'];
         }
         return app('json')->success($this->repository->getList($where, $page, $limit, $this->userInfo));