From d498f3f257b06d4171bfc88b21c3122fb1879cbe Mon Sep 17 00:00:00 2001
From: Jimmy Liow <lyj@hainatravel.com>
Date: Tue, 26 Mar 2024 10:24:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=B7=9F=E8=B8=AA=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E2=80=9C=E5=87=BA=E5=8F=91=E6=97=A5=E6=9C=9F=E2=80=9D?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.jsx                | 3 ---
 src/views/orders/Follow.jsx | 8 ++++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/main.jsx b/src/main.jsx
index 3c49355..b3711cd 100644
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -9,7 +9,6 @@ import Standlone from '@/views/Standlone'
 import OrderFollow from '@/views/orders/Follow'
 import ChatHistory from '@/views/ChatHistory'
 import SalesManagement from '@/views/SalesManagement'
-import DingdingQRCode from '@/views/dingding/QRCode'
 import DingdingCallback from '@/views/dingding/Callback'
 import DingdingLogout from '@/views/dingding/Logout'
 import AccountProfile from '@/views/accounts/Profile'
@@ -63,9 +62,7 @@ const router = createBrowserRouter([
     children: [
       { path: 'dingding/login', element: <DingdingLogin /> },
       { path: 'dingding/logout', element: <DingdingLogout /> },
-      { path: 'dingding/qrcode', element: isMobileApp ? <DingdingLogin /> : <DingdingQRCode /> },
       { path: 'dingding/callback', element: <DingdingCallback /> },
-      { path: 'mobile-login', element: <DingdingLogin /> },
     ],
   },
 ]);
diff --git a/src/views/orders/Follow.jsx b/src/views/orders/Follow.jsx
index 79dd042..3c6385a 100644
--- a/src/views/orders/Follow.jsx
+++ b/src/views/orders/Follow.jsx
@@ -230,10 +230,10 @@ function OrderGroupTable({ formValues }) {
       width: 120,
       hidden: false,
       sortDirections: ['ascend', 'descend'],
-      sorter: (a, b, sortOrder) => {
-        const datejsA = isEmpty(a.COLI_OrderStartDate) ? dayjs(0) : new dayjs(a.COLI_OrderStartDate)
-        const datejsB = isEmpty(b.COLI_OrderStartDate) ? dayjs(0) : new dayjs(b.COLI_OrderStartDate)
-        return datejsA.isAfter(datejsB)
+      sorter: (a, b) => {
+        const datejsA = isEmpty(a.COLI_OrderStartDate) ? 0 : new dayjs(a.COLI_OrderStartDate).valueOf()
+        const datejsB = isEmpty(b.COLI_OrderStartDate) ? 0 : new dayjs(b.COLI_OrderStartDate).valueOf()
+        return datejsA - datejsB
       }
     },
     {