Merge branch 'main' into dev/chat

src/views/Conversations/Components/CustomerProfile.jsx

@@ -1,6 +1,7 @@
 import { Card, Flex, Avatar, Typography, Radio, Button, Table } from 'antd';
 import { useAuthContext } from '@/stores/AuthContext.js';
 import { useConversationState } from '@/stores/ConversationContext';
+import { useLocation } from 'react-router-dom'
 import { HomeOutlined, LoadingOutlined, SettingFilled, SmileOutlined, SyncOutlined, PhoneOutlined, MailOutlined, WhatsAppOutlined, SmileTwoTone  } from '@ant-design/icons';
 
 import CreatePayment from './CreatePayment';
@@ -22,6 +23,8 @@ const orderStatus = [
 const { Meta } = Card;
 
 const CustomerProfile = (({ colisn }) => {
+  let { state } = useLocation()
+  console.info(state)
   console.log('invoke customer profile+++++++++++++++++++++++++++++++++++++++++++++', colisn);
   const { customerOrderProfile: orderInfo } = useConversationState();
   const { loginUser: currentUser } = useAuthContext();

src/views/OrderFollow.jsx

@@ -1,9 +1,9 @@
 import {
   App, Badge, Button, DatePicker, Divider, Flex, Form, Input,
-  Radio, Row, Col, Select, Space, Switch, Table, Tag
+  Radio, Row, Col, Select, Space, Switch, Table, Tag, Collapse
 } from 'antd'
 import { memo, useCallback, useEffect, useState } from 'react'
-import { NavLink } from 'react-router-dom'
+import { Link } from 'react-router-dom'
 import dayjs from 'dayjs'
 import { Conditional } from '@/components/Conditional'
 import { useAuthContext } from '@/stores/AuthContext'
@@ -164,7 +164,7 @@ function OrderList({ formValues }) {
         if (record.buytime > 0) regularText = '(R' + record.buytime + ')'
         return (
           <Space>
-            <NavLink to={`/order/chat/${record.COLI_SN}`}>{text + regularText}</NavLink>
+            <Link to={`/order/chat/${record.COLI_SN}`} state={record}>{text + regularText}</Link>
             <Badge
               count={record.unread_msg}
               style={{
@@ -318,7 +318,24 @@ function OrderFollow() {
         />
       </Space>
       <Divider plain orientation='left'></Divider>
-      <OrderList formValues={formValues} />
+      <Collapse defaultActiveKey={['1', '2', '3']} items={[
+          {
+            key: '1',
+            label: 'AH 订单：25',
+            children: <OrderList formValues={formValues} />
+          },
+          {
+            key: '2',
+            label: 'CH 订单：25',
+            children: <OrderList formValues={formValues} />
+          },
+          {
+            key: '3',
+            label: 'GH 订单：25',
+            children: <OrderList formValues={formValues} />
+          },
+        ]}
+      />
     </>
   )
 }