Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/components/home.vue
#	src/utils/constant.js

src/components/common/treeHole.vue

@@ -6,8 +6,7 @@
           :key="index">
         <div class="tree-hole-content"
              :class="{ leftTreeHole: index % 2 === 0 && !$common.mobile(), rightTreeHole: index % 2 !== 0 || $common.mobile() }">
-          <el-avatar shape="square" class="avatar-img" :size="36"
+          <el-avatar shape="circle" class="avatar-img" :size="36" :src="currentUser.avatar"></el-avatar>
-                     :src="avatar"></el-avatar>
           <div class="tree-hole-box"
                :style="{background: $constant.tree_hole_color[index % $constant.tree_hole_color.length]}">
             <div class="box-tag" v-if="index % 2 === 0 && !$common.mobile()"
@@ -49,7 +48,9 @@
     },
 
     data() {
-      return {}
+      return {
+        currentUser: this.$store.state.currentUser,
+      }
     },
 
     computed: {},

src/components/myAside.vue

@@ -2,7 +2,13 @@
   <div>
 <!--     网站信息 -->
     <div class="card-content1 shadow-box background-opacity">
-      <el-avatar style="margin-top: 20px" class="user-avatar" :size="120" :src="webInfo.avatar"></el-avatar>
+      <!--<el-avatar style="margin-top: 20px" class="user-avatar" :size="120" src="http://s6qc8qkjn.hd-bkt.clouddn.com/userAvatar/Sara11704850554971625.jpg"></el-avatar>-->
+      <!--<el-avatar style="margin-top: 20px" class="user-avatar" :size="120" src="webInfo.avatar"></el-avatar>-->
+      <el-avatar style="margin-top: 20px"
+                 class="user-avatar"
+                 :size="120"
+                 :src="!$common.isEmpty($store.state.currentUser)?$store.state.currentUser.avatar:$store.state.webInfo.avatar">
+      </el-avatar>
       <div class="web-name">{{webInfo.webName}}</div>
       <div class="web-info">
         <div class="blog-info-box">