Merge branch 'jielong' of https://git.yidian-inc.com:8021/bp/goods into jielong

application/services/marketing/TakePlaceService.php

@@ -165,15 +165,19 @@ class TakePlaceService
             return $list;
         }
         //按距离返回自提点列表
+        $sort = [];
         if(!empty($list) && is_array($list)) {
             foreach ($list as &$item) {
                 if($item['longitude'] && $item['latitude']) {
                     $item['distance'] = Geo::geoDistance($lat,$lng,$item['longitude'],$item['latitude'],true);
+                    $sort[] = $item['distance'];
                 }else {
                     $item['distance'] = '';
                 }
             }
             unset($item);
+            //按距离排序
+            array_multisort($sort, SORT_ASC, $list);
 
             return $list;
         }