From c1ac4bf315e79bf223102ee3cbdf09da66072ef5 Mon Sep 17 00:00:00 2001
From: xman <1946321327@qq.com>
Date: Mon, 2 Jun 2025 15:19:53 +0800
Subject: [PATCH] sth

---
 application/admin/controller/orders/Dispatchlog.php | 11 ++++++-----
 public/assets/js/backend/orders/dispatch2.js        |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/application/admin/controller/orders/Dispatchlog.php b/application/admin/controller/orders/Dispatchlog.php
index a6c8f19..ea0788d 100644
--- a/application/admin/controller/orders/Dispatchlog.php
+++ b/application/admin/controller/orders/Dispatchlog.php
@@ -63,11 +63,12 @@ class Dispatchlog extends Backend
             ->select();
 
             $firstLog = end($logs);
-
-            foreach ($orderLogs as $item) {
-                if($item->order_status == 20 && $item->create_time <= $firstLog->create_time){
-                    $item->progress_logs = $logs;
-                    break;
+            if(!empty($logs)){
+                foreach ($orderLogs as $item) {
+                    if($item->order_status == 20 && $item->create_time <= $firstLog->create_time){
+                        $item->progress_logs = $logs;
+                        break;
+                    }
                 }
             }
             $this->view->assign('logs',json_encode($orderLogs));
diff --git a/public/assets/js/backend/orders/dispatch2.js b/public/assets/js/backend/orders/dispatch2.js
index 53cb09c..cf5714b 100644
--- a/public/assets/js/backend/orders/dispatch2.js
+++ b/public/assets/js/backend/orders/dispatch2.js
@@ -174,8 +174,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
                                 },*/
                                 {
                                     name: 'dispatchlog',
-                                    text:"日志",
-                                    title:"变更日记",
+                                    text:"查看轨迹图",
+                                    title:"查看轨迹图",
                                     icon: 'fa fa-list',
                                     url: function(row){
                                         return 'orders/dispatchlog/index?dispatch_id='+row.id;