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

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

Browse Source
cyl/master-0822
wangxia 3 months ago
parent aa051a0abe 98f8c41ca1
commit b5d12387c7
7 changed files with 101 additions and 59 deletions
Show Stats Download Patch File Download Diff File

9
pages/NEUIKit/pages/Conversation/conversation-list/conversation-item.vue
Unescape Escape View File

@ -147,11 +147,15 @@ const lastMsgContent = computed(() => {
if (sendingState === V2NIMConst.V2NIMMessageSendingState.V2NIM_MESSAGE_SENDING_STATE_FAILED) { if (sendingState === V2NIMConst.V2NIMMessageSendingState.V2NIM_MESSAGE_SENDING_STATE_FAILED) {
return t("conversationSendFailText"); return t("conversationSendFailText");
} }
console.log("lastMsg", lastMsg); console.log("lastMsglastMsglastMsg", lastMsg);
let _str = "[多媒体]"; let _str = "[多媒体]";
if (!lastMsg.text && lastMsg.attachment && lastMsg.attachment.raw) { if (!lastMsg.text && lastMsg.attachment && lastMsg.attachment.raw) {
_str = "[职位] " + JSON.parse(lastMsg.attachment.raw).title; if(!lastMsg.text && lastMsg.attachment && lastMsg.attachment.raw && lastMsg.attachment.ext == '.mp4' && lastMsg.attachment.url){
_str = "[视频]";
}else{
_str = "[职位] " + JSON.parse(lastMsg.attachment.raw).title;
}
} }
if (!lastMsg.text && lastMsg.attachment && lastMsg.attachment.ext == ".mp3") { if (!lastMsg.text && lastMsg.attachment && lastMsg.attachment.ext == ".mp3") {
_str = "[语音]"; _str = "[语音]";
@ -160,7 +164,6 @@ const lastMsgContent = computed(() => {
_str = "[图片]"; _str = "[图片]";
} }
console.log("lastMsg.text", lastMsg.text, " -- ", _str);
return getMsgContentTipByType({ return getMsgContentTipByType({
messageType: lastMsg.messageType, messageType: lastMsg.messageType,
text: lastMsg.text ? lastMsg.text : _str, text: lastMsg.text ? lastMsg.text : _str,

19
pages/NEUIKit/pages/Conversation/conversation-list/index.vue
Unescape Escape View File

@ -5,7 +5,15 @@
<div class="conversation-list-wrapper " v-if="conversationList && conversationList.length > 0"> <div class="conversation-list-wrapper " v-if="conversationList && conversationList.length > 0">
<!-- 此处的key如果用session.id，会在ios上渲染存在问题，会出现会话列表显示undefined --> <!-- 此处的key如果用session.id，会在ios上渲染存在问题，会出现会话列表显示undefined -->
<div v-for="(conversation, index) in conversationList" class="" style="min-height:72px" :key="conversation.renderKey"> <div v-for="(conversation, index) in conversationList" class="" style="min-height:72px" :key="conversation.renderKey">
<ConversationItem :key="conversation.renderKey" :loading="loading" :showMoreActions="currentMoveSessionId === conversation.conversationId" :conversation="conversation" @delete="handleSessionItemDeleteClick" :heihei="'mmp' + index" @stickyToTop="handleSessionItemStickTopChange" @click="handleSessionItemClick" @leftSlide="handleSessionItemLeftSlide" /> <ConversationItem :key="conversation.renderKey" :loading="loading"
:showMoreActions="currentMoveSessionId === conversation.conversationId"
:conversation="conversation"
@delete="handleSessionItemDeleteClick"
:heihei="'mmp' + index"
@stickyToTop="handleSessionItemStickTopChange"
@click="handleSessionItemClick"
@leftSlide="handleSessionItemLeftSlide"
/>
</div> </div>
</div> </div>
<!-- <div style="height: 48px; background-color: #ededed" v-if="conversationList && conversationList.length > 0"></div> --> <!-- <div style="height: 48px; background-color: #ededed" v-if="conversationList && conversationList.length > 0"></div> -->
@ -63,8 +71,15 @@ const handleSessionItemClick = async (conversation: V2NIMConversation) => {
flag = true; flag = true;
await uni.$UIKitStore.uiStore.selectConversation(conversation.conversationId); await uni.$UIKitStore.uiStore.selectConversation(conversation.conversationId);
const itemUserInfo = await uni.$UIKitStore.userStore.getUserActive(conversation.conversationId.split('|')[2])
let _title = '';
if(itemUserInfo.serverExtension){
_title = itemUserInfo.name + '@' + JSON.parse(itemUserInfo.serverExtension).fullName;
}else{
_title = itemUserInfo.name;
}
customNavigateTo({ customNavigateTo({
url: "/pages/Chat/index", url: "/pages/Chat/index?ctitle=" + _title,
}); });
} catch { } catch {
uni.showToast({ uni.showToast({

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

@ -375,9 +375,6 @@ const setNavTitle = () => {
const subTitle = `(${team?.memberCount || 0})`; const subTitle = `(${team?.memberCount || 0})`;
title.value = (team?.name || "") + subTitle; title.value = (team?.name || "") + subTitle;
} }
uni.setNavigationBarTitle({
title: title.value,
});
}; };
onShow(function () { onShow(function () {
@ -397,10 +394,14 @@ const scrollToBottom = () => {
}, 300); }, 300);
}; };
onLoad(() => { onLoad((options) => {
uni.$on(events.HANDLE_MOVE_THROUGH, (flag) => { uni.$on(events.HANDLE_MOVE_THROUGH, (flag) => {
moveThrough.value = flag; moveThrough.value = flag;
}); });
console.log("options聊天", options);
uni.setNavigationBarTitle({
title: options.ctitle,
});
}); });
const msgHeight = ref(0); const msgHeight = ref(0);
onMounted(() => { onMounted(() => {
@ -420,6 +421,8 @@ onMounted(() => {
uni.$UIKitNIM.V2NIMTeamService.on("onTeamLeft", handleRemoveTeamMembers); uni.$UIKitNIM.V2NIMTeamService.on("onTeamLeft", handleRemoveTeamMembers);
uni.$on(events.GET_HISTORY_MSG, loadMoreMsgs); uni.$on(events.GET_HISTORY_MSG, loadMoreMsgs);
}); });
onUnmounted(() => { onUnmounted(() => {

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

@ -63,7 +63,7 @@
</div> </div>
</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" /> <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> </div>
@ -361,53 +361,74 @@ const pushUp = ref(false);
const keyHeight = ref(350); const keyHeight = ref(350);
const msgKeyHeight = ref("100%"); const msgKeyHeight = ref("100%");
const ssff = ref(uni.getWindowInfo().safeArea.top);
// 在message-input.vue的keyboardheightchange事件中修改 console.log('安全域高度安全域高度安全域高度安全域高度安全域高度安全域高度',ssff);
const keyboardheightchange = (e) => {
keyHeight.value = e.detail.height;
uni.$emit(events.KeyboardEvent, e.detail.height);
uni.$emit("KeyboardHeight", e.detail.height);
if (e.detail.height === 0) {
writeStyle.value = "bottom: 0";
uni.$emit("msgKeyHeight", "100%"); // 键盘收起时恢复全屏高度
} else {
// 隐藏其他面板
emojiVisible.value = false;
extVisible.value = false;
audioPanelVisible.value = false;
sendMoreVisible.value = false;
// 统一计算安全区域（适配APP和小程序）
const systemInfo = uni.getSystemInfoSync();
const safeBottom = systemInfo.safeAreaInsets?.bottom || 0;
// 计算会话区域可用高度 = 屏幕高度 - 键盘高度 - 安全区域底部
// 输入框定位适配 // 在message-input.vue的keyboardheightchange事件中修改
// #ifdef MP-WEIXIN // 在message-input.vue的keyboardheightchange事件中修改
const availableHeight = systemInfo.windowHeight - e.detail.height - safeBottom - 120; const keyboardheightchange = (e) => {
uni.$emit("msgKeyHeight", availableHeight); // 传递实际可用高度 keyHeight.value = e.detail.height;
uni.$emit(events.KeyboardEvent, e.detail.height);
writeStyle.value = `bottom: calc(${e.detail.height}px + env(safe-area-inset-bottom))`; uni.$emit('KeyboardHeight', e.detail.height);
// #endif
// #ifdef APP-PLUS if (e.detail.height === 0) {
// 区分安卓和苹果平台 writeStyle.value = "bottom: 0";
let availableHeight, bottomValue; uni.$emit('msgKeyHeight', '100%'); // 键盘收起时恢复全屏高度
if (systemInfo.platform === "ios") { } else {
// 苹果设备 // 隐藏其他面板
availableHeight = systemInfo.windowHeight - e.detail.height - safeBottom; emojiVisible.value = false;
bottomValue = e.detail.height - safeBottom - 34; extVisible.value = false;
} else { audioPanelVisible.value = false;
// 安卓设备 sendMoreVisible.value = false;
availableHeight = systemInfo.windowHeight - e.detail.height - safeBottom - 34;
bottomValue = e.detail.height - safeBottom; const systemInfo = uni.getSystemInfoSync();
} // let safeBottom = 0;
uni.$emit("msgKeyHeight", availableHeight); // 传递实际可用高度 // // #ifdef MP-WEIXIN
writeStyle.value = `bottom: ${bottomValue}px`; // if (systemInfo.safeAreaInsets && systemInfo.safeAreaInsets.bottom) {
// #endif // safeBottom = systemInfo.safeAreaInsets.bottom;
} // }
}; // // #endif
// // #ifdef APP-PLUS
// if (systemInfo.safeAreaInsets && systemInfo.safeAreaInsets.bottom) {
// safeBottom = systemInfo.safeAreaInsets.bottom;
// }
// // #endif
// // 输入框定位适配
// // #ifdef MP-WEIXIN
// if (systemInfo.platform === 'ios') {
// const availableHeight = systemInfo.windowHeight - e.detail.height - ssff.value;
// uni.$emit('msgKeyHeight', availableHeight); // 传递实际可用高度
// }else{
// const availableHeight = systemInfo.windowHeight - e.detail.height - ssff.value;
// uni.$emit('msgKeyHeight', availableHeight); // 传递实际可用高度
// }
const availableHeight = systemInfo.windowHeight - e.detail.height - ssff.value;
uni.$emit('msgKeyHeight', availableHeight); // 传递实际可用高度
writeStyle.value = `bottom: calc(${e.detail.height}px - env(safe-area-inset-bottom))`;
// #endif
// #ifdef APP-PLUS
// 区分安卓和苹果平台
let availableHeight, bottomValue;
if (systemInfo.platform === 'ios') {
// 苹果设备
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 = () => { const handleInputBlur = () => {
isFocus.value = false; isFocus.value = false;

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

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

2
root/NEUIKit/pages/user-card/my-detail/index.vue
Unescape Escape View File

@ -1,5 +1,5 @@
<template> <template>
<div class="wrapper g_bg_f_5"> <div class="wrapper g_bg_f_5" style="background-color: #ededed;">
<!-- <NavBar :title="t('PersonalPageText')" /> --> <!-- <NavBar :title="t('PersonalPageText')" /> -->
<div style="height: 10px;"></div> <div style="height: 10px;"></div>
<div class="userInfo-item-wrapper"> <div class="userInfo-item-wrapper">

4
utils/common.js
Unescape Escape View File

@ -10,8 +10,8 @@ let data = {
fadanBaseImg: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/", fadanBaseImg: "https://matripe-cms.oss-cn-beijing.aliyuncs.com/dailibaoming/",
loginText: '请登录', loginText: '请登录',
coziID: '7537572244600471579', coziID: '7537572244600471579',
// baseUrl:"https://daotian.matripe.com.cn",// 网络请求的基础路径 baseUrl:"https://daotian.matripe.com.cn",// 网络请求的基础路径
baseUrl: "http://192.168.3.83:8001", // 网络请求的基础路径 // baseUrl: "http://192.168.3.83:8001", // 网络请求的基础路径
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
version: uni.getAccountInfoSync().miniProgram.version || "1.0.16", version: uni.getAccountInfoSync().miniProgram.version || "1.0.16",
// #endif // #endif

Write Preview
Loading…
Cancel
Save