commit

app/api/controller/PublicController.php

@@ -300,14 +300,14 @@ class PublicController
             ['sales', ''],
             ['address']
         ], $request, true);
-        if (!empty($address)){
-            // 地址获取经纬度
-            $res = json_decode(do_request('https://apis.map.qq.com/ws/geocoder/v1/?address='.$address.'&key=4A5BZ-GV7K4-G2PUH-DIIQJ-CIG6T-CKFT2', [], null,false));
-            $location = $res->result->location;
-            $latitude = $location->lat;
-            $longitude = $location->lng;
-        }
-        $list = SystemStore::lst($latitude, $longitude, $page, $limit, $cate_id,$name, $sales);
+//        if (!empty($address)){
+//            // 地址获取经纬度
+//            $res = json_decode(do_request('https://apis.map.qq.com/ws/geocoder/v1/?address='.$address.'&key=4A5BZ-GV7K4-G2PUH-DIIQJ-CIG6T-CKFT2', [], null,false));
+//            $location = $res->result->location;
+//            $latitude = $location->lat;
+//            $longitude = $location->lng;
+//        }
+        $list = SystemStore::lst($latitude, $longitude, $page, $limit, $cate_id,$name, $sales,$address);
         if (!$list){
             $list = [];
         } else{

app/models/system/SystemStore.php

@@ -144,7 +144,7 @@ class SystemStore extends BaseModel
      * 门店列表
      * @return mixed
      */
-    public static function lst($latitude, $longitude, $page, $limit,$cate_id, $name, $sales)
+    public static function lst($latitude, $longitude, $page, $limit,$cate_id, $name, $sales, $address)
     {
         $model = new self();
         $model = $model->where('is_del', 0);
@@ -155,6 +155,7 @@ class SystemStore extends BaseModel
         if ($name) $model = $model->where('name', 'like', '%'.$name.'%');
         if ($sales) $model = $model->order('sales DESC');
         if ($cate_id) $model = $model->where('cate_id', $cate_id);
+        if ($address) $model = $model->where('address', 'like', '%'.$address.'%');
         $list = $model->page((int)$page, (int)$limit)
             ->select()
             ->hidden(['is_show', 'is_del'])