From adb1ac45f86ee7d29c04af1570bdeda18936c664 Mon Sep 17 00:00:00 2001
From: wuyize <wuyize25@163.com>
Date: Sun, 8 Jan 2023 20:39:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=92=A4=E5=9B=9E?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F=EF=BC=8C=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=E5=BC=B9?=
 =?UTF-8?q?=E5=87=BA=E5=AF=B9=E8=AF=9D=E6=A1=86=E6=97=B6=E7=9A=84=E5=8D=A1?=
 =?UTF-8?q?=E9=A1=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Invoice/InvoiceDetailModal.tsx | 3 ++-
 src/pages/MessageList.tsx                | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/pages/Invoice/InvoiceDetailModal.tsx b/src/pages/Invoice/InvoiceDetailModal.tsx
index a6a119f..4dd7d72 100644
--- a/src/pages/Invoice/InvoiceDetailModal.tsx
+++ b/src/pages/Invoice/InvoiceDetailModal.tsx
@@ -112,12 +112,13 @@ function InvoiceDetailModal(props: { invoiceDetail: any, open: boolean, onClose:
                             title={props.isOwner?"确定撤回吗？":"请填写撤回理由"}
                             onConfirm={withdraw}
                             okText="确定"
+                            okButtonProps={{danger: true}}
                             //showCancel={false}
                             cancelText="取消"
                             onCancel={() => {setWithdrawReason("")}}
                             description={props.isOwner?"":<TextArea rows={4} onChange={(e)=>{setWithdrawReason(e.target.value)}}/>}
                         >
-                            <Button danger  type="primary">撤回</Button>
+                            <Button danger >撤回</Button>
                         </Popconfirm>}
 
                         <Button type="primary" href={baseUrl + props.invoiceDetail?.invoiceFileUri} download
diff --git a/src/pages/MessageList.tsx b/src/pages/MessageList.tsx
index 33f8bc6..499565b 100644
--- a/src/pages/MessageList.tsx
+++ b/src/pages/MessageList.tsx
@@ -189,7 +189,8 @@ function MessageList(props: { count: number, onCountChange: (count: number) => v
                 break
         }
         setPopoverOpen(false)
-        readMessage(item)
+        if (!item.alreadyRead)
+            readMessage(item)
     }
 
     return (
@@ -286,8 +287,10 @@ function MessageList(props: { count: number, onCountChange: (count: number) => v
             <InvoiceDetailModal open={invoiceModalOpen} invoiceDetail={invoiceDetail}
                                 onClose={() => setInvoiceModalOpen(false)} isBase64={true}
                                 isOwner={true}/>
-            <ReimbursementDetail closeDetail={()=>{setReimbursementDetail(undefined)}}
-            accessLevel={-1} reimbursement={reimbursementDetail}/>
+            <ReimbursementDetail closeDetail={() => {
+                setReimbursementDetail(undefined)
+            }}
+                                 accessLevel={-1} reimbursement={reimbursementDetail}/>
         </>
     )
 }