From a02eaeb3a898909b51f38016cb329b860f59c3fe Mon Sep 17 00:00:00 2001
From: xman <1946321327@qq.com>
Date: Mon, 16 Jun 2025 21:21:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controller/orders/Dispatch2.php      | 18 ++++++++++--------
 public/assets/js/backend/orders/dispatch2.js   |  5 +++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/application/admin/controller/orders/Dispatch2.php b/application/admin/controller/orders/Dispatch2.php
index ad68d05..8c7ed1d 100644
--- a/application/admin/controller/orders/Dispatch2.php
+++ b/application/admin/controller/orders/Dispatch2.php
@@ -87,16 +87,18 @@ class Dispatch2 extends Backend
 
                 if(!in_array($row->status, $this->model->btnActiveStatusList('btn_record')) ){
                     //正常情况，执行不到这里来，不用担心循环执行问题
-                    $row->follow = 2;
-                    OrderDispatch::where('id',$row->id)->update(['follow'=>2]);
+                    if($row->follow != 2){
+                        $row->follow = 2;
+                        OrderDispatch::where('id',$row->id)->update(['follow'=>2]);
+                    }
                 }
-                if($row->btn_record){
-
-                    if($row->btn_record != 2){
-                        $row->btn_record = true;
-                    }else{
+                if($row->btn_record ){
+                    if($row->follow == 2){
                         $row->btn_record = false;
                     }
+                }
+
+
 
                     /*if($row->follow == 0 ){
                         $row->btn_record = true;
@@ -125,7 +127,7 @@ class Dispatch2 extends Backend
 //                            }
 //                        }
 //                    }
-                }
+
                // $row->btn_income = (in_array($row->status, $this->model->btnActiveStatusList('btn_income')) && in_array($row->order->status, $orderModel->incomeBtnStatus())) ? true : false;
 
                 if($row->status == -10){        //拒绝
diff --git a/public/assets/js/backend/orders/dispatch2.js b/public/assets/js/backend/orders/dispatch2.js
index a58b496..c5ea27b 100644
--- a/public/assets/js/backend/orders/dispatch2.js
+++ b/public/assets/js/backend/orders/dispatch2.js
@@ -204,10 +204,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form','layer'], function ($,
                                     extend: 'data-toggle="tooltip" data-container="body"',
                                     classname: 'btn btn-xs btn-warning btn-dialog',
                                     visible:function(row){
-                                        if(row.btn_record){
+                                        /*if(row.btn_record){
                                             return true;
                                         }
-                                        return false;
+                                        return false;*/
+                                        return row.btn_record;
                                     }
                                 },