Merge branch 'main' of github.com:hainatravel/global-sales

src/views/Conversations/History/MessagesList.jsx

@@ -33,7 +33,7 @@ const MessagesList = ({ ...listProps }) => {
     setChatItemMessages((prevValue) => [].concat(data, prevValue));
     const loadPrePage = !(data.length === 0 || data.length < BIG_PAGE_SIZE);
     if (data.length > 0) {
-      setParamsForMsgList({ loadPrePage, pretime: data[0].orgmsgtime });
+      setParamsForMsgList({ loadPrePage, pretime: data[0].msgtime });
     }
   };
   const getMessagesNext = async (chatItem) => {
@@ -45,7 +45,7 @@ const MessagesList = ({ ...listProps }) => {
     setChatItemMessages((prevValue) => [].concat(prevValue, data));
     const loadNextPage = !(data.length === 0 || data.length < BIG_PAGE_SIZE);
     if (data.length > 0) {
-      setParamsForMsgList({ loadNextPage, lasttime: data[data.length - 1].orgmsgtime });
+      setParamsForMsgList({ loadNextPage, lasttime: data[data.length - 1].msgtime });
     }
   };
 
@@ -74,8 +74,8 @@ const MessagesList = ({ ...listProps }) => {
       firstActionPageParams.loadPrePage = true;
     }
     if (!isEmpty(formValues?.search) && !isEmpty(selectedConversation.matchMsgList)) {
-      firstActionPageParams.pretime = selectedConversation.matchMsgList[0].orgmsgtime;
-      firstActionPageParams.lasttime = selectedConversation.matchMsgList[0].orgmsgtime;
+      firstActionPageParams.pretime = selectedConversation.matchMsgList[0].msgtime;
+      firstActionPageParams.lasttime = selectedConversation.matchMsgList[0].msgtime;
       firstActionPageParams.loadPrePage = true;
     }
     setParamsForMsgList(firstActionPageParams);
@@ -106,7 +106,7 @@ const MessagesList = ({ ...listProps }) => {
   // 更新是否需要显示上一页,下一页按钮
   useEffect(() => {
     if (chatItemMessages.length > 0) {
-  //     setParamsForMsgList({ pretime: chatItemMessages[0].orgmsgtime, lasttime: chatItemMessages[chatItemMessages.length - 1].orgmsgtime });
+  //     setParamsForMsgList({ pretime: chatItemMessages[0].msgtime, lasttime: chatItemMessages[chatItemMessages.length - 1].msgtime });
       const album = chatItemMessages.filter((ele) => ele.whatsapp_msg_type === 'image').map((ele) => ele.data.uri);
       setImageAlbumList(album);
     }