diff --git a/src/stores/OrderStore.js b/src/stores/OrderStore.js index c85ef28..d63adbb 100644 --- a/src/stores/OrderStore.js +++ b/src/stores/OrderStore.js @@ -15,6 +15,7 @@ const useOrderStore = create((set, get) => ({ quotationList: [], fetchOrderDetail: async (colisn) => { + const { orderDetail, updateQuotation } = get() const json = await fetchJSON(`${API_HOST}/getorderinfo`, { colisn }) if (json.errcode === 0 && json.result.length > 0) { const orderResult = json.result[0] diff --git a/src/views/Conversations/Components/CustomerProfile.jsx b/src/views/Conversations/Components/CustomerProfile.jsx index bb95be1..5fba7eb 100644 --- a/src/views/Conversations/Components/CustomerProfile.jsx +++ b/src/views/Conversations/Components/CustomerProfile.jsx @@ -17,11 +17,6 @@ const CustomerProfile = (() => { useEffect(() => { fetchOrderDetail(order_sn) }, [order_sn]) - - const paginationProps = { - showLessItems: true, - showTotal: (total) => { return `总数:${total}` } - } let regularText = '' if (orderDetail.buytime > 0) regularText = '(R' + orderDetail.buytime + ')' @@ -84,24 +79,8 @@ const CustomerProfile = (() => { 最新报价

{lastQuotation.lettertitle}

- + - - ( - - {item.lettertitle}} - description={item.letterdate} - /> - - )} - />

diff --git a/src/views/Conversations/Components/QuotesHistory.jsx b/src/views/Conversations/Components/QuotesHistory.jsx index c6d90ad..5762e4d 100644 --- a/src/views/Conversations/Components/QuotesHistory.jsx +++ b/src/views/Conversations/Components/QuotesHistory.jsx @@ -1,49 +1,46 @@ -import { createContext, useContext, useEffect, useState } from 'react'; -import { Popover, Flex, Button, List, Popconfirm } from 'antd'; -// import { useConversationState } from '@/stores/ConversationContext'; +import { useState } from 'react' +import { Popover, Flex, Button, List, Popconfirm } from 'antd' const QuotesHistory = ((props) => { - // const { customerOrderProfile: orderInfo } = useConversationState(); - const { quotes, ...order } = {} // orderInfo; - const [open, setOpen] = useState(false); + const [open, setOpen] = useState(false) + const handleOpenChange = (newOpen) => { - setOpen(newOpen); - }; + setOpen(newOpen) + } + const onSend = () => { - setOpen(false); + setOpen(false) // todo: send - }; + } + return ( <> Close} content={ { return `总数:${total}` } + }} + dataSource={props.dataSource} renderItem={(item, index) => ( {item.lettertitle}} description={ - {item.letterdate} - - {}} onCancel={onSend} okText='Yes' cancelText='No'> - - - - + } /> @@ -59,6 +56,7 @@ const QuotesHistory = ((props) => { - ); -}); -export default QuotesHistory; + ) +}) + +export default QuotesHistory