From ef25f0dec031192134fae5f8e4a0a6ec4b071249 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <lyj@hainatravel.com>
Date: Wed, 28 Feb 2024 14:34:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=B0=8F=E4=BA=8E=E6=AF=8F?=
 =?UTF-8?q?=E9=A1=B510=E6=9D=A1=E7=9A=84=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/stores/AuthStore.js                                |  2 +-
 src/views/Conversations/Components/CustomerProfile.jsx | 10 ++++------
 src/views/OrderFollow.jsx                              |  2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/stores/AuthStore.js b/src/stores/AuthStore.js
index eb7bf98..b22002c 100644
--- a/src/stores/AuthStore.js
+++ b/src/stores/AuthStore.js
@@ -4,7 +4,7 @@ import { fetchJSON } from '@/utils/request'
 const useAuthStore = create((set, get) => ({
 
   // GLOBAL_SALES_LOGIN_USER
-  // {"userId":"383","username":"廖一军","avatarUrl":"https://static-legacy.dingtalk.com/media/lALPBDDrhXr716HNAoDNAoA_640_640.png","mobile":"+86-18777396951","email":"lyj@hainatravel.com","openId":"iioljiPmZ4RPoOYpkFiSn7IKAiEiE","accountList":[{"OPI_SN":383,"OPI_Code":"LYJ","OPI_NameCN":"廖一军","OPI_DEI_SN":7,"OPI_NameEN":"Jimmy Liow"},{"OPI_SN":609,"OPI_Code":"LYJAH","OPI_NameCN":"廖一军（ah）","OPI_DEI_SN":28,"OPI_NameEN":"Jimmy Liow"}]}
+  // {"userId":"383","userIdStr":"383,609","username":"廖一军","avatarUrl":"https://api.dicebear.com/7.x/miniavs/svg?seed=1","mobile":"+86-18777396951","email":"lyj@hainatravel.com","openId":"iioljiPmZ4RPoOYpkFiSn7IKAiEiE","accountList":[{"OPI_SN":383,"OPI_Code":"LYJ","OPI_NameCN":"廖一军","OPI_DEI_SN":7,"OPI_NameEN":"Jimmy Liow"},{"OPI_SN":609,"OPI_Code":"LYJAH","OPI_NameCN":"廖一军（ah）","OPI_DEI_SN":28,"OPI_NameEN":"Jimmy Liow"}]}
   loginUser: {
     userId: -1,
     userIdStr: '-1',
diff --git a/src/views/Conversations/Components/CustomerProfile.jsx b/src/views/Conversations/Components/CustomerProfile.jsx
index c54d462..b59600b 100644
--- a/src/views/Conversations/Components/CustomerProfile.jsx
+++ b/src/views/Conversations/Components/CustomerProfile.jsx
@@ -1,12 +1,10 @@
+import { LinkOutlined, MailOutlined, PhoneOutlined, UserOutlined, WhatsAppOutlined } from '@ant-design/icons'
+import { Card, Flex, Select, Typography } from 'antd'
 import { useEffect } from 'react'
-import { useLocation, useParams } from 'react-router-dom'
-import { Card, Flex, Select, Typography, List, Button, Table } from 'antd'
-import { useAuthContext } from '@/stores/AuthContext.js'
-import { UserOutlined, LinkOutlined, EllipsisOutlined, SmileOutlined, SyncOutlined, PhoneOutlined, MailOutlined, WhatsAppOutlined, SmileTwoTone  } from '@ant-design/icons'
+import { useParams } from 'react-router-dom'
 
-import CreatePayment from './CreatePayment'
-import QuotesHistory from './QuotesHistory'
 import useOrderStore from '@/stores/OrderStore'
+import QuotesHistory from './QuotesHistory'
 
 const CustomerProfile = (() => {
   const { order_sn: order_sn } = useParams()
diff --git a/src/views/OrderFollow.jsx b/src/views/OrderFollow.jsx
index 595b822..9fc800d 100644
--- a/src/views/OrderFollow.jsx
+++ b/src/views/OrderFollow.jsx
@@ -320,7 +320,7 @@ function OrderList({ formValues }) {
         label: deptMap.get(deptNo) + '订单',
         children: <Table key={'Order Table' + deptNo} loading={loading} dataSource={deptOrderList}
         columns={orderColumns}
-        pagination={paginationProps} />
+        pagination={deptOrderList.length <= 10 ? false : paginationProps} />
       } 
     )
   })