From 56d4a84f5325701c00949c9e970dc261e61868d3 Mon Sep 17 00:00:00 2001
From: clay <20932067@zju.edu.cn>
Date: Thu, 13 Oct 2022 20:19:38 +0800
Subject: [PATCH] clay commit : header icon

---
 README.md                                     | 22 ++++++++++++-
 src/main.js                                   | 11 +++++++
 src/views/content/components/list.vue         | 31 ++++++++++---------
 .../index/components/academy_and_sciences.vue |  4 +--
 src/views/index/components/announcements.vue  |  4 +--
 src/views/index/components/news_center.vue    |  7 +++--
 .../components/party_building_activities.vue  |  4 +--
 .../components/undergraduate_and_graduate.vue |  4 +--
 8 files changed, 60 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index 0834860..5d4fa90 100644
--- a/README.md
+++ b/README.md
@@ -29,4 +29,24 @@ npm install --registry=https://registry.npm.taobao.org
 ### 启动服务
 ```
 npm run dev
-```
\ No newline at end of file
+```
+
+
+
+
+
+1. title上间距太大,更紧凑一点
+2. 通知公告调整到4个, 第4个永远写死
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main.js b/src/main.js
index 2fe8f66..a3c179b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -9,6 +9,17 @@ import 'element-ui/lib/theme-chalk/display.css';
 import en from 'element-ui/lib/locale/lang/en'
 import cn from 'element-ui/lib/locale/lang/zh-CN'
 
+//要添加的代码
+router.beforeEach((to, from, next) => {
+  // chrome
+  document.body.scrollTop = 0
+  // firefox
+  document.documentElement.scrollTop = 0
+  // safari
+  window.pageYOffset = 0
+  next()
+})
+
 i18n.mergeLocaleMessage('en', en)
 i18n.mergeLocaleMessage('zh', cn)
 
diff --git a/src/views/content/components/list.vue b/src/views/content/components/list.vue
index 352919a..16716b1 100644
--- a/src/views/content/components/list.vue
+++ b/src/views/content/components/list.vue
@@ -39,7 +39,7 @@
                 <div class="tw_context_title" @click="getContext(item)">
                   {{ item.title }}
                 </div>
-                <div v-if="item.description" class="tw_context_text">{{item.description}}</div>
+                <div v-if="item.description" class="tw_context_text">{{ item.description }}</div>
                 <div v-if="!item.description" class="tw_context_text" v-html="item.content"></div>
               </div>
             </el-col>
@@ -55,18 +55,18 @@
 
       <el-row>
         <el-col class="pagination_p">
-          <el-pagination  v-if="!small"
-                          :small="!small"
-                          @size-change="handleSizeChange"
-                          @current-change="handleCurrentChange"
-                          :current-page.sync="listData.pageNum"
-                          :page-sizes="[10,20, 30, 50, 100]"
-                          layout="prev, pager,next,sizes,  jumper"
-                          :total="listData.total">
+          <el-pagination v-if="!small"
+                         :small="!small"
+                         @size-change="handleSizeChange"
+                         @current-change="handleCurrentChange"
+                         :current-page.sync="listData.pageNum"
+                         :page-size="listData.pageSize"
+                         :page-sizes="[5,10,20, 30, 50, 100]"
+                         layout="prev, pager,next,sizes,  jumper"
+                         :total="listData.total">
           </el-pagination>
           <el-pagination v-if="small"
                          :small="small"
-                         @size-change="handleSizeChange"
                          @current-change="handleCurrentChange"
                          :current-page.sync="listData.pageNum"
                          layout="prev ,pager,next"
@@ -90,21 +90,21 @@ export default {
         return {
           data: [],
           pageNum: 1,
-          pageSize: 10,
+          pageSize: 5,
         }
       },
     },
   },
   data() {
     return {
-      listData : this.list,
+      listData: this.list,
       width: document.documentElement.clientWidth,
       small: document.documentElement.clientWidth <= 992,
       query: '',
     }
   },
-  watch:{
-    list(val){
+  watch: {
+    list(val) {
       this.listData = val
     }
   },
@@ -123,7 +123,7 @@ export default {
       } else {
         routeData = this.$router.resolve({path: "/pc/" + this.listData.secondId + router});
       }
-      window.open(routeData.href,"_blank")
+      window.open(routeData.href, "_blank")
     },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
@@ -288,6 +288,7 @@ export default {
     float: none;
   }
 }
+
 .query {
   //margin: 1rem 0;
   z-index: 50;
diff --git a/src/views/index/components/academy_and_sciences.vue b/src/views/index/components/academy_and_sciences.vue
index 5674771..8277380 100644
--- a/src/views/index/components/academy_and_sciences.vue
+++ b/src/views/index/components/academy_and_sciences.vue
@@ -214,8 +214,8 @@ export default {
     text-align: left;
     background: linear-gradient(240deg, rgba(0, 75, 177, 0) 0%, rgba(6, 79, 175, 0.64) 44%, #0A51AE 100%);
     padding-left: 1.9rem;
-    margin-top: 5rem;
-    margin-bottom: 5rem;
+    margin-top: 2rem;
+    margin-bottom: 2rem;
   }
 
   .sciences_content {
diff --git a/src/views/index/components/announcements.vue b/src/views/index/components/announcements.vue
index 0de8e53..11b9d21 100644
--- a/src/views/index/components/announcements.vue
+++ b/src/views/index/components/announcements.vue
@@ -104,8 +104,8 @@ export default {
     width: 100%;
     display: flex;
     justify-content: center;
-    padding-top: 6.3rem;
-    padding-bottom: 5.6rem;
+    padding-top: 2rem;
+    padding-bottom: 2rem;
 
     .line_left {
       line-height: 4.4rem;
diff --git a/src/views/index/components/news_center.vue b/src/views/index/components/news_center.vue
index b48e879..967e11a 100644
--- a/src/views/index/components/news_center.vue
+++ b/src/views/index/components/news_center.vue
@@ -158,7 +158,8 @@ export default {
   background-size: cover;
   background-repeat: no-repeat;
   //width: 100%;
-  height: 61rem;
+  //height: 61rem;
+  padding-bottom: 2rem;
 
   .headline {
     display: flex;
@@ -180,7 +181,7 @@ export default {
       text-align: left;
       background: linear-gradient(240deg, rgba(0, 75, 177, 0) 0%, rgba(6, 79, 175, 0.64) 44%, #0A51AE 100%);
       padding-left: 1.9rem;
-      margin-top: 6.3rem;
+      margin-top: 2rem;
 
       .vertica_line {
         width: .1rem;
@@ -208,7 +209,7 @@ export default {
   .more {
     display: flex;
     height: 3.7rem;
-    margin-top: 9.8rem;
+    margin-top: 4rem;
     cursor: pointer;
 
     .more_text {
diff --git a/src/views/index/components/party_building_activities.vue b/src/views/index/components/party_building_activities.vue
index 708e12d..af05d31 100644
--- a/src/views/index/components/party_building_activities.vue
+++ b/src/views/index/components/party_building_activities.vue
@@ -92,8 +92,8 @@ export default {
     width: 100%;
     display: flex;
     justify-content: center;
-    padding-top: 6.3rem;
-    padding-bottom: 4.4rem;
+    padding-top: 3rem;
+    padding-bottom: 2rem;
 
     .line_left {
       line-height: 4.4rem;
diff --git a/src/views/index/components/undergraduate_and_graduate.vue b/src/views/index/components/undergraduate_and_graduate.vue
index c2cf73b..054460c 100644
--- a/src/views/index/components/undergraduate_and_graduate.vue
+++ b/src/views/index/components/undergraduate_and_graduate.vue
@@ -164,8 +164,8 @@ export default {
   &_bgc {
     background-color: #fff;
     //height: 33.8rem;
-    margin-top: 8.1rem;
-    margin-bottom: 5rem;
+    margin-top: 3rem;
+    margin-bottom: 3rem;
     border-radius: 36px;
   }