xsx 10 месяцев назад
Родитель
Сommit
31ee49aa2f

+ 1 - 5
im-uniapp/components/chat-at-box/chat-at-box.vue

@@ -18,7 +18,7 @@
 				<uni-search-bar v-model="searchText" cancelButton="none" radius="100" placeholder="搜索"></uni-search-bar>
 			</view>
 			<view class="member-items">
-				<virtual-scroller class="scroll-bar" :items="memberItems">
+				<virtual-scroller :items="memberItems">
 					<template v-slot="{ item }">
 						<view class="member-item" :class="{ checked: item.checked }" @click="onSwitchChecked(item)">
 							<head-image :name="item.showNickName" :online="item.online" :url="item.headImage"
@@ -166,10 +166,6 @@ export default {
 				overflow: hidden;
 			}
 		}
-
-		.scroll-bar {
-			height: 800rpx;
-		}
 	}
 }
 </style>

+ 2 - 7
im-uniapp/components/chat-group-readed/chat-group-readed.vue

@@ -7,7 +7,7 @@
 			</view>
 			<view class="content">
 				<view v-if="current === 0">
-					<virtual-scroller class="scroll-bar" :items="readedMembers">
+					<virtual-scroller :items="readedMembers">
 						<template v-slot="{ item }">
 							<view class="member-item">
 								<head-image :name="item.showNickName" :online="item.online" :url="item.headImage"
@@ -18,7 +18,7 @@
 					</virtual-scroller>
 				</view>
 				<view v-if="current === 1">
-					<virtual-scroller class="scroll-bar" :items="unreadMembers">
+					<virtual-scroller :items="unreadMembers">
 						<template v-slot="{ item }">
 							<view class="member-item">
 								<head-image :name="item.showNickName" :online="item.online" :url="item.headImage"
@@ -108,11 +108,6 @@ export default {
 	background-color: white;
 	padding: 10rpx;
 
-	//border-radius: 15rpx;
-	.scroll-bar {
-		height: 800rpx;
-	}
-
 	.member-item {
 		height: 120rpx;
 		display: flex;

+ 1 - 5
im-uniapp/components/group-member-selector/group-member-selector.vue

@@ -18,7 +18,7 @@
 				<uni-search-bar v-model="searchText" cancelButton="none" placeholder="搜索"></uni-search-bar>
 			</view>
 			<view class="member-items">
-				<virtual-scroller class="scroll-bar" :items="showMembers">
+				<virtual-scroller :items="showMembers">
 					<template v-slot="{ item }">
 						<view class="member-item" @click="onSwitchChecked(item)">
 							<head-image :name="item.showNickName" :online="item.online" :url="item.headImage"
@@ -175,10 +175,6 @@ export default {
 				}
 			}
 		}
-
-		.scroll-bar {
-			height: 65vh;
-		}
 	}
 }
 </style>

+ 6 - 1
im-uniapp/components/virtual-scroller/virtual-scroller.vue

@@ -1,5 +1,6 @@
 <template>
-	<scroll-view scroll-y="true" upper-threshold="200" @scrolltolower="onScrollToBottom"  scroll-with-animation="true">
+	<scroll-view scroll-y="true" :style="{height: height}" upper-threshold="200" @scrolltolower="onScrollToBottom"
+		scroll-with-animation="true">
 		<view v-for="(item, idx) in showItems" :key="idx">
 			<slot :item="item">
 			</slot>
@@ -18,6 +19,10 @@ export default {
 		}
 	},
 	props: {
+		height: {
+			type: String,
+			default: '60vh'
+		},
 		items: {
 			type: Array
 		},

+ 11 - 2
im-uniapp/pages/group/group-info.vue

@@ -47,8 +47,8 @@
 			<view v-if="group.notice" class="form-item">
 				<view class="label">群公告</view>
 			</view>
-			<view v-if="group.notice" class="form-item">
-				<uni-notice-bar :text="group.notice" />
+			<view v-if="group.notice" class="notice-text">
+				{{group.notice}}
 			</view>
 			<view v-if="!group.quit" class="group-edit" @click="onEditGroup()">修改群聊资料 > </view>
 		</view>
@@ -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;

+ 1 - 1
im-uniapp/pages/group/group-member.vue

@@ -8,7 +8,7 @@
 			</view>
 		</view>
 		<view class="member-items">
-			<virtual-scroller class="scroll-bar" :items="showMembers">
+			<virtual-scroller height="100%" class="scroll-bar" :items="showMembers">
 				<template v-slot="{ item }">
 					<view class="member-item" @click="onShowUserInfo(item.userId)">
 						<head-image :name="item.showNickName" :online="item.online" :url="item.headImage"></head-image>