移动端: 返回列表

根据设备来跳转路由
dev/mobile
Lei OT 2 years ago
parent dd04816cf1
commit 4eca23d114

@ -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: <AuthApp />,
errorElement: <ErrorPage />,
children: [
{
element: <DesktopApp />,
children: [
{ index: true, element: <OrderFollow /> },
{ path: 'order/follow', element: <OrderFollow /> },
{ path: 'chat/history', element: <ChatHistory /> },
{ path: 'sales/management', element: <SalesManagement /> },
{ path: 'order/chat/:order_sn', element: <Conversations /> },
{ path: 'order/chat', element: <Conversations /> },
{ path: 'account/profile', element: <AccountProfile /> },
children: isMobileApp
? [
{
path: 'm',
element: <MobileApp />,
children: [
{ path: 'conversation', element: <MobileConversation /> },
// { path: 'chat/:order_sn', element: <MobileChat /> },
// { path: 'chat', element: <MobileChat /> },
],
},
{ path: 'm/chat/:order_sn', element: <MobileChat /> },
{ path: 'm/chat', element: <MobileChat /> },
]
},
{
path: 'm',
element: <MobileApp />,
children: [
{ path: 'conversation', element: <MobileConversation /> },
{ path: 'chat/:order_sn', element: <MobileChat /> },
{ path: 'chat', element: <MobileChat /> },
]
},
],
: [
{
element: <DesktopApp />,
children: [
{ index: true, element: <OrderFollow /> },
{ path: 'order/follow', element: <OrderFollow /> },
{ path: 'chat/history', element: <ChatHistory /> },
{ path: 'sales/management', element: <SalesManagement /> },
{ path: 'order/chat/:order_sn', element: <Conversations /> },
{ path: 'order/chat', element: <Conversations /> },
{ path: 'account/profile', element: <AccountProfile /> },
],
},
],
},
{
path: '/p',
@ -59,10 +66,10 @@ const router = createBrowserRouter([
{ path: 'dingding/qrcode', element: <DingdingQRCode /> },
{ path: 'dingding/callback', element: <DingdingCallback /> },
{ path: 'dingding/logout', element: <DingdingLogout /> },
{ path: 'mobile-login', element: <MobileLogin />},
{ path: 'mobile-login', element: <MobileLogin /> },
],
},
])
]);
ReactDOM.createRoot(document.getElementById('root')).render(
// <React.StrictMode>

@ -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 (
<>
<Layout className='h-full chatwindow-wrapper mobilechat-wrapper' style={{ maxHeight: 'calc(100vh - 84px)', height: 'calc(100vh - 84px)', minWidth: '360px' }}>
<Header className='ant-layout-sider-light ant-card h-auto flex justify-between gap-1 items-center'>
<Layout className='h-full chatwindow-wrapper mobilechat-wrapper' style={{ maxHeight: 'calc(100vh - 20px)', height: 'calc(100vh - 20px)', minWidth: '360px' }}>
<Header className=' px-2 ant-layout-sider-light ant-card h-auto flex justify-between gap-1 items-center'>
<Button type='text' icon={<UnorderedListOutlined />} onClick={() => navigate('/m/conversation')} className=' rounded-none rounded-l' />
<MessagesHeader />
</Header>
<Content className='flex-grow bg-whatsapp-bg relative'>

Loading…
Cancel
Save