From b79db4e26917a3b146e73d6e2ade07be3dcff8d5 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <lyj@hainatravel.com>
Date: Mon, 1 Jul 2024 11:39:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A1=BE=E9=97=AE=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E4=BC=9A=E8=AF=9D=E5=92=8C=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=EF=BC=9B=E7=99=BB=E9=99=86=E5=90=8E=E6=9B=BF=E6=8D=A2=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Conversations/Online/ConversationBind.jsx      | 4 ++--
 src/views/Conversations/Online/order/CustomerProfile.jsx | 2 +-
 src/views/dingding/Callback.jsx                          | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/Conversations/Online/ConversationBind.jsx b/src/views/Conversations/Online/ConversationBind.jsx
index 89b029d..74a881b 100644
--- a/src/views/Conversations/Online/ConversationBind.jsx
+++ b/src/views/Conversations/Online/ConversationBind.jsx
@@ -17,7 +17,7 @@ const fetchBindOrder = async (params) => {
   // return errcode !== 0 ? {} : result;
 };
 
-export const ConversationBindFormModal = ({ mobile, currentConversationID, onBoundSuccess }) => {
+export const ConversationBindFormModal = ({ mobile, currentConversationID, userId, onBoundSuccess }) => {
   const [open, setOpen] = useState(false);
 
   const [loading, setLoading] = useState(false); // bind loading
@@ -40,7 +40,7 @@ export const ConversationBindFormModal = ({ mobile, currentConversationID, onBou
       });
       return false;
     }
-    values.opisn = 404;
+    values.opisn = userId;
     setLoading(false);
     setSearchLoading(true);
     setSearchResult([]);
diff --git a/src/views/Conversations/Online/order/CustomerProfile.jsx b/src/views/Conversations/Online/order/CustomerProfile.jsx
index 05411e1..e19793c 100644
--- a/src/views/Conversations/Online/order/CustomerProfile.jsx
+++ b/src/views/Conversations/Online/order/CustomerProfile.jsx
@@ -222,7 +222,7 @@ const CustomerProfile = () => {
 	} else {
 		return (
 			<Empty description={<span>暂无相关订单</span>}>
-				<ConversationBind currentConversationID={currentConversationID} onBoundSuccess={coli_sn => updateCurrentConversation({ coli_sn })} />
+				<ConversationBind currentConversationID={currentConversationID} userId={loginUser.userId} onBoundSuccess={coli_sn => updateCurrentConversation({ coli_sn })} />
 			</Empty>
 		);
 	}
diff --git a/src/views/dingding/Callback.jsx b/src/views/dingding/Callback.jsx
index 4d32edb..3475fb6 100644
--- a/src/views/dingding/Callback.jsx
+++ b/src/views/dingding/Callback.jsx
@@ -10,11 +10,11 @@ import { useNavigate } from 'react-router-dom'
 function Callback() {
 
   const navigate = useNavigate()
-  
+
   const login = useAuthStore((state) => state.login)
   const loginStatus = useAuthStore((state) => state.loginStatus)
   const urlSearch = new URLSearchParams(location.search)
-  
+
   const authCode = urlSearch.get('authCode')
   const state = urlSearch.get('state')
   const error = urlSearch.get('error')
@@ -48,9 +48,9 @@ function Callback() {
       navigate(originUrl)
     } else {
       if (isMobileApp) {
-        navigate('/m/conversation')
+        navigate('/m/conversation', { replace: true })
       } else {
-        navigate('/')
+        navigate('/', { replace: true })
       }
     }
   } else if (loginStatus === 403) {