diff --git a/src/main.jsx b/src/main.jsx index 3bbeae8..cd56e30 100644 --- a/src/main.jsx +++ b/src/main.jsx @@ -23,34 +23,41 @@ import '@/assets/index.css' useAuthStore.getState().loadUserSession() +const isMobileApp = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i) !== null; + const router = createBrowserRouter([ { path: '/', element: , errorElement: , - children: [ - { - element: , - children: [ - { index: true, element: }, - { path: 'order/follow', element: }, - { path: 'chat/history', element: }, - { path: 'sales/management', element: }, - { path: 'order/chat/:order_sn', element: }, - { path: 'order/chat', element: }, - { path: 'account/profile', element: }, + children: isMobileApp + ? [ + { + path: 'm', + element: , + children: [ + { path: 'conversation', element: }, + // { path: 'chat/:order_sn', element: }, + // { path: 'chat', element: }, + ], + }, + { path: 'm/chat/:order_sn', element: }, + { path: 'm/chat', element: }, ] - }, - { - path: 'm', - element: , - children: [ - { path: 'conversation', element: }, - { path: 'chat/:order_sn', element: }, - { path: 'chat', element: }, - ] - }, - ], + : [ + { + element: , + children: [ + { index: true, element: }, + { path: 'order/follow', element: }, + { path: 'chat/history', element: }, + { path: 'sales/management', element: }, + { path: 'order/chat/:order_sn', element: }, + { path: 'order/chat', element: }, + { path: 'account/profile', element: }, + ], + }, + ], }, { path: '/p', @@ -59,10 +66,10 @@ const router = createBrowserRouter([ { path: 'dingding/qrcode', element: }, { path: 'dingding/callback', element: }, { path: 'dingding/logout', element: }, - { path: 'mobile-login', element: }, + { path: 'mobile-login', element: }, ], }, -]) +]); ReactDOM.createRoot(document.getElementById('root')).render( // diff --git a/src/views/mobile/Chat.jsx b/src/views/mobile/Chat.jsx index 402e1ec..c0371d6 100644 --- a/src/views/mobile/Chat.jsx +++ b/src/views/mobile/Chat.jsx @@ -1,15 +1,19 @@ -import { Layout } from 'antd'; +import { Layout, Button } from 'antd'; import MessagesHeader from '@/views/Conversations/Components/MessagesHeader'; import MessagesWrapper from '@/views/Conversations/Components/MessagesWrapper'; import InputComposer from '@/views/Conversations/Components/InputComposer'; +import { UnorderedListOutlined } from '@ant-design/icons'; +import { useNavigate } from 'react-router-dom'; const { Content, Header, Footer } = Layout; function Chat() { + const navigate = useNavigate(); return ( <> - -
+ +
+