merge: 解决合并冲突
This commit is contained in:
parent
0e176e8d3c
commit
2a7da14df5
@ -85,11 +85,7 @@
|
||||
<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>
|
||||
@ -1822,11 +1818,7 @@ 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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user