mz666
/
apply-assistant-v3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

同步

Browse Source
cyl/master-0822
wangxia 3 months ago
parent 051453f94c
commit 41b5a0c064
4 changed files with 70 additions and 54 deletions
Show Stats Download Patch File Download Diff File

2
components/list/job.vue
Unescape Escape View File

@ -130,7 +130,7 @@
<view class="checkBox" hover-class="none" v-if="from == 'share'" @click.stop="checkJob(item)"> <view class="checkBox" hover-class="none" v-if="from == 'share'" @click.stop="checkJob(item)">
<checkbox class="biggerSize" style="transform: scale(0.8, 0.8)" color="g_c_main" :checked="item.checked" :value="item.checked"></checkbox> <checkbox class="biggerSize" style="transform: scale(0.8, 0.8)" color="g_c_main" :checked="item.checked" :value="item.checked"></checkbox>
</view> </view>
<view class="checkBox" hover-class="none" v-if="from == 'chat'" @click.stop="sendJob(item)"> <view class="checkBox g_c_main g_fs_14" hover-class="none" v-if="from == 'chat'" @click.stop="sendJob(item)">
选择 选择
</view> </view>
</view> </view>

1
root/NEUIKit/pages/Chat/index.vue
Unescape Escape View File

@ -552,6 +552,7 @@ const sendJob = (_item) => {
msg: customMsg, msg: customMsg,
conversationId, conversationId,
sendBefore: () => { sendBefore: () => {
jobListShow.value = false
// scrollBottom(); // scrollBottom();
}, },
}); });

64
root/NEUIKit/pages/Chat/message/message-input.vue
Unescape Escape View File

@ -70,7 +70,7 @@
<div class="msg-input-button" v-if="false"> <div class="msg-input-button" v-if="false">
<Icon @tap="handleEmojiVisible" class="g_p_6" style="padding-right: 5px" :size="28" type="icon-biaoqing" /> <Icon @tap="handleEmojiVisible" class="g_p_6" style="padding-right: 5px" :size="28" type="icon-biaoqing" />
</div> </div>
<div class="msg-input-button"> <div class="msg-input-button" v-if="true">
<Icon @tap="handleSendMoreVisible" class="g_p_6" style="padding-left: 5px; padding-right: 8px" type="send-more" :size="28" /> <Icon @tap="handleSendMoreVisible" class="g_p_6" style="padding-left: 5px; padding-right: 8px" type="send-more" :size="28" />
</div> </div>
</div> </div>
@ -122,12 +122,12 @@
</div> </div>
<div class="icon-text">{{ t("fileText") }}</div> <div class="icon-text">{{ t("fileText") }}</div>
</div> </div>
<div class="send-more-panel-item-wrapper" v-if="corpUserFlag"> <!-- <div class="send-more-panel-item-wrapper" v-if="corpUserFlag">
<div class="send-more-panel-item" @tap="(event) => handleSendCustomMsg('album', event)"> <div class="send-more-panel-item" @tap="(event) => handleSendCustomMsg('album', event)">
<Icon type="icon-touxiang5" :size="30"></Icon> <Icon type="icon-touxiang5" :size="30"></Icon>
</div> </div>
<div class="icon-text">{{ t("customText") }}</div> <div class="icon-text">{{ t("customText") }}</div>
</div> </div> -->
<div class="send-more-panel-item-wrapper" v-if="corpUserFlag"> <div class="send-more-panel-item-wrapper" v-if="corpUserFlag">
<div class="send-more-panel-item" @tap="(event) => handleSendJob()"> <div class="send-more-panel-item" @tap="(event) => handleSendJob()">
<Icon type="icon-touxiang5" :size="30"></Icon> <Icon type="icon-touxiang5" :size="30"></Icon>
@ -193,6 +193,7 @@ const props = withDefaults(
{} {}
); );
const emits = defineEmits(["jobListShow"]); const emits = defineEmits(["jobListShow"]);
const conversationId = props.conversationType === V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_P2P ? uni.$UIKitNIM.V2NIMConversationIdUtil.p2pConversationId(props.to) : uni.$UIKitNIM.V2NIMConversationIdUtil.teamConversationId(props.to); const conversationId = props.conversationType === V2NIMConst.V2NIMConversationType.V2NIM_CONVERSATION_TYPE_P2P ? uni.$UIKitNIM.V2NIMConversationIdUtil.p2pConversationId(props.to) : uni.$UIKitNIM.V2NIMConversationIdUtil.teamConversationId(props.to);
const inputText = ref(""); const inputText = ref("");
@ -349,54 +350,63 @@ const onClickEmojiInput = () => {
const writeStyle = ref(""); const writeStyle = ref("");
const isIOS = ref(false); const isIOS = ref(false);
writeStyle.value = "bottom:0"; writeStyle.value = "bottom:0";
// #ifdef MP-WEIXIN // // #ifdef MP-WEIXIN
// const pushUp = ref(false)
// // #endif
// // #ifdef APP-PLUS
// const pushUp = ref(true)
// // #endif
const pushUp = ref(false); const pushUp = ref(false);
// #endif
// #ifdef APP-PLUS
const pushUp = ref(true);
// #endif
const keyHeight = ref(350); const keyHeight = ref(350);
const msgKeyHeight = ref("100%"); const msgKeyHeight = ref("100%");
// 在message-input.vue的keyboardheightchange事件中修改
const keyboardheightchange = (e) => { const keyboardheightchange = (e) => {
// console.log("键盘高度键盘高度键盘高度键盘高度键盘高度键盘高度键盘高度", e.detail.height);
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";
if (sendMoreVisible.value || emojiVisible.value || extVisible.value || audioPanelVisible.value) { uni.$emit("msgKeyHeight", "100%"); // 键盘收起时恢复全屏高度
uni.$emit(events.KeyboardEvent, 230);
} else {
uni.$emit(events.KeyboardEvent, 0);
}
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;
msgKeyHeight.value = screenHeight.value - keyHeight.value; // 统一计算安全区域（适配APP和小程序）
uni.$emit("msgKeyHeight", msgKeyHeight.value); const systemInfo = uni.getSystemInfoSync();
const safeBottom = systemInfo.safeAreaInsets?.bottom || 0;
// 计算会话区域可用高度 = 屏幕高度 - 键盘高度 - 安全区域底部
// 输入框定位适配
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
const availableHeight = systemInfo.windowHeight - e.detail.height - safeBottom - 134;
uni.$emit("msgKeyHeight", availableHeight); // 传递实际可用高度
writeStyle.value = `bottom: calc(${e.detail.height}px - env(safe-area-inset-bottom))`; writeStyle.value = `bottom: calc(${e.detail.height}px - env(safe-area-inset-bottom))`;
// pushUp.value = false
// #endif // #endif
// #ifdef APP-PLUS // #ifdef APP-PLUS
// const systemInfo = uni.getSystemInfoSync().height; // 区分安卓和苹果平台
// const safeArea = systemInfo.safeArea.height; let availableHeight, bottomValue;
// const bottomSafeAreaHeight = systemInfo.screenHeight - safeArea.bottom; if (systemInfo.platform === "ios") {
// 34安全域高度 // 苹果设备
// writeStyle.value = `bottom: calc(${e.detail.height - 34}px)`; 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 // #endif
} }
// }
}; };
const handleInputBlur = () => { const handleInputBlur = () => {
@ -943,6 +953,8 @@ onUnmounted(() => {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
@import "../../styles/common.scss";
.input-root { .input-root {
width: 100%; width: 100%;
display: flex; display: flex;

33
root/NEUIKit/pages/Chat/message/message-list.vue
Unescape Escape View File

@ -2,8 +2,8 @@
<div class="msg-list-wrapper" @click="handleTapMessageList" :style="{'height':msgKeyHeight}"> <div class="msg-list-wrapper" @click="handleTapMessageList" :style="{'height':msgKeyHeight}">
<scroll-view id="message-scroll-list" scroll-y="true" @scroll="handleScroll" @click.stop="nothing" <scroll-view id="message-scroll-list" scroll-y="true" @scroll="handleScroll" @click.stop="nothing"
:scroll-top="scrollTop" class="message-scroll-list g_flex_column_end" style="overflow-x: hidden;" :style="{'height':msgKeyHeight}"> :scroll-top="scrollTop" class="message-scroll-list g_flex_column_end" style="overflow-x: hidden;height: 100%" :style="{'height':msgKeyHeight}">
<view class="g_clear_scroll" style="overflow-y: auto;overflow-x: hidden;"> <view class="g_clear_scroll" style="overflow-y: auto;overflow-x: hidden;" :style="isWeapp ? '' :paddingBottom">
<!-- :style="paddingBottom" --> <!-- :style="paddingBottom" -->
<!-- <div v-show="!noMore" @click.stop="onLoadMore" class="view-more-text"> <!-- <div v-show="!noMore" @click.stop="onLoadMore" class="view-more-text">
{{ t("viewMoreText") }} {{ t("viewMoreText") }}
@ -139,6 +139,7 @@
const screenHeight1 = ref('') const screenHeight1 = ref('')
const screenHeight2 = ref('') const screenHeight2 = ref('')
const isWeapp = ref(true)
@ -146,18 +147,19 @@
// 键盘高度{{keyHeight}} 输入框距离底部距离{{writeStyle}}屏幕高度{{screenHeight}}顶部聊天区域高度{{msgKeyHeight}} // 键盘高度{{keyHeight}} 输入框距离底部距离{{writeStyle}}屏幕高度{{screenHeight}}顶部聊天区域高度{{msgKeyHeight}}
uni.$on('msgKeyHeight', (res) => { uni.$on('msgKeyHeight', (res) => {
mlwHeight.value = res; mlwHeight.value = res;
screenHeight1.value = res; screenHeight1.value = res;
if (res != '100%') { // 无论是否为小程序，都直接应用高度（移除100%的特殊处理）
msgKeyHeight.value = res + 'px' if (typeof res === 'number') {
msgKeyHeight.value = `${res - 34}px`;
} else { } else {
msgKeyHeight.value = res msgKeyHeight.value = res; // 处理'100%'的情况
}
// 强制刷新滚动位置
setTimeout(() => { setTimeout(() => {
scrollToBottom(); scrollToBottom();
}, 1) }, 50);
} });
})
// // console.log(finalMsgs.value.length +"========================") // // console.log(finalMsgs.value.length +"========================")
@ -189,7 +191,7 @@
// .exec(); // .exec();
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
isWeapp.value = true; // 判断是否是微信小程序
query.select(".msg-list-wrapper") query.select(".msg-list-wrapper")
.boundingClientRect((res) => { .boundingClientRect((res) => {
uni.$emit('screenHeight', res.height); uni.$emit('screenHeight', res.height);
@ -197,20 +199,21 @@
.exec(); .exec();
// #endif // #endif
// #ifdef APP-PLUS // #ifdef APP-PLUS
isWeapp.value = false; // 判断是否是微信小程序
uni.$emit('screenHeight', uni.getSystemInfoSync().windowHeight); uni.$emit('screenHeight', uni.getSystemInfoSync().windowHeight);
// #endif // #endif
// 在message-list.vue的KeyboardHeight监听中修改
uni.$on('KeyboardHeight',(e) =>{ uni.$on('KeyboardHeight',(e) =>{
rell.value = "新键盘高度" + e rell.value = "新键盘高度" + e;
if (e > 0) { if (e > 0) {
paddingBottom.value = `padding-bottom:${e}px` // APP端不需要额外padding，通过高度控制；小程序保留padding
paddingBottom.value = isWeapp.value ? `padding-bottom:${e}px` : '';
} else { } else {
// e == 0 时，直接设为 0
paddingBottom.value = `padding-bottom:0px`; paddingBottom.value = `padding-bottom:0px`;
} }
}) });
// // #ifdef MP-WEIXIN // // #ifdef MP-WEIXIN
// if(uni.getSystemInfoSync().osName == "ios"){ // if(uni.getSystemInfoSync().osName == "ios"){

Write Preview
Loading…
Cancel
Save