GoCo/OL-LearnPlatform-Frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge: 解决冲突并合并远程更新

Browse Source
This commit is contained in:
QDKF 2025-09-23 17:25:10 +08:00
commit 0e176e8d3c
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/teacher/message/components/NotificationMessages.vue
View File

@ -85,7 +85,11 @@
<h4 class="chat-user-name"> <h4 class="chat-user-name">
{{ activeContact?.name }} {{ activeContact?.name }}
<span v-if="activeContact?.type === 'group'" class="member-count">({{ activeContact?.memberCount || 0 <span v-if="activeContact?.type === 'group'" class="member-count">({{ activeContact?.memberCount || 0
<<<<<<< HEAD
}}人)</span> }}人)</span>
=======
}}人)</span>
>>>>>>> 75fd712a3291f007aa9678c7772ebb1ba4a9e9ba
</h4> </h4>
</div> </div>
</div> </div>
@ -1818,7 +1822,11 @@ onMounted(() => {
<style scoped> <style scoped>
.chat-container { .chat-container {
display: flex; display: flex;
<<<<<<< HEAD
height: 75vh; height: 75vh;
=======
height: calc(100vh - var(--top-height, 130px) - 64px - 145px);
>>>>>>> 75fd712a3291f007aa9678c7772ebb1ba4a9e9ba
background: #fff; background: #fff;
border-radius: 4px; border-radius: 4px;
overflow: hidden; overflow: hidden;
@ -2187,6 +2195,7 @@ onMounted(() => {
.chat-messages { .chat-messages {
flex: 1; flex: 1;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden;
padding: 24px 0; padding: 24px 0;
height: 0; height: 0;
/* 强制flex子元素使用剩余空间 */ /* 强制flex子元素使用剩余空间 */