fix: 修复合并出错

src/components/OrderProfile.jsx

@@ -54,6 +54,7 @@ const OrderProfile = ({coliSN, ...props}) => {
 
   const regularText = () => {
     if (orderDetail.buytime > 0) return "(R" + orderDetail.buytime + ")"
+    return ''
   }
 
 

src/views/orders/components/MailBox.jsx

@@ -39,7 +39,6 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
   ]
   const [form] = Form.useForm()
 
-  const { mailList, isLoading, error } = useEmailList(mailboxDir)
   const { mailList, loading, error, refresh } = useEmailList(mailboxDir);
 
   const [pagination, setPagination] = useState({
@@ -220,9 +219,9 @@ const MailBox = ({ mailboxDir, onMailItemClick, ...props }) => {
       </div>
 
       <div className='bg-white overflow-y-auto' style={{ height: 'calc(100vh - 198px)' }}>
-        <Skeleton active loading={isLoading}>
+        <Skeleton active loading={loading}>
         <List
-          loading={isLoading}
+          loading={loading}
           header={
             <Flex align='center' justify='space-between'>
               <Breadcrumb