Merge branch 'main' into dev/chat

src/views/OrderFollow.jsx

@@ -1,5 +1,5 @@
 import {
-  App, Badge, Button, DatePicker, Divider, Flex, Form, Input,
+  App, Badge, Button, DatePicker, Tabs, Flex, Form, Input,
   Radio, Row, Col, Select, Space, Switch, Table, Tag, Collapse
 } from 'antd'
 import { memo, useCallback, useEffect, useState } from 'react'
@@ -8,8 +8,6 @@ import dayjs from 'dayjs'
 import { Conditional } from '@/components/Conditional'
 import useOrderStore from '@/stores/OrderStore'
 import useAuthStore from '@/stores/AuthStore'
-import { prepareUrl, isNotEmpty } from '@/utils/commons'
-import { API_HOST } from '@/config'
 
 const { RangePicker } = DatePicker
 
@@ -285,7 +283,8 @@ function OrderCollapseTable({ formValues }) {
     )
   })
 
-  return (<Collapse bordered={false} defaultActiveKey={0} items={collapseItems} />)
+  return (<Tabs defaultActiveKey={0} items={collapseItems} />)
+  // return (<Collapse bordered={false} defaultActiveKey={0} items={collapseItems} />)
 }
 
 function OrderFollow() {