From 35a0ab2182b812e57af749e438fc505bafd29133 Mon Sep 17 00:00:00 2001
From: 杨磊 <505174330@qq.com>
Date: 星期二, 22 四月 2025 17:58:58 +0800
Subject: [PATCH] Merge branch 'master' of http://182.92.203.7:2001/r/wyyDatabase
---
src/views/honors/index.vue | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/src/views/honors/index.vue b/src/views/honors/index.vue
index 26111e0..a88cf3d 100644
--- a/src/views/honors/index.vue
+++ b/src/views/honors/index.vue
@@ -11,26 +11,26 @@
<!-- 宸﹁竟鏍囬 -->
<div class="honors-main-title">鑽�<br />瑾�<br />濂�<br />椤�</div>
<!-- 鍙宠竟鍐呭 -->
- <div class="honors-text">
- <ul v-loading="loading">
- <li v-for="(item, index) in honorList" :key="index">
- <img class="main-img" :src="item.icon ? item.icon : defaultImg" alt="" />
- <div>
- <p class="main-time">{{ item.year }}</p>
- <p class="main-text" :title="item.txt">{{ item.honor }}</p>
- </div>
- </li>
- </ul>
- <div>
- <!-- 鍒嗛〉 -->
- <div class="pagination">
- <el-pagination @current-change="handleCurrentChange" class="msg-pagination-container"
- :background="isBackground" layout="prev, pager, next" :total="total">
- </el-pagination>
- </div>
- <!-- 鈥滃北鈥濆浘鐗� -->
- <img class="honor-Bg" src="../../assets/images/honors/honor-Bg.png" alt="" />
+ <div class="honors-text" v-loading="loading">
+ <div style="min-height: 646px;">
+ <ul>
+ <li v-for="(item, index) in honorList" :key="index">
+ <img class="main-img" :src="item.icon ? item.icon : defaultImg" alt="" />
+ <div>
+ <p class="main-time">{{ item.year }}</p>
+ <p class="main-text" :title="item.txt">{{ item.honor }}</p>
+ </div>
+ </li>
+ </ul>
</div>
+ <!-- 鍒嗛〉 -->
+ <div class="pagination">
+ <el-pagination @current-change="handleCurrentChange" class="msg-pagination-container"
+ :background="isBackground" layout="prev, pager, next" :total="total">
+ </el-pagination>
+ </div>
+ <!-- 鈥滃北鈥濆浘鐗� -->
+ <img class="honor-Bg" src="../../assets/images/honors/honor-Bg.png" alt="" />
</div>
</div>
</div>
@@ -147,7 +147,6 @@
.honors-main {
width: 77.3%;
- height: 100%;
margin: 0 auto;
}
@@ -175,6 +174,7 @@
padding: 0 0 0 5.8%;
display: flex;
flex-direction: column;
+ min-height: 646px;
ul {
flex: 1;
@@ -220,12 +220,15 @@
width: 70.5%;
height: auto;
margin-left: -33%;
+ margin-bottom: -1%;
+
}
.pagination {
// position: absolute;
// bottom: 0;
// right: 0;
+ height: 10%;
padding-right: 47px;
padding-top: 30px;
text-align: end;
--
Gitblit v1.9.1