diff --git a/src/lib/msgUtils.js b/src/lib/msgUtils.js
index 1860e34..557cccd 100644
--- a/src/lib/msgUtils.js
+++ b/src/lib/msgUtils.js
@@ -13,6 +13,13 @@ export const replaceTemplateString = (str, replacements) => {
 
   return result;
 }
+
+const autoLinkText = (text) => {
+  let regex = /(https?:\/\/[^\s]+)/g;
+
+  let newText = text.replace(regex, '<a href="$1" target="_blank">$1</a>');
+  return newText;
+}
 /**
  *
 // +8618777396951  lyj
@@ -31,12 +38,14 @@ export const sentMsgTypeMapped = {
       renderId: msg.id,
       to: msg.to,
       msgtype: 'text',
-      msgcontent: { body: msg.text, ...(msg.context ? { context: msg.context, message_origin: msg.message_origin.msgOrigin } : {}) },
+      msgcontent: { body: msg.text, preview_url: true, ...(msg.context ? { context: msg.context, message_origin: msg.message_origin.msgOrigin } : {}) },
     }),
     contentToRender: (msg) => ({
       ...msg,
       actionId: msg.id,
       conversationid: msg.id.split('.')[0],
+      originText: (msg.text),
+      text: autoLinkText(msg.text),
       ...(msg.context
         ? {
             reply: {
@@ -169,7 +178,7 @@ export const whatsappMsgTypeMapped = {
   },
   text: {
     type: 'text',
-    data: (msg) => ({ id: msg.wamid, text: msg.text.body }),
+    data: (msg) => ({ id: msg.wamid, text: autoLinkText(msg.text.body), originText: msg.text.body }),
     renderForReply: (msg) => ({ id: msg.wamid, message: msg.text.body }),
   },
   image: {
@@ -313,12 +322,12 @@ export const parseRenderMessageList = (messages, conversationid = null) => {
         : {
             reply: {
               message: msg.messageorigin_AsJOSN.text?.body || msg.messageorigin_AsJOSN.text,
-              title: msg.messageorigin_AsJOSN?.customerProfile?.name || 'me', // msg.messageorigin_AsJOSN.senderName || '@',
+              title: msg.messageorigin_AsJOSN?.customerProfile?.name || msg.messageorigin_AsJOSN.senderName || 'me',
               ...(typeof whatsappMsgTypeMapped[msg.messageorigin_AsJOSN.type]?.renderForReply === 'function'
                 ? whatsappMsgTypeMapped[msg.messageorigin_AsJOSN.type].renderForReply(msg.messageorigin_AsJOSN)
                 : {}),
-              titleColor: msg.messageorigin_AsJOSN?.customerProfile?.name ? '#a791ff' : "#128c7e",
-              // titleColor: msg.messageorigin_direction === 'inbound' ? '#a791ff' : "#128c7e",
+              // titleColor: msg.messageorigin_AsJOSN?.customerProfile?.name ? '#a791ff' : "#128c7e",
+              titleColor: msg.messageorigin_direction === 'inbound' ? '#a791ff' : "#128c7e",
             },
             origin: msg.messageorigin_AsJOSN,
           }),
diff --git a/src/views/Conversations/Components/ConversationsList.jsx b/src/views/Conversations/Components/ConversationsList.jsx
index a778263..15040e7 100644
--- a/src/views/Conversations/Components/ConversationsList.jsx
+++ b/src/views/Conversations/Components/ConversationsList.jsx
@@ -74,6 +74,7 @@ const Conversations = () => {
     return () => {};
   }, [conversationsList, currentConversation]);
 
+  const [switchToC, setSwitchToC] = useState({});
   const [shouldFetchCList, setShouldFetchCList] = useState(true);
   useEffect(() => {
     if (order_sn && shouldFetchCList && initialState) {
@@ -116,12 +117,11 @@ const Conversations = () => {
     setCurrentConversation(item);
   };
 
-  const [switchToC, setSwitchToC] = useState({});
   const onSwitchConversation = (item) => {
-    if (item.coli_sn) {
-      navigate(`/order/chat/${item.coli_sn}`, { replace: true });
+    if ( ! isEmpty(item.coli_sn)) {
       setSwitchToC(item);
       setShouldFetchCList(false);
+      navigate(`/order/chat/${item.coli_sn}`, { replace: true });
     } else {
       navigate(`/order/chat`, { replace: true });
     }
diff --git a/src/views/Conversations/Components/InputComposer.jsx b/src/views/Conversations/Components/InputComposer.jsx
index 35f73a7..d5af10c 100644
--- a/src/views/Conversations/Components/InputComposer.jsx
+++ b/src/views/Conversations/Components/InputComposer.jsx
@@ -72,7 +72,7 @@ const InputBox = () => {
       {referenceMsg.id && (
         <Flex justify='space-between' className='reply-to bg-gray-100 p-1 rounded-none text-slate-500'>
           <div className=' border-l-3 border-y-0 border-r-0 border-slate-300 border-solid pl-2 pr-1 py-1'>
-            <span className=' text-primary pr-1 italic'>{referenceMsg.senderName}</span>{referenceMsg.text}</div>
+            <span className=' text-primary pr-1 italic'>{referenceMsg.senderName}</span>{referenceMsg.originText}</div>
           <Button type='text' title='取消引用' className=' rounded-none text-slate-500' icon={<CloseCircleOutlined />} size={'middle'} onClick={() => (setReferenceMsg({}))} />
         </Flex>
       )}
diff --git a/src/views/Conversations/Components/Messages.jsx b/src/views/Conversations/Components/Messages.jsx
index 7cf7749..0a5e5d2 100644
--- a/src/views/Conversations/Components/Messages.jsx
+++ b/src/views/Conversations/Components/Messages.jsx
@@ -1,11 +1,12 @@
 import { useEffect, useState, useRef, useMemo } from 'react';
-import { Image, Spin } from 'antd';
+import { Image, Spin, Dropdown } from 'antd';
+import { DownOutlined } from '@ant-design/icons';
 import { MessageBox } from 'react-chat-elements';
 import useConversationStore from '@/stores/ConversationStore';
 import { useShallow } from 'zustand/react/shallow';
 
 const Messages = () => {
-  const { currentConversation, setReferenceMsg, msgListLoading,  } = useConversationStore();
+  const { currentConversation, setReferenceMsg, msgListLoading } = useConversationStore();
   const activeMessages = useConversationStore(useShallow((state) => (currentConversation.sn ? state.activeConversations[currentConversation.sn] : [])));
 
   const messagesList = useMemo(
@@ -25,9 +26,9 @@ const Messages = () => {
               replyButton: ['text'].includes(message.whatsapp_msg_type) ? true : false,
             }),
       })),
-    [activeMessages, currentConversation.sn]
+    [activeMessages]
   );
-  console.log('messagesList----------------------------------------------------', messagesList);
+  // console.log('messagesList----------------------------------------------------', messagesList);
 
   const messagesEndRef = useRef(null);
   useEffect(() => {
@@ -50,13 +51,38 @@ const Messages = () => {
 
   return (
     <div>
-    <Spin spinning={msgListLoading} tip={'正在读取...'} wrapperClassName='pt-8 ' >
-      {messagesList.map((message, index) => (
-        <MessageBox key={message.key} {...message} onReplyClick={() => setReferenceMsg(message)} onOpen={() => handlePreview(message)} />
-      ))}
-      <Image src={previewSrc} preview={{ visible: previewVisible, src: previewSrc, onClose: onPreviewClose }} />
-      <div ref={messagesEndRef}></div>
-    </Spin>
+      <Spin spinning={msgListLoading} tip={'正在读取...'} wrapperClassName='pt-8 '>
+        {messagesList.map((message, index) => (
+          // <Dropdown
+          //   key={message.key}
+          //   menu={{
+          //     items: [{ label: '回复', key: 'reply' }],
+          //     onClick: ({ key, domEvent }) => {
+          //       domEvent.stopPropagation();
+          //       switch (key) {
+          //         case 'reply':
+          //           return setReferenceMsg(message);
+
+          //         default:
+          //           return;
+          //       }
+          //     },
+          //   }}
+          //   trigger={['contextMenu']}
+          // >
+            <MessageBox
+              key={message.key}
+              {...message}
+              onReplyClick={() => setReferenceMsg(message)}
+              onOpen={() => handlePreview(message)}
+              {...(message.type === 'text' ? { text: <div dangerouslySetInnerHTML={{ __html: message.text }}></div> } : {})}
+            />
+          // </Dropdown>
+        ))}
+
+        <Image src={previewSrc} preview={{ visible: previewVisible, src: previewSrc, onClose: onPreviewClose }} />
+        <div ref={messagesEndRef}></div>
+      </Spin>
     </div>
   );
 };
diff --git a/src/views/Conversations/Conversations.css b/src/views/Conversations/Conversations.css
index 9873798..6a1adb1 100644
--- a/src/views/Conversations/Conversations.css
+++ b/src/views/Conversations/Conversations.css
@@ -15,3 +15,6 @@
     background: linear-gradient(0deg,#00000014,#0000);
     color: #00000073;
 }
+.chatwindow-wrapper .rce-mbox-text:after{
+    content: none;
+}