Merge branch 'master' of http://182.92.203.7:2001/r/wyyDatabase

杨磊

5 天以前 35a0ab2182b812e57af749e438fc505bafd29133

 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;