更新

TUICallKit-Vue3/pages/order/monad/monad.vue

@@ -457,21 +457,7 @@ onMounted(() => {
 	getDictOptions();
 	loadDiagnosisDetail();
 });
-onShareAppMessage((res) =>{
-    return {
-      title: '点击进入诊室',
-      path: '/pages/order/monad/monad?id='+diagnosisId+'&share_user_id='+share_user_id+'&doctor_id='+doctorId.value,
-      imageUrl: '/static/zs.jpg',
-      desc: '点击进入诊室',
-      success() {
-        uni.showToast({ title: '分享成功', icon: 'success' });
-      },
-      fail(err) {
-        console.log('分享失败：', err);
-        uni.showToast({ title: '分享失败', icon: 'none' });
-      }
-    }
-});
+
 // 获取字典数据
 const getDictOptions = async () => {
 	try {
@@ -556,6 +542,21 @@ const getDictData = async (type) => {
 		return null;
 	}
 };
+onShareAppMessage((res) =>{
+    return {
+      title: '点击进入诊室',
+      path: '/pages/order/monad/monad?id='+diagnosisId+'&sa='+share_user_id+'&did='+doctorId.value,
+      imageUrl: '/static/zs.jpg',
+      desc: '点击进入诊室',
+      success() {
+        uni.showToast({ title: '分享成功', icon: 'success' });
+      },
+      fail(err) {
+        console.log('分享失败：', err);
+        uni.showToast({ title: '分享失败', icon: 'none' });
+      }
+    }
+});
 let diagnosisId=''
 let share_user_id='';
 let doctorId=ref('');
@@ -567,8 +568,8 @@ const loadDiagnosisDetail = async () => {
 	const params = proxy.$parsePageParams(currentPage.options);
 	dingdan_ok.value=false;
 	diagnosisId = params.id;
-	share_user_id = params.share_user;
-	doctorId.value = params.doctor_id;
+	share_user_id = params.share_user|| params.sa;
+	doctorId.value = params.doctor_id||params.did;
 	console.log('进入onMounted:', params, '诊单ID:', diagnosisId, '医生ID:', doctorId);
 	
 	if (!diagnosisId) {
@@ -626,7 +627,7 @@ const closePatientModal = async () => {
 		// const userSig = app.globalData.userSig;
 		// const SDKAppID = app.globalData.SDKAppID;
 		const doctor = 'doctor_' + doctorId.value;
-			confirmDiagnosis(diagnosisId);
+		await confirmDiagnosis(diagnosisId);
 		if(!diagnosisId.includes('patient')){
 			diagnosisId='patient_'+diagnosisId
 		}
@@ -640,11 +641,11 @@ const closePatientModal = async () => {
 	
 		console.log(app.globalData, diagnosisId);
 
-	
+		const url=`/TUIKit/pages/chat/chat?userID=${encodeURIComponent(diagnosisId)}&userSig=${encodeURIComponent(userSig)}&SDKAppID=${SDKAppID}&targetUserID=${doctor}&msg=1`
 		
 		showPatientModal.value = false;
 		uni.redirectTo({
-			url: `/TUIKit/pages/chat/chat?userID=${encodeURIComponent(diagnosisId)}&userSig=${encodeURIComponent(userSig)}&SDKAppID=${SDKAppID}&targetUserID=${doctor}&msg=1`
+			url: url
 		});
 	} catch (err) {
 		console.error(err);