Merge branch 'master' of http://101.37.147.115:3000/mz666/apply-assistant-v3

root/NEUIKit/pages/Chat/message/message-input.vue

@@ -63,7 +63,7 @@
 							</div>
 						</div>
 
-						<!--键盘高度{{keyHeight}} 输入框距离底部距离{{writeStyle}}屏幕高度{{screenHeight}}顶部聊天区域高度{{msgKeyHeight}}-->
+						<!-- {{ssff}}键盘高度{{keyHeight}} 输入框距离底部距离{{writeStyle}}屏幕高度{{screenHeight}}顶部聊天区域高度{{msgKeyHeight}} -->
 						<input v-show="!showEmojiInput" :focus="isFocus" class="msg-input-input g_flex_1" :maxlength="-1" :placeholder="isTeamMute ? t('teamMutePlaceholder') : t('chatInputPlaceHolder')" v-model="inputText" type="text" :disabled="isTeamMute" :confirm-hold="true" cursor-spacing="20" :adjust-position="pushUp" confirm-type="send" @keyboardheightchange="keyboardheightchange" @confirm="handleSendTextMsg" @blur="handleInputBlur" @input="handleInput" id="msg-input" />
 					</div>
 
@@ -361,59 +361,73 @@ const pushUp = ref(false);
 
 const keyHeight = ref(350);
 const msgKeyHeight = ref("100%");
+const ssff = ref(uni.getWindowInfo().safeArea.top);
 
+console.log('安全域高度安全域高度安全域高度安全域高度安全域高度安全域高度',ssff);
+
+// 在message-input.vue的keyboardheightchange事件中修改
 // 在message-input.vue的keyboardheightchange事件中修改
-// 在message-input.vue的keyboardheightchange事件中修改
+	const keyboardheightchange = (e) => {
-	const keyboardheightchange = (e) => {
+	  keyHeight.value = e.detail.height;
-	  keyHeight.value = e.detail.height;
+	  uni.$emit(events.KeyboardEvent, e.detail.height);
-	  uni.$emit(events.KeyboardEvent, e.detail.height);
+	  uni.$emit('KeyboardHeight', e.detail.height);
-	  uni.$emit('KeyboardHeight', e.detail.height);
+	
-	
+	  if (e.detail.height === 0) {
-	  if (e.detail.height === 0) {
+	    writeStyle.value = "bottom: 0";
-	    writeStyle.value = "bottom: 0";
+	    uni.$emit('msgKeyHeight', '100%'); // 键盘收起时恢复全屏高度
-	    uni.$emit('msgKeyHeight', '100%'); // 键盘收起时恢复全屏高度
+	  } else {
-	  } else {
+	    // 隐藏其他面板
-	    // 隐藏其他面板
+	    emojiVisible.value = false;
-	    emojiVisible.value = false;
+	    extVisible.value = false;
-	    extVisible.value = false;
+	    audioPanelVisible.value = false;
-	    audioPanelVisible.value = false;
+	    sendMoreVisible.value = false;
-	    sendMoreVisible.value = false;
+	
-	
+	   const systemInfo = uni.getSystemInfoSync();
-	    // 统一计算安全区域（适配APP和小程序）
+ //      let safeBottom = 0;
-	    const systemInfo = uni.getSystemInfoSync();
+	
-	    const safeBottom = systemInfo.safeAreaInsets?.bottom || 0;
+ //      // #ifdef MP-WEIXIN
-	    // 计算会话区域可用高度 = 屏幕高度 - 键盘高度 - 安全区域底部
+ //      if (systemInfo.safeAreaInsets && systemInfo.safeAreaInsets.bottom) {
-	
+ //        safeBottom = systemInfo.safeAreaInsets.bottom;
-	    // 输入框定位适配
+ //      }
-	   //  #ifdef MP-WEIXIN
+ //      // #endif
-	   if (systemInfo.platform === 'ios') {
+
-		const availableHeight = systemInfo.windowHeight - e.detail.height - safeBottom - 64;
+ //      // #ifdef APP-PLUS
-		uni.$emit('msgKeyHeight', availableHeight); // 传递实际可用高度
+ //      if (systemInfo.safeAreaInsets && systemInfo.safeAreaInsets.bottom) {
-	   }else{
+ //        safeBottom = systemInfo.safeAreaInsets.bottom;
-		const availableHeight = systemInfo.windowHeight - e.detail.height - safeBottom - 94;
+ //      }
-		uni.$emit('msgKeyHeight', availableHeight); // 传递实际可用高度
+ //      // #endif
-	   }
+  
-	   
+	//     // 输入框定位适配
-	   	
+	//    //  #ifdef MP-WEIXIN
-	    writeStyle.value = `bottom: calc(${e.detail.height}px - env(safe-area-inset-bottom))`;
+	//    if (systemInfo.platform === 'ios') {
-	   // #endif
+	// 	const availableHeight = systemInfo.windowHeight - e.detail.height - ssff.value;
-	  // #ifdef APP-PLUS
+	// 	uni.$emit('msgKeyHeight', availableHeight); // 传递实际可用高度
-    // 区分安卓和苹果平台
+	//    }else{
-    let availableHeight, bottomValue;
+	// 	const availableHeight = systemInfo.windowHeight - e.detail.height - ssff.value;
-    if (systemInfo.platform === 'ios') {
+	// 	uni.$emit('msgKeyHeight', availableHeight); // 传递实际可用高度
-      // 苹果设备
+	//    }
-      availableHeight = systemInfo.windowHeight - e.detail.height - safeBottom;
+	   
-      bottomValue = e.detail.height - safeBottom - 34;
+	   	const availableHeight = systemInfo.windowHeight - e.detail.height - ssff.value;
-    } else {
+	   	uni.$emit('msgKeyHeight', availableHeight); // 传递实际可用高度
-      // 安卓设备
+	    writeStyle.value = `bottom: calc(${e.detail.height}px - env(safe-area-inset-bottom))`;
-      availableHeight = systemInfo.windowHeight - e.detail.height - safeBottom - 34;
+	   // #endif
-      bottomValue = e.detail.height - safeBottom;
+	  // #ifdef APP-PLUS
-    }
+    // 区分安卓和苹果平台
-    
+    let availableHeight, bottomValue;
-    uni.$emit('msgKeyHeight', availableHeight); // 传递实际可用高度
+    if (systemInfo.platform === 'ios') {
-    writeStyle.value = `bottom: ${bottomValue}px`;
+      // 苹果设备
-    // #endif
+      availableHeight = systemInfo.windowHeight - e.detail.height - safeBottom;
-	  }
+      bottomValue = e.detail.height - safeBottom - 34;
+    } else {
+      // 安卓设备
+      availableHeight = systemInfo.windowHeight - e.detail.height - safeBottom - 34;
+      bottomValue = e.detail.height - safeBottom;
+    }
+    
+    uni.$emit('msgKeyHeight', availableHeight); // 传递实际可用高度
+    writeStyle.value = `bottom: ${bottomValue}px`;
+    // #endif
+	  }
 	};
 
 const handleInputBlur = () => {

root/NEUIKit/pages/Chat/message/message-list.vue

@@ -151,7 +151,7 @@
 		  screenHeight1.value = res;
 		  // 无论是否为小程序，都直接应用高度（移除100%的特殊处理）
 		  if (typeof res === 'number') {
-		    msgKeyHeight.value = `${res * 2}rpx`;
+		    msgKeyHeight.value = `${res - 34}px`;
 		  } else {
 		    msgKeyHeight.value = res; // 处理'100%'的情况
 		  }