fix: 增加一个getorderconversation loading; 清空orderdetail

2.0/wai-server
Lei OT 10 months ago
parent 9b72216f61
commit da4af792cd

@ -4,16 +4,22 @@ import { fetchJSON, postForm } from '@/utils/request'
import { API_HOST, EMAIL_HOST } from '@/config'
import { isNotEmpty, prepareUrl } from '@/utils/commons'
export const useOrderStore = create(devtools((set, get) => ({
const initialState = {
orderList: [],
orderDetail: {},
customerDetail: {},
lastQuotation: {},
quotationList: [],
otherEmailList: [],
};
export const useOrderStore = create(devtools((set, get) => ({
...initialState,
drawerOpen: false,
resetOrderStore: () => set(initialState),
openDrawer: () => {
set(() => ({
drawerOpen: true

@ -159,6 +159,7 @@ const Conversations = () => {
return () => {};
}, [conversationsList, topList, pageList, listUpdateFlag, currentConversation.unread_msg_count]);
let orderChatRefreshing = false;
useEffect(() => {
// console.log('effect get order c');
@ -171,6 +172,10 @@ const Conversations = () => {
const getOrderConversationList = async (colisn) => {
if (orderChatRefreshing !== false) {
return false;
}
orderChatRefreshing = true;
const { whatsapp_phone_number } = switchToC;
const whatsappID = coli_guest_WhatsApp || whatsapp_phone_number || '';
@ -216,6 +221,7 @@ const Conversations = () => {
findCurrentIndex = conversationsList.findIndex((item) => `${item.coli_sn}` === `${colisn}`);
findCurrent = conversationsList[findCurrentIndex];
}
orderChatRefreshing = false;
if (findCurrentIndex >= 0) {
setCurrentConversation(findCurrent);
return findCurrent;

@ -34,6 +34,7 @@ const CustomerProfile = () => {
] = useOrderStore(s => [
s.orderDetail, s.customerDetail, s.lastQuotation, s.quotationList, s.fetchOrderDetail, s.setOrderPropValue, s.appendOrderComment, s.fetchOtherEmail, s.otherEmailList, s.fetchHistoryOrder
]);
const [resetOrderStore] = useOrderStore(state => [state.resetOrderStore])
const [chatOrder, setChatOrder] = useState(currentOrder);
@ -91,8 +92,10 @@ const CustomerProfile = () => {
duration: 60,
});
});
}
}, [currentOrder]);
} else {
resetOrderStore();
}
}, [currentOrder, currentConversationID]);
let regularText = "";
if (orderDetail.buytime > 0) regularText = "(R" + orderDetail.buytime + ")";

Loading…
Cancel
Save