From 00755db441a96b49ac13fc186c135c9bf3a6955a Mon Sep 17 00:00:00 2001 From: Lei OT Date: Fri, 29 Mar 2024 16:59:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BC=9A=E8=AF=9D=E7=AA=97?= =?UTF-8?q?=E5=8F=A3=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.jsx | 8 ++++---- src/views/{Conversations => }/ChatWindow.jsx | 12 ++++++------ src/views/Conversations/Components/ContactInfo.jsx | 12 ------------ src/views/Conversations/Components/ContactPanel.jsx | 12 ------------ .../{Components => Online}/ConversationsList.jsx | 0 .../{Components => Online}/ExpireTimeClock.jsx | 0 .../{Components => Online}/Input/Emoji.jsx | 0 .../{Components => Online}/Input/MediaUpload.jsx | 0 .../{Components => Online}/Input/Template.jsx | 0 .../{Components => Online}/InputComposer.jsx | 0 .../{Components => Online}/LocalTimeClock.jsx | 0 .../{Components => Online}/MessagesHeader.jsx | 0 .../{Components => Online}/MessagesList.jsx | 0 .../{Components => Online}/MessagesWrapper.jsx | 0 .../{Components => Online/order}/CreatePayment.jsx | 0 .../{Components => Online/order}/CustomerProfile.jsx | 6 +++--- .../{Components => Online/order}/QuotesHistory.jsx | 0 src/views/mobile/Chat.jsx | 6 +++--- src/views/mobile/Conversation.jsx | 2 +- 19 files changed, 17 insertions(+), 41 deletions(-) rename src/views/{Conversations => }/ChatWindow.jsx (85%) delete mode 100644 src/views/Conversations/Components/ContactInfo.jsx delete mode 100644 src/views/Conversations/Components/ContactPanel.jsx rename src/views/Conversations/{Components => Online}/ConversationsList.jsx (100%) rename src/views/Conversations/{Components => Online}/ExpireTimeClock.jsx (100%) rename src/views/Conversations/{Components => Online}/Input/Emoji.jsx (100%) rename src/views/Conversations/{Components => Online}/Input/MediaUpload.jsx (100%) rename src/views/Conversations/{Components => Online}/Input/Template.jsx (100%) rename src/views/Conversations/{Components => Online}/InputComposer.jsx (100%) rename src/views/Conversations/{Components => Online}/LocalTimeClock.jsx (100%) rename src/views/Conversations/{Components => Online}/MessagesHeader.jsx (100%) rename src/views/Conversations/{Components => Online}/MessagesList.jsx (100%) rename src/views/Conversations/{Components => Online}/MessagesWrapper.jsx (100%) rename src/views/Conversations/{Components => Online/order}/CreatePayment.jsx (100%) rename src/views/Conversations/{Components => Online/order}/CustomerProfile.jsx (95%) rename src/views/Conversations/{Components => Online/order}/QuotesHistory.jsx (100%) diff --git a/src/main.jsx b/src/main.jsx index bb5510e..5d36f8d 100644 --- a/src/main.jsx +++ b/src/main.jsx @@ -13,11 +13,11 @@ import DingdingCallback from '@/views/dingding/Callback' import DingdingLogout from '@/views/dingding/Logout' import AccountProfile from '@/views/accounts/Profile' import ErrorPage from '@/components/ErrorPage' -import Conversations from '@/views/Conversations/ChatWindow' +import ChatWindow from '@/views/ChatWindow' import MobileConversation from '@/views/mobile/Conversation' import MobileChat from '@/views/mobile/Chat' import MobileSecondHeader from '@/views/mobile/SecondHeaderWrapper'; -import CustomerProfile from '@/views/Conversations/Components/CustomerProfile'; +import CustomerProfile from '@/views/Conversations/Online/order/CustomerProfile'; import DingdingLogin from '@/views/dingding/Login' import useAuthStore from '@/stores/AuthStore' @@ -58,8 +58,8 @@ const router = createBrowserRouter([ { path: 'order/follow', element: }, { path: 'chat/history', element: }, { path: 'sales/management', element: }, - { path: 'order/chat/:order_sn', element: }, - { path: 'order/chat', element: }, + { path: 'order/chat/:order_sn', element: }, + { path: 'order/chat', element: }, { path: 'account/profile', element: }, ], }, diff --git a/src/views/Conversations/ChatWindow.jsx b/src/views/ChatWindow.jsx similarity index 85% rename from src/views/Conversations/ChatWindow.jsx rename to src/views/ChatWindow.jsx index 0cdb0b7..d642e61 100644 --- a/src/views/Conversations/ChatWindow.jsx +++ b/src/views/ChatWindow.jsx @@ -2,15 +2,15 @@ import { useEffect, useState } from 'react'; import { Layout, Spin, Button } from 'antd'; import { RightCircleOutlined, RightOutlined, ReloadOutlined, MenuFoldOutlined, MenuUnfoldOutlined } from '@ant-design/icons'; // import { useParams, useNavigate } from 'react-router-dom'; -import MessagesHeader from './Components/MessagesHeader'; -import MessagesWrapper from './Components/MessagesWrapper'; -import InputComposer from './Components/InputComposer'; -import ConversationsList from './Components/ConversationsList'; -import CustomerProfile from './Components/CustomerProfile'; +import MessagesHeader from './Conversations/Online/MessagesHeader'; +import MessagesWrapper from './Conversations/Online/MessagesWrapper'; +import InputComposer from './Conversations/Online/InputComposer'; +import ConversationsList from './Conversations/Online/ConversationsList'; +import CustomerProfile from './Conversations/Online/order/CustomerProfile'; // import { useAuthContext } from '@/stores/AuthContext'; // import useConversationStore from '@/stores/ConversationStore'; -import './Conversations.css'; +import './Conversations/Conversations.css'; const { Sider, Content, Header, Footer } = Layout; diff --git a/src/views/Conversations/Components/ContactInfo.jsx b/src/views/Conversations/Components/ContactInfo.jsx deleted file mode 100644 index 5087178..0000000 --- a/src/views/Conversations/Components/ContactInfo.jsx +++ /dev/null @@ -1,12 +0,0 @@ -import { useContext } from 'react'; -import { stores_Context } from '../config'; -import { Table } from 'antd'; - -const ContactInfo = ((props) => { - // const { } = useContext(stores_Context); - return ( - <> - - ); -}); -export default ContactInfo; diff --git a/src/views/Conversations/Components/ContactPanel.jsx b/src/views/Conversations/Components/ContactPanel.jsx deleted file mode 100644 index db8881c..0000000 --- a/src/views/Conversations/Components/ContactPanel.jsx +++ /dev/null @@ -1,12 +0,0 @@ -import { useContext } from 'react'; -import { stores_Context } from '../config'; -import { Table } from 'antd'; - -const ContactPanel = ((props) => { - // const { } = useContext(stores_Context); - return ( - <> - - ); -}); -export default ContactPanel; diff --git a/src/views/Conversations/Components/ConversationsList.jsx b/src/views/Conversations/Online/ConversationsList.jsx similarity index 100% rename from src/views/Conversations/Components/ConversationsList.jsx rename to src/views/Conversations/Online/ConversationsList.jsx diff --git a/src/views/Conversations/Components/ExpireTimeClock.jsx b/src/views/Conversations/Online/ExpireTimeClock.jsx similarity index 100% rename from src/views/Conversations/Components/ExpireTimeClock.jsx rename to src/views/Conversations/Online/ExpireTimeClock.jsx diff --git a/src/views/Conversations/Components/Input/Emoji.jsx b/src/views/Conversations/Online/Input/Emoji.jsx similarity index 100% rename from src/views/Conversations/Components/Input/Emoji.jsx rename to src/views/Conversations/Online/Input/Emoji.jsx diff --git a/src/views/Conversations/Components/Input/MediaUpload.jsx b/src/views/Conversations/Online/Input/MediaUpload.jsx similarity index 100% rename from src/views/Conversations/Components/Input/MediaUpload.jsx rename to src/views/Conversations/Online/Input/MediaUpload.jsx diff --git a/src/views/Conversations/Components/Input/Template.jsx b/src/views/Conversations/Online/Input/Template.jsx similarity index 100% rename from src/views/Conversations/Components/Input/Template.jsx rename to src/views/Conversations/Online/Input/Template.jsx diff --git a/src/views/Conversations/Components/InputComposer.jsx b/src/views/Conversations/Online/InputComposer.jsx similarity index 100% rename from src/views/Conversations/Components/InputComposer.jsx rename to src/views/Conversations/Online/InputComposer.jsx diff --git a/src/views/Conversations/Components/LocalTimeClock.jsx b/src/views/Conversations/Online/LocalTimeClock.jsx similarity index 100% rename from src/views/Conversations/Components/LocalTimeClock.jsx rename to src/views/Conversations/Online/LocalTimeClock.jsx diff --git a/src/views/Conversations/Components/MessagesHeader.jsx b/src/views/Conversations/Online/MessagesHeader.jsx similarity index 100% rename from src/views/Conversations/Components/MessagesHeader.jsx rename to src/views/Conversations/Online/MessagesHeader.jsx diff --git a/src/views/Conversations/Components/MessagesList.jsx b/src/views/Conversations/Online/MessagesList.jsx similarity index 100% rename from src/views/Conversations/Components/MessagesList.jsx rename to src/views/Conversations/Online/MessagesList.jsx diff --git a/src/views/Conversations/Components/MessagesWrapper.jsx b/src/views/Conversations/Online/MessagesWrapper.jsx similarity index 100% rename from src/views/Conversations/Components/MessagesWrapper.jsx rename to src/views/Conversations/Online/MessagesWrapper.jsx diff --git a/src/views/Conversations/Components/CreatePayment.jsx b/src/views/Conversations/Online/order/CreatePayment.jsx similarity index 100% rename from src/views/Conversations/Components/CreatePayment.jsx rename to src/views/Conversations/Online/order/CreatePayment.jsx diff --git a/src/views/Conversations/Components/CustomerProfile.jsx b/src/views/Conversations/Online/order/CustomerProfile.jsx similarity index 95% rename from src/views/Conversations/Components/CustomerProfile.jsx rename to src/views/Conversations/Online/order/CustomerProfile.jsx index 5530f33..c8b3838 100644 --- a/src/views/Conversations/Components/CustomerProfile.jsx +++ b/src/views/Conversations/Online/order/CustomerProfile.jsx @@ -105,8 +105,8 @@ const CustomerProfile = (() => { 最新报价 - 0} + 0} whenFalse={暂无报价}>} whenTrue={ <> @@ -120,7 +120,7 @@ const CustomerProfile = (() => {

- ) + ) } else { return (