From 31ee49aa2f91e420d57e726b09b2f1596163a77f Mon Sep 17 00:00:00 2001
From: xsx <825657193@qq.com>
Date: Sun, 4 May 2025 18:40:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
im-uniapp/components/chat-at-box/chat-at-box.vue | 6 +-----
.../chat-group-readed/chat-group-readed.vue | 9 ++-------
.../group-member-selector/group-member-selector.vue | 6 +-----
.../virtual-scroller/virtual-scroller.vue | 7 ++++++-
im-uniapp/pages/group/group-info.vue | 13 +++++++++++--
im-uniapp/pages/group/group-member.vue | 2 +-
6 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/im-uniapp/components/chat-at-box/chat-at-box.vue b/im-uniapp/components/chat-at-box/chat-at-box.vue
index f056c91..d4b7c30 100644
--- a/im-uniapp/components/chat-at-box/chat-at-box.vue
+++ b/im-uniapp/components/chat-at-box/chat-at-box.vue
@@ -18,7 +18,7 @@
-
+
\ No newline at end of file
diff --git a/im-uniapp/components/chat-group-readed/chat-group-readed.vue b/im-uniapp/components/chat-group-readed/chat-group-readed.vue
index 13b67ac..9e2d7d6 100644
--- a/im-uniapp/components/chat-group-readed/chat-group-readed.vue
+++ b/im-uniapp/components/chat-group-readed/chat-group-readed.vue
@@ -7,7 +7,7 @@
-
+
-
+
-
+
\ No newline at end of file
diff --git a/im-uniapp/components/virtual-scroller/virtual-scroller.vue b/im-uniapp/components/virtual-scroller/virtual-scroller.vue
index ab99096..48a99e4 100644
--- a/im-uniapp/components/virtual-scroller/virtual-scroller.vue
+++ b/im-uniapp/components/virtual-scroller/virtual-scroller.vue
@@ -1,5 +1,6 @@
-
+
@@ -18,6 +19,10 @@ export default {
}
},
props: {
+ height: {
+ type: String,
+ default: '60vh'
+ },
items: {
type: Array
},
diff --git a/im-uniapp/pages/group/group-info.vue b/im-uniapp/pages/group/group-info.vue
index 6191a92..31d7c1a 100644
--- a/im-uniapp/pages/group/group-info.vue
+++ b/im-uniapp/pages/group/group-info.vue
@@ -47,8 +47,8 @@
群公告
-
-
+
+ {{group.notice}}
修改群聊资料 >
@@ -306,6 +306,15 @@ export default {
}
}
+ .notice-text {
+ padding: 0 40rpx;
+ background: white;
+ text-align: left;
+ font-size: $im-font-size;
+ color: $im-text-color-light;
+ line-height: 50rpx;
+ }
+
.group-edit {
padding: 10rpx 40rpx 30rpx 40rpx;
text-align: center;
diff --git a/im-uniapp/pages/group/group-member.vue b/im-uniapp/pages/group/group-member.vue
index 434f085..8d2cacf 100644
--- a/im-uniapp/pages/group/group-member.vue
+++ b/im-uniapp/pages/group/group-member.vue
@@ -8,7 +8,7 @@
-
+