Merge remote-tracking branch 'origin/main' into dev/chat

# Conflicts:
#	src/main.jsx

src/main.jsx

@@ -14,6 +14,7 @@ import ChatHistory from '@/views/ChatHistory'
 import SalesManagement from '@/views/SalesManagement'
 import DingdingQRCode from '@/views/DingdingQRCode'
 import DingdingCallbak from '@/views/DingdingCallbak'
+import AccountProfile from '@/views/AccountProfile'
 import ErrorPage from '@/views/ErrorPage'
 
 import Conversations from '@/views/Conversations/ChatWindow';
@@ -46,6 +47,7 @@ const router = createBrowserRouter([
       { path: 'chat/history', element: <ChatHistory />},
       { path: 'sales/management', element: <SalesManagement />},
       { path: 'order/chat', element: <Conversations />},
+      { path: 'account/profile', element: <AccountProfile />},
     ]
   },
   {

src/views/AccountProfile.jsx

@@ -0,0 +1,32 @@
+import { useNavigate } from 'react-router-dom'
+import { useRef, useEffect, useState } from 'react'
+import { observer } from 'mobx-react'
+import {
+  Row, Col, Divider, Table, Card, Button, Input,
+  Space, Segmented, Radio, Select, Descriptions, Spin, Typography, Flex, DatePicker, List, Avatar
+} from 'antd'
+import {
+  StarFilled, ZoomInOutlined, StarOutlined, BarsOutlined, AppstoreOutlined, SearchOutlined
+} from '@ant-design/icons'
+import { Conditional } from '@/components/Conditional'
+
+function AccountProfile() {
+
+  useEffect(() => {
+  }, [])
+
+  return (    
+    <Row> 
+      <Col span={12} offset={6}>
+        <Descriptions title='个人信息' layout='vertical' column={2}>
+          <Descriptions.Item label='名字'>​骆梅玉​</Descriptions.Item>
+          <Descriptions.Item label='手机'>+86-15878301602</Descriptions.Item>
+          <Descriptions.Item label='邮件'>christyluo@hainatravel.com</Descriptions.Item>
+          <Descriptions.Item label='部门'>海纳业务组-GH事业部群-GH销售</Descriptions.Item>
+        </Descriptions>
+      </Col>
+    </Row>
+  )
+}
+
+export default observer(AccountProfile)

src/views/App.jsx

@@ -1,6 +1,6 @@
 import { Outlet, Link, useHref, NavLink } from 'react-router-dom'
 import { useRef, useEffect, useState } from 'react'
-import { Layout, Menu, ConfigProvider, theme, Empty, Row, Col, Dropdown, Space, Typography, Result, App as AntApp } from 'antd'
+import { Layout, Menu, ConfigProvider, theme, Empty, Row, Col, Dropdown, Space, Typography, Result, Select, App as AntApp } from 'antd'
 import { DownOutlined } from "@ant-design/icons";
 import zhLocale from 'antd/locale/zh_CN';
 import dayjs from 'dayjs';
@@ -56,7 +56,7 @@ function App() {
                 <img src={AppLogo} className='logo' alt='App logo' />
               </NavLink>
               <Title level={3}>
-              聊天式销售平台
+                聊天式销售平台
               </Title>
             </Col>
             <Col span={10}>
@@ -76,7 +76,7 @@ function App() {
                 menu={{
                   items: [
                     {
-                      label: <Link to="/account/profile">个人资料</Link>,
+                      label: <Link to="/s/account/profile">个人资料</Link>,
                       key: "1",
                     },
                     {
@@ -97,7 +97,8 @@ function App() {
                   </Space>
                 </a>
               </Dropdown>
-							</Col>
+
+            </Col>
           </Row>
         </Header>
         <Layout>