From 2f10c302c5c9a61904af2af74cfff7502e2feab8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0?= <15071126431@163.com>
Date: Thu, 29 Apr 2021 17:46:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=95=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/main.css                |  1 +
 src/components/common/Home.vue         |  5 ++-
 src/components/page/Dashboard.vue      |  4 +--
 src/components/page/PersonalCenter.vue | 48 ++++++++++++++++----------
 4 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/src/assets/css/main.css b/src/assets/css/main.css
index a376d9d..c5d0032 100644
--- a/src/assets/css/main.css
+++ b/src/assets/css/main.css
@@ -9,6 +9,7 @@ body,
 .wrapper {
     width: 100%;
     height: 100%;
+    overflow: auto;
 }
 
 body {
diff --git a/src/components/common/Home.vue b/src/components/common/Home.vue
index c3fde9c..ed73570 100644
--- a/src/components/common/Home.vue
+++ b/src/components/common/Home.vue
@@ -13,6 +13,7 @@
                 <el-backtop target=".content"></el-backtop>
             </div>
         </div>
+        <v-footer ref="footer"></v-footer>
     </div>
 </template>
 
@@ -21,6 +22,7 @@ import vHead from './Header.vue';
 import vSidebar from './Sidebar.vue';
 import vTags from './Tags.vue';
 import bus from './bus';
+import vFooter from './Footer'
 export default {
     data() {
         return {
@@ -31,7 +33,8 @@ export default {
     components: {
         vHead,
         vSidebar,
-        vTags
+        vTags,
+        vFooter
     },
     created() {
         bus.$on('collapse-content', msg => {
diff --git a/src/components/page/Dashboard.vue b/src/components/page/Dashboard.vue
index 96ec9e2..69205e8 100644
--- a/src/components/page/Dashboard.vue
+++ b/src/components/page/Dashboard.vue
@@ -20,7 +20,7 @@
                 <Backstage v-if="!showProject && activeName == 'second'"></Backstage>
                 <Project v-if="showProject"></Project>
                 <Record v-if="activeName=='fourth'"></Record>
-                <v-footer ref="footer"></v-footer>
+                <!-- <v-footer ref="footer"></v-footer> -->
             </div>
         </div>
 
@@ -368,7 +368,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .content-wrap{
-    height: calc(100vh - 119px);
+    min-height: calc(100vh);
     overflow: auto;
 }
 /deep/.el-tabs__item:focus{
diff --git a/src/components/page/PersonalCenter.vue b/src/components/page/PersonalCenter.vue
index 354325a..408a29d 100644
--- a/src/components/page/PersonalCenter.vue
+++ b/src/components/page/PersonalCenter.vue
@@ -2,7 +2,8 @@
     <div class="wrap">
         <!-- 头像部分 -->
         <div class="header">
-            <img :src="this.$store.state.avatar" class="HeadPortrait" />
+            <!-- <img :src="this.$store.state.avatar" class="HeadPortrait" /> -->
+            <el-avatar :size="80" :src="this.$store.state.avatar" class="Headtop"></el-avatar>
             <div style="color:#9278FF;font-size:14px;font-family:MicrosoftYaHei;margin-top:5px;">
                 <el-upload
                     class="upload-demo"
@@ -154,7 +155,7 @@
             </div>
 
             <div class="information" style="margin-top: 20px;">
-                <div class="archives" v-for="(archive,index) in archivesList" :key="index" v-show="index == 0 || showArch || archive.isNew">
+                <div class="archives" v-for="(archive,index) in archivesList" :key="index" v-show="index == 0 || showArch">
                     <div class="line">
                         <div class="item">
                             <span>职业</span>
@@ -258,7 +259,8 @@
             </div>
 
             <div class="fold" v-if="archivesList.length > 1">
-                <img style="width: 21px;height: 17px;" src="../../assets/img/open.png" alt="" @click="foldArch">
+                <!-- <img style="width: 21px;height: 17px;" src="../../assets/img/open.png" alt="" @click="foldArch"> -->
+                <img :class="{ 'arrowTransform': showArch, 'arrowTransformReturn': !showArch}" style="width: 21px;height: 17px;" src="../../assets/img/open.png" alt="" @click="foldArch">
             </div>
         </div>
 
@@ -656,12 +658,12 @@ export default {
                 userId: this.userId,
                 personalFileId: ''
             })
-            if(!isLoadData){
-                this.$nextTick(() => {
-                    document.body.scrollTop = document.querySelector('.content-box').scrollHeight
-                    document.documentElement.scrollTop = document.querySelector('.content-box').scrollHeight
-                })
-            }
+            // if(!isLoadData){
+            //     this.$nextTick(() => {
+            //         document.body.scrollTop = document.querySelector('.content-box').scrollHeight
+            //         document.documentElement.scrollTop = document.querySelector('.content-box').scrollHeight
+            //     })
+            // }
         },
         addArch() {
             let isEmpty = false
@@ -713,10 +715,10 @@ export default {
         },
         foldArch() {
             this.showArch = !this.showArch
-            this.$nextTick(() => {
-                document.body.scrollTop = document.querySelector('.content-box').scrollHeight
-                document.documentElement.scrollTop = document.querySelector('.content-box').scrollHeight
-            })
+            // this.$nextTick(() => {
+            //     document.body.scrollTop = document.querySelector('.content-box').scrollHeight
+            //     document.documentElement.scrollTop = document.querySelector('.content-box').scrollHeight
+            // })
         },
         // 获取学科类别
         getSubject(){
@@ -1025,8 +1027,18 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.arrowTransform{
+    transition: 0.5s;
+    transform-origin: center;
+    transform: rotateZ(180deg);
+}
+.arrowTransformReturn{
+    transition: 0.5s;
+    transform-origin: center;
+    transform: rotateZ(0deg);
+}
 .wrap{
-    height: calc(100vh - 60px);
+    // height: calc(100vh - 60px);
     padding-top: 170px;
     overflow: auto;
     display:flex;
@@ -1066,12 +1078,12 @@ input:focus {
 .openfile {
     cursor: pointer;
 }
-.HeadPortrait {
+.Headtop {
     margin-top: 10px;
-    width: 80px;
-    height: 80px;
+    // width: 80px;
+    // height: 80px;
     // background: url('../../assets/img/img.jpg');
-    border-radius: 50%;
+    // border-radius: 50%;
 
     .head {
         width: 34px;