Merge remote-tracking branch 'origin/main'

src/assets/App.css

@@ -3,4 +3,4 @@
   height: 68px;
   margin: 0 6px 0 0;
   background: rgba(255, 255, 255, 0.3);
-}
+}

src/main.jsx

@@ -18,7 +18,7 @@ import MobileChat from '@/views/mobile/Chat'
 import CallCenter from '@/views/CallCenter'
 import MobileSecondHeader from '@/views/mobile/SecondHeaderWrapper'
 import CustomerProfile from '@/views/Conversations/Online/order/CustomerProfile'
-import SnippetList from '@/views/Conversations/Online/SnippetList'
+import SnippetList from '@/views/accounts/SnippetList'
 
 import Unassign from '@/views/ChatUnassign'
 import ChatAssign from '@/views/Conversations/ChatAssign'
@@ -70,7 +70,7 @@ const router = createBrowserRouter([
               { path: 'chat/history', element: <ChatHistory /> },
               { path: 'order/chat/:order_sn', element: <ChatWindow /> },
               { path: 'order/chat', element: <ChatWindow /> },
-              { path: 'snippet-list', element: <SnippetList /> }, // 测试图文集界面
+              { path: 'account/snippet-list', element: <SnippetList /> },
               { path: 'account/profile', element: <AccountProfile /> },
               { path: 'chat/unassign/:whatsappid', element: <ChatAssign /> },
               { path: 'chat/unassign', element: <Unassign /> },

src/views/accounts/SnippetList.jsx

@@ -52,7 +52,7 @@ function SnippetList() {
               'Highlights Travel Family Loyalty Club',
             ]}
             renderItem={(item) => (
-              <List.Item className='hover:bg-gray-50'>
+              <List.Item className='hover:bg-stone-50'>
                 <Row gutter={16} className='w-full'>
                   <Col span={16}>
                     <Tag color='magenta'>类型</Tag>
@@ -66,11 +66,9 @@ function SnippetList() {
             )}
           />
         </Col>
-        <Col span={16}>
+        <Col span={16} className='border-solid border rounded border-gray-300'>
-          <pre>
+          <pre className='whitespace-pre-wrap break-words'>
-            <p>
+          <p>Discover China with the <strong>award-winning</strong> and <strong>best-rated</strong> tour company for <strong>personalized travel in China</strong>. Honored as <strong>China's Leading Tour Operator</strong> by the <strong>World Travel Awards</strong>, we boast <strong>10,000+ reviews</strong> and a remarkable <strong>98.8% 5-star rating</strong>. Our expertise in customizing personalized China explorations is backed by our company-managed local services across China. Explore and kickstart your personalized travel experience with just a click!</p>
-              Discover China with the <strong>award-winning</strong>
-            </p>
           </pre>
         </Col>
       </Row>

src/views/orders/AdvanceSearchForm.jsx

@@ -38,7 +38,7 @@ const formValuesMapper = (values) => {
   return dest;
 }
 
-const AdvanceSearchForm = memo(function noName({ initialValues, onSubmit, loading }) {
+const AdvanceSearchForm = memo(function NoName({ initialValues, onSubmit, loading }) {
   const DATE_RANGE_PRESETS = [
     {
       label: '本周',