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

src/views/teacher/message/components/NotificationMessages.vue

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