From 149042b53850400b87458506dfe6e2d1578c5229 Mon Sep 17 00:00:00 2001
From: hant <hant@cherrybless.com>
Date: Tue, 1 Jul 2025 21:46:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Order.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/admin/controller/Order.php b/application/admin/controller/Order.php
index a030bc7..b608090 100644
--- a/application/admin/controller/Order.php
+++ b/application/admin/controller/Order.php
@@ -911,7 +911,7 @@ class Order extends Backend
             $where[] = [implode("|", $searcharr), "LIKE", "%{$search}%"];
         }
         $index = 0;
-
+        $op = (array)json_decode($op, true);
         foreach ($filter as $k => $v) {
             if ($k == 'user.nickname' || $k == 'is_timeout') continue;
             if (!preg_match('/^[a-zA-Z0-9_\-\.]+$/', $k)) {
@@ -1047,6 +1047,7 @@ class Order extends Backend
                 }
             }
         };
+
         return [$where, $sort, $order, $offset, $limit, $page, $alias, $bind];
     }
 

From 4cfd58c9db8159b0f9fa246ef40e566a879d69de Mon Sep 17 00:00:00 2001
From: todaywindy <hant@cherrybless.com>
Date: Wed, 2 Jul 2025 13:51:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Order.php           |  1 +
 application/admin/controller/orders/Dispatch.php |  1 +
 public/assets/js/backend/order.js                | 13 ++++++++++---
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/application/admin/controller/Order.php b/application/admin/controller/Order.php
index b608090..cdff946 100644
--- a/application/admin/controller/Order.php
+++ b/application/admin/controller/Order.php
@@ -166,6 +166,7 @@ class Order extends Backend
                 'plan_time',
                 'coupon_id',
                 'create_time',
+                'audit_time',
                 'total',
                 'online_amount',
                 'aftersale_id'
diff --git a/application/admin/controller/orders/Dispatch.php b/application/admin/controller/orders/Dispatch.php
index 2e84f73..92a717f 100644
--- a/application/admin/controller/orders/Dispatch.php
+++ b/application/admin/controller/orders/Dispatch.php
@@ -149,6 +149,7 @@ class Dispatch extends Backend
             if(!empty($existDispatch)){
                 $this->error('该订单已经派单，不可重复操作');
             }
+            sleep(2);
 
             $insert = [
                 'admin_id' => $this->auth->id,
diff --git a/public/assets/js/backend/order.js b/public/assets/js/backend/order.js
index 9af9451..ffc3677 100644
--- a/public/assets/js/backend/order.js
+++ b/public/assets/js/backend/order.js
@@ -227,10 +227,17 @@ ${data.receive_type == 1 ? '已收定金' : '已收全款'}
                             events: Table.api.events.image,
                             formatter: Table.api.formatter.images
                         },
+                        // {
+                        //     field: 'update_time',
+                        //     title: __('Update_time'),
+                        //     operate: false,
+                        //     addclass: 'datetimerange',
+                        //     autocomplete: false
+                        // },
                         {
-                            field: 'update_time',
-                            title: __('Update_time'),
-                            operate: false,
+                            field: 'audit_time',
+                            title: '完成时间',
+                            operate: 'RANGE',
                             addclass: 'datetimerange',
                             autocomplete: false
                         },