Merge remote-tracking branch 'origin/master'

src/layout/components/Header/components/Message.vue

@@ -15,19 +15,17 @@
 		<el-card :body-style="{ padding: '12px' }">
 			<template #header>
 				<div class="flex flex-pack-justify">
-					<div>
-						<span>消息中心</span>
-						<span class="ml-2 cursor-pointer">
-							<el-popconfirm title="确定全部已读吗?" @confirm="handleReadAll" :width="'200'">
-								<template #reference>
-									<LeIcon class="text-rose-700" icon-class="icon-processInfo-broom-light" />
-								</template>
-							</el-popconfirm>
-						</span>
-					</div>
-					<div><el-link type="primary" @click.stop="jumpMessageInfo"> 查看更多 >> </el-link></div>
+					<span>消息中心</span>
+					<span class="ml-2 cursor-pointer">
+						<el-popconfirm title="确定全部已读吗?" @confirm="handleReadAll" :width="'200'">
+							<template #reference>
+								<LeIcon class="text-rose-700" icon-class="icon-processInfo-broom-light" />
+							</template>
+						</el-popconfirm>
+					</span>
 				</div>
 			</template>
+
 			<div class="flex flex-align-pack-center">
 				<el-radio-group v-model="activeTab">
 					<el-radio-button v-for="v of tabsConfig" :key="v.name" :label="v.name">{{ v.label }}({{ v.list.length }})</el-radio-button>
@@ -35,7 +33,8 @@
 			</div>
 
 			<div class="mt-2">
-				<template v-if="tabsConfig[activeTab].list.length">
+				<div class="message-container" style="height: 200px; overflow-y: auto">
+					<template v-if="tabsConfig[activeTab].list.length">
 					<div class="message-list">
 						<div v-for="item of tabsConfig[activeTab].list" :key="item.id" class="message-item" @click="jumpMessageDetail(item)">
 							<div>
@@ -58,10 +57,15 @@
 							</div>
 						</div>
 					</div>
-				</template>
-				<template v-else>
-					<LeNoData />
-				</template>
+					</template>
+					<template v-else>
+						<LeNoData />
+					</template>
+				</div>
+
+				<div v-if="tabsConfig[activeTab].list.length" class="view-more h-[50px] flex items-center justify-center">
+					<el-link type="primary" @click.stop="jumpMessageInfo"> 查看更多 >> </el-link>
+				</div>
 			</div>
 		</el-card>
 	</el-popover>