全流程接口修改

Modules/Admin/Http/Controllers/Api/ApiController.php

@@ -741,6 +741,7 @@ class ApiController extends BaseController
                 $list1[$i]['lat'] = $list[$i]->lat;
                 $list1[$i]['lng'] = $list[$i]->lng;
                 $list1[$i]['title'] = $list[$i]->xjqy;
+                $list1[$i]['id'] = $list[$i]->ID;
             }
         }
 
@@ -759,7 +760,7 @@ class ApiController extends BaseController
         $avgLng = $total['lng'] / count($list2);
 
         $result['list1'] = $list1;
-        $result['list2'] = $list1;
+        $result['list2'] = $list2;
         $result['lat'] = $avgLat;
         $result['lng'] = $avgLng;
 

Modules/Admin/Services/ApiService.php

@@ -416,7 +416,7 @@ class ApiService{
                 'person_id'  => $val->lrr,
                 'depart'     => $val->xjdw,
                 'date'       => $val->lrdate,
-                'xjqy'       => $val->xjqy,
+                'xjqy'       => $val->xjqy,·
                 'data_id'    => $val->ID
             ];
         }