Merge remote-tracking branch 'origin/dev/2025a' into dev/2025a

src/components/OrderProfile.jsx

@@ -12,7 +12,8 @@ import {
   ReloadOutlined,
 } from '@ant-design/icons'
 
-import { useEffect, useState, useRef } from 'react'
+import { useEffect, useState } from 'react'
+import { Link, useNavigate } from 'react-router-dom'
 import { App, Flex, Select, Tooltip, Divider, Typography, Skeleton, Checkbox, Drawer, Button, Form, Input } from 'antd'
 import { useOrderStore, fetchSetRemindStateAction, OrderLabelDefaultOptions, OrderStatusDefaultOptions, remindStatusOptions } from '@/stores/OrderStore'
 import { copy, isEmpty } from '@/utils/commons'
@@ -20,6 +21,7 @@ import { useShallow } from 'zustand/react/shallow'
 import useConversationStore from '@/stores/ConversationStore'
 import useAuthStore from '@/stores/AuthStore'
 const OrderProfile = ({ coliSN, ...props }) => {
+  const navigate = useNavigate()
   const { notification, message } = App.useApp()
   const [formComment] = Form.useForm()
   const [loading, setLoading] = useState(false)
@@ -83,22 +85,12 @@ const OrderProfile = ({ coliSN, ...props }) => {
     return customerDetail.name
   }
 
+  const getPlanStatus = () => {
+    return orderDetail.DidPlan === 0 ? '未做计划' : '已做计划'
+  }
+
   return (
     <>
-      {/* <Tabs
-        tabPosition={'right'}
-        onTabClick={(key) => {
-          console.info(key)
-        }}
-        items={Array.from({ length: 3 }).map((_, i) => {
-          const id = String(i + 1)
-          return {
-            label: `Tab ${id}`,
-            key: id,
-            children: `Content of Tab ${id}`,
-          }
-        })}
-      /> */}
       <Skeleton active loading={loading}>
         <Flex gap='small' vertical={true} justify='space-between' className='p-2'>
           <Typography.Text>
@@ -111,7 +103,7 @@ const OrderProfile = ({ coliSN, ...props }) => {
           </Typography.Text>
           <Typography.Text>
             <CompassOutlined className=' pr-1' />
-            Thailand
+            {orderDetail.MEI_Country}
           </Typography.Text>
           <Typography.Text>
             <PhoneOutlined className=' pr-1' />
@@ -121,20 +113,22 @@ const OrderProfile = ({ coliSN, ...props }) => {
             <MailOutlined className='pr-1' />
             {customerDetail.email}
           </Typography.Text>
-          <Typography.Link href={`/order/chat/${coliSN}`}>
+          <Typography.Text>
             <WhatsAppOutlined className=' pr-1' />
-            {customerDetail.whatsapp_phone_number}
+            <Link to={`/order/chat/${coliSN}`} state={orderDetail}>
-          </Typography.Link>
+              {customerDetail.whatsapp_phone_number}
+            </Link>
+          </Typography.Text>
           <Typography.Text>
             <Tooltip title='出发日期'>
               <CalendarOutlined className='pr-1' />
-              2025-09-18
+              {orderDetail.COLI_OrderStartDate}
             </Tooltip>
           </Typography.Text>
           <Typography.Text>
-            <Tooltip title='计划'>
+            <Tooltip title='计划状态'>
               <CheckOutlined className='pr-1' />
-              已做计划
+              {getPlanStatus()}
             </Tooltip>
           </Typography.Text>
         </Flex>
@@ -230,7 +224,7 @@ const OrderProfile = ({ coliSN, ...props }) => {
             <EditOutlined className='pl-1' />
           </Tooltip> */}
         </Divider>
-        <Typography.Text>泰国马来水灯节</Typography.Text>
+        <Typography.Text>{orderDetail.COLI_Introduction}</Typography.Text>
       </Skeleton>
       <Drawer title='添加表单信息' closable={{ 'aria-label': 'Close Button' }} onClose={() => setOpenOrderCommnet(false)} open={openOrderCommnet}>
         <Form

src/config.js

@@ -6,7 +6,7 @@
 // export const WS_URL = 'wss://p9axztuwd7x8a7.mycht.cn/whatsapp_144'; // prod: Slave
 
 // debug:
-// export const API_HOST = 'http://202.103.68.144:8889/v2';
+export const API_HOST = 'http://202.103.68.144:8889/v2';
 export const API_HOST_V3 = 'http://202.103.68.144:8889/v3';
 // export const WS_URL = 'ws://202.103.68.144:8888';
 // export const EMAIL_HOST = 'http://202.103.68.231:888/service-mail';
@@ -19,7 +19,7 @@ export const EMAIL_ATTA_HOST = 'https://p9axztuwd7x8a7.mycht.cn/attachment'; //
 // prod:
 // export const WAI_HOST = 'https://wai-server-qq4qmtq7wc9he4.mycht.cn/api/v1';
 export const EMAIL_HOST = 'https://p9axztuwd7x8a7.mycht.cn/mail-server/service-mail';
-export const API_HOST = 'https://p9axztuwd7x8a7.mycht.cn/whatsapp_server/v2';
+// export const API_HOST = 'https://p9axztuwd7x8a7.mycht.cn/whatsapp_server/v2';
 export const WS_URL = 'wss://p9axztuwd7x8a7.mycht.cn/whatsapp_server'; // prod:
 export const VONAGE_URL = 'https://p9axztuwd7x8a7.mycht.cn/vonage-server'; // 语音和视频接口:
 export const HT3 =  process.env.NODE_ENV === 'production' ? 'https://p9axztuwd7x8a7.mycht.cn/ht3' : 'https://p9axztuwd7x8a7.mycht.cn/ht3';