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

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

@@ -570,13 +570,13 @@ const handleEmojiVisible = () => {
 		uni.$emit(events.ON_SCROLL_BOTTOM);
 	}, 80);
 };
-// watch(sendMoreVisible, (val) => {
+watch(sendMoreVisible, (val) => {
-// 	if (val) {
+	if (val) {
-// 		uni.$emit("msgKeyHeight", uni.getSystemInfoSync().windowHeight - 270); // 传递实际可用高度
+		uni.$emit("msgKeyHeight", uni.getSystemInfoSync().windowHeight - 230 - ssff.value); // 传递实际可用高度
-// 	} else {
+	} else {
-// 		uni.$emit("msgKeyHeight", "100%"); // 传递实际可用高度
+		uni.$emit("msgKeyHeight", "100%"); // 传递实际可用高度
-// 	}
+	}
-// });
+});
 // 显示发送更多"+"面板
 const handleSendMoreVisible = () => {
 	if (isTeamMute.value) return;
@@ -587,10 +587,10 @@ const handleSendMoreVisible = () => {
 	
 	setTimeout(()=>{
 		if (sendMoreVisible.value) {
-			uni.$emit(events.KeyboardEvent, 230);
+			// uni.$emit(events.KeyboardEvent, 230);
-			uni.$emit("msgKeyHeight", uni.getSystemInfoSync().windowHeight - 360); // 传递实际可用高度
+			uni.$emit("msgKeyHeight", uni.getSystemInfoSync().windowHeight - 230 - ssff.value); // 传递实际可用高度
 		} else {
-			uni.$emit(events.KeyboardEvent, 0);
+			// uni.$emit(events.KeyboardEvent, 0);
 			uni.$emit("msgKeyHeight", '100%'); // 传递实际可用高度
 		}
 		uni.$emit(events.ON_SCROLL_BOTTOM);