删除context provider

dev/chat
Lei OT 1 year ago
parent a72914c955
commit 13ea0ea893

@ -43,9 +43,9 @@ ReactDOM.createRoot(document.getElementById('root')).render(
// <React.StrictMode>
<ThemeContext.Provider value={{ colorPrimary: '#1ba784', borderRadius: 4 }}>
<AuthContext.Provider value={{ loginUser: { userId: 354, username: '廖一军', accountList: [{OPI_Code:'LYJ'}, {OPI_Code:'LYJAH'}, {OPI_Code:'LYJGH'}] } }}>
<ConversationProvider>
{/* <ConversationProvider> */}
<RouterProvider router={router} fallbackElement={() => <div>Loading...</div>} />
</ConversationProvider>
{/* </ConversationProvider> */}
</AuthContext.Provider>
</ThemeContext.Provider>
// </React.StrictMode>

@ -1,13 +1,13 @@
import { useEffect } from 'react';
import { Layout, Spin } from 'antd';
import { useParams, useNavigate } from 'react-router-dom';
// import { useParams, useNavigate } from 'react-router-dom';
import MessagesHeader from './Components/MessagesHeader';
import Messages from './Components/Messages';
import InputComposer from './Components/InputComposer';
import ConversationsList from './Components/ConversationsList';
import CustomerProfile from './Components/CustomerProfile';
import { useAuthContext } from '@/stores/AuthContext';
import useConversationStore from '@/stores/ConversationStore';
// import { useAuthContext } from '@/stores/AuthContext';
// import useConversationStore from '@/stores/ConversationStore';
import './Conversations.css';
@ -18,9 +18,9 @@ const { Sider, Content, Header, Footer } = Layout;
*/
const ChatWindow = () => {
console.log('chat window;;;;;;;;;;;;;;;;;;;;;;;;');
const { order_sn } = useParams();
const { loginUser } = useAuthContext();
const { currentConversation } = useConversationStore();
// const { order_sn } = useParams();
// const { loginUser } = useAuthContext();
// const { currentConversation } = useConversationStore();
useEffect(() => {
console.log('chat window 222;;;;;;;;;;;;;;;;;;;;;;;;');
@ -52,7 +52,7 @@ const ChatWindow = () => {
</Content>
<Sider width={300} theme={'light'} className='h-full overflow-y-auto' style={{ maxHeight: 'calc(100vh - 198px)', height: 'calc(100vh - 198px)' }}>
<CustomerProfile colisn={currentConversation.coli_sn ?? order_sn} />
<CustomerProfile />
</Sider>
</Layout>
</Spin>

@ -1,7 +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 { useConversationState } from '@/stores/ConversationContext';
import { useLocation, useParams } from 'react-router-dom'
import { HomeOutlined, LoadingOutlined, SettingFilled, SmileOutlined, SyncOutlined, PhoneOutlined, MailOutlined, WhatsAppOutlined, SmileTwoTone } from '@ant-design/icons';
import CreatePayment from './CreatePayment';
@ -22,13 +22,15 @@ const orderStatus = [
const { Meta } = Card;
const CustomerProfile = (({ colisn }) => {
const CustomerProfile = (() => {
let { state } = useLocation()
console.info(state)
console.log(useParams());
const { order_sn: colisn } = useParams();
console.log('invoke customer profile+++++++++++++++++++++++++++++++++++++++++++++', colisn);
const { customerOrderProfile: orderInfo } = useConversationState();
// const { customerOrderProfile: orderInfo } = useConversationState();
const { loginUser: currentUser } = useAuthContext();
const { quotes, contact, last_contact, ...order } = orderInfo;
const { quotes, contact, last_contact, ...order } = {}; // orderInfo;
return (
<div className=' divide-x-0 divide-y divide-dashed divide-gray-300 '>

@ -1,6 +1,6 @@
import { useEffect, useState } from 'react';
import { Typography } from 'antd';
import { useConversationState } from '@/stores/ConversationContext';
// import { useConversationState } from '@/stores/ConversationContext';
import dayjs from 'dayjs';
import utc from 'dayjs/plugin/utc';
import timezone from 'dayjs/plugin/timezone';
@ -9,7 +9,7 @@ dayjs.extend(utc);
dayjs.extend(timezone);
const LocalTimeClock = ((props) => {
const { customerOrderProfile: orderInfo } = useConversationState();
// const { customerOrderProfile: orderInfo } = useConversationState();
const [customerDateTime, setCustomerDateTime] = useState();

@ -1,10 +1,10 @@
import { createContext, useContext, useEffect, useState } from 'react';
import { Popover, Flex, Button, List, Popconfirm } from 'antd';
import { useConversationState } from '@/stores/ConversationContext';
// import { useConversationState } from '@/stores/ConversationContext';
const QuotesHistory = ((props) => {
const { customerOrderProfile: orderInfo } = useConversationState();
const { quotes, ...order } = orderInfo;
// const { customerOrderProfile: orderInfo } = useConversationState();
const { quotes, ...order } = {} // orderInfo;
const [open, setOpen] = useState(false);
const handleOpenChange = (newOpen) => {

Loading…
Cancel
Save