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

# Conflicts:
#	src/config.js   resolved by main version

src/channel/bubbleMsgUtils.js

@@ -289,7 +289,6 @@ const whatsappMsgMapped = {
     },
     contentToRender: (contentObj) => {
       console.log('whatsapp.inbound_message.received to render', contentObj);
-      // const contentObj = result?.whatsappInboundMessage || result; // debug:
       return parseRenderMessageItem(contentObj);
     },
     contentToUpdate: () => null,
@@ -332,7 +331,6 @@ const emailMsgMapped = {
     },
     contentToRender: (contentObj) => {
       // console.log('email.inbound.received to render', contentObj);
-      // const contentObj = result?.emailMessage || result; // debug:
       return parseRenderMessageItem(contentObj);
     },
     contentToUpdate: (msgcontent) => null,

src/stores/ConversationStore.js

@@ -53,6 +53,7 @@ const initialConversationState = {
   totalNotify: 0,
   msgListLoading: false,
 
+  detailPopupOpen: false,
 };
 
 const globalNotifySlice = (set) => ({
@@ -467,6 +468,18 @@ const messageSlice = (set, get) => ({
   },
 });
 
+/**
+ * Email
+ */
+const emailSlice = (set, get) => ({
+  emailMsg: { id: -1, conversationid: '', actionId: '', order_opi: '', coli_sn: '', msgOrigin: {} },
+  setEmailMsg: (emailMsg) => set({ emailMsg }),
+  detailPopupOpen: false,
+  setDetailOpen: (v) => set({ detailPopupOpen: v }),
+  openDetail: () => set(() => ({ detailPopupOpen: true })),
+  closeDetail: () => set(() => ({ detailPopupOpen: false })),
+})
+
 export const useConversationStore = create(
   devtools((set, get) => ({
     ...initialConversationState,
@@ -479,6 +492,7 @@ export const useConversationStore = create(
     ...tagsSlice(set, get),
     ...filterSlice(set, get),
     ...globalNotifySlice(set, get),
+    ...emailSlice(set, get),
 
     // state actions
     addError: (error) => set((state) => ({ errors: [...state.errors, error] })),

src/views/Conversations/Online/Components/EmailDetail.jsx

@@ -18,7 +18,10 @@ const TagColorStyle = (tag) => {
   }
 }
 
-const EmailDetail = ({ open, setOpen, emailMsg, ...props }) => {
+/**
+ * @property {*} emailMsg - 邮件数据. { conversationid, actionId, order_opi, coli_sn, msgOrigin: { from, to, id, email: { subject, mai_sn, } } }
+ */
+const EmailDetail = ({ open, setOpen, emailMsg={}, ...props }) => {
 
   // console.log('emailDetail', emailMsg);
 

src/views/Conversations/Online/Input/EmailEditorPopup.jsx

@@ -491,7 +491,6 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, fromOrder, toEma
                   <Button icon={<UploadOutlined />}>附件</Button>
                 </Upload>
                 <Flex align={'center'} className='absolute right-0'>
-                  {/* todo: 添加: 支付链接 */}
                   <Divider type='vertical' />
                   <Button type={'link'} onClick={() => openDrawerSnippet()}>图文集</Button>
                   <Button type={'link'} onClick={() => openPaymentDrawer()}>支付链接</Button>

src/views/Conversations/Online/Input/EmailNewBtn.jsx

@@ -49,7 +49,7 @@ const EmailNewBtn = ({ ...props }) => {
 
   return (
     <ConfigProvider theme={{ token: { colorPrimary: '#6366f1' } }}>
-      <Flex gap={8} className='p-2 bg-gray-200 rounded rounded-b-none border-gray-300 border-solid border border-b-0 border-x-0' align={'center'} justify={'flex-end'}>
+      <Flex gap={8} className='p-2 bg-gray-200 rounded rounded-b-none border-gray-300 border-solid border-t border-b-0 border-x-0' align={'center'} justify={'flex-end'}>
         {/* <span>新邮件:</span> */}
         {/* <Dropdown.Button
           // disabled={!talkabled}

src/views/Conversations/Online/MessagesHeader.jsx

@@ -41,8 +41,8 @@ const MessagesHeader = () => {
                 <Typography.Text strong>{currentConversation.show_default}</Typography.Text>
                 {currentConversation.sn ? (
                   <>
-                  <Typography.Text>{currentConversation?.channels?.whatsapp_phone_number}</Typography.Text>
-                  <Typography.Text>{currentConversation?.channels?.email}</Typography.Text>
+                    <Typography.Text>{currentConversation?.channels?.whatsapp_phone_number}</Typography.Text>
+                    <Typography.Text>{currentConversation?.channels?.email}</Typography.Text>
                   </>
                 ) : (
                   <Typography.Text strong type='danger'>

src/views/Conversations/Online/order/CustomerProfile.jsx

@@ -12,6 +12,7 @@ import QuotesHistory from "./QuotesHistory";
 import ConversationBind from "./../ConversationBind";
 import ConversationsNewItem from "./../ConversationsNewItem";
 import { useConversationNewItem } from "@/hooks/useConversation";
+import EmailDetail from './../Components/EmailDetail';
 
 const CustomerProfile = () => {
 	const { notification, message } = App.useApp();
@@ -22,6 +23,7 @@ const CustomerProfile = () => {
 	const currentOrder = useConversationStore(state => state.currentConversation?.coli_sn || "");
 	const currentConversationID = useConversationStore(state => state.currentConversation?.sn || "");
 	const [updateCurrentConversation] = useConversationStore(state => [state.updateCurrentConversation]);
+	const [emailMsg, setEmailMsg, detailPopupOpen, setDetailOpen, openDetail] = useConversationStore(state => [state.emailMsg, state.setEmailMsg, state.detailPopupOpen, state.setDetailOpen, state.openDetail]);
 	const loginUser = useAuthStore(state => state.loginUser);
 	const [
     orderDetail, customerDetail, lastQuotation, quotationList, fetchOrderDetail, setOrderPropValue, appendOrderComment, fetchOtherEmail, otherEmailList
@@ -83,6 +85,23 @@ const CustomerProfile = () => {
 
   const renderOtherEmailList = () => {
 
+  }
+
+  const handleEmailClick = (emailItem) => {
+    const emailMsg = {
+      conversationid: currentConversationID,
+      order_opi: orderDetail.opi_sn,
+      coli_sn: currentOrder,
+      id: emailItem.MAI_SN,
+      msgOrigin: {
+        from: '',
+        to: '',
+        id: emailItem.MAI_SN,
+        email: { mai_sn: emailItem.MAI_SN, subject: emailItem.MAI_Subject, id: emailItem.MAI_SN },
+      },
+    }
+    setEmailMsg(emailMsg);
+    openDetail();
   }
 
 	if (currentOrder) {
@@ -220,9 +239,9 @@ const CustomerProfile = () => {
             }
             renderItem={(email) => (
               <List.Item
-                className='hover:bg-stone-50'
+                className='hover:bg-stone-50 cursor-pointer'
                 onClick={() => {
-                  console.info('email...')
+                  handleEmailClick(email)
                 }}>
                   <Flex
                     vertical
@@ -275,6 +294,8 @@ const CustomerProfile = () => {
 					</Button>
 				</Spin>
 				<ConversationsNewItem initialValues={newChatFormValues} open={newChatModalVisible} onCreate={handleNewChat} onCancel={() => setNewChatModalVisible(false)} />
+        <EmailDetail open={detailPopupOpen} setOpen={setDetailOpen} emailMsg={emailMsg} key={`supplier-email-detail-1-${emailMsg?.id}`} />
+
 			</div>
 		);
 	} else {