From cfb277e446f6ccaf9f561379d16cb34527f568e9 Mon Sep 17 00:00:00 2001
From: "HESU\\HESU" <1696136552@qq.com>
Date: Mon, 16 Jun 2025 11:36:17 +0800
Subject: [PATCH] 1

---
 app/controller/VehicleController.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/controller/VehicleController.php b/app/controller/VehicleController.php
index af0c81a..564416c 100644
--- a/app/controller/VehicleController.php
+++ b/app/controller/VehicleController.php
@@ -259,8 +259,8 @@ class VehicleController
             $his['last_time_utc'] = date('Y-m-d H:i:s', $his['last_time_utc']);
         }
         unset($his);
-        $logisticsShip['last_time_utc'] = date('Y-m-d H:i:s', $logisticsShip['last_time_utc']);
-        $logisticsShip['eta_utc'] = date('Y-m-d H:i:s', $logisticsShip['eta_utc']);
+        $logisticsShip['eta'] = date('Y-m-d', $logisticsShip['eta_utc']);
+        $logisticsShip['last_time'] = date('Y-m-d',$logisticsShip['last_time_utc']);
 
         $count = Vehicle::where(['ship_id' => $id])->count();
         $result = ['list' => $vehicles,'ship' => $logisticsShip,'ship_his' => $logisticsShipHis,'count'=>$count];
@@ -337,10 +337,17 @@ class VehicleController
     public function shipList(Request $request){
         $navigate = LogisticsShip::where(['status' => 0])->get();
         $pending = LogisticsShip::where(['status' => 1])->get();
+        foreach ($navigate as &$val) {
+            $val['count'] = Vehicle::where(['ship_id' => $val->id])->count();
+            $val['eta'] = date('Y-m-d',$val['eta_utc']);
+            $val['last_time'] = date('Y-m-d',$val['last_time_utc']);
+        }
         foreach ($pending as &$val) {
             $val['count'] = Vehicle::where(['ship_id' => $val->id])->count();
             $val['eta'] = date('Y-m-d',$val['eta_utc']);
+            $val['last_time'] = date('Y-m-d',$val['last_time_utc']);
         }
+        unset($val);
         $result = ['navigate' => $navigate,'pending' => $pending];
 
         return Util::success($result);