3.17

pages_chat/patientGroup/patientGroup.vue

@@ -171,13 +171,16 @@ const selectedPatientCount = computed(() => {
 
 // 合计数量：只计算去重后的患者数量
 const totalSelectedCount = computed(() => selectedPatientCount.value);
-
-onLoad(() => {
+const from = ref('');
+onLoad((options) => {
 	uni.showLoading({
 		title: '加载中...',
 		mask: true
 	});
 	fetchGroupList();
+	if(options.from){
+		from.value = options.from;
+	}
 });
 
 const fetchGroupList = async () => {
@@ -311,7 +314,11 @@ const confirmGroup = () => {
 	}
 
     try {
-        uni.navigateTo({
+		if(from.value){
+			uni.$emit('selectedChatPatientsSingle', { patients: dedupPatients });
+			uni.navigateBack();
+		}else{
+			uni.navigateTo({
             url: '/pages_chat/groupSend/groupSend',
             success: (res) => {
                 try {
@@ -322,6 +329,8 @@ const confirmGroup = () => {
                 }
             }
         });
+		}
+        
     } catch (e) {
         console.error('跳转失败', e);
         uni.showToast({ title: '跳转失败，请重试', icon: 'none' });