Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/utils/constant.js

src/components/blog.vue

@@ -3,7 +3,7 @@
     <!-- 组件的内容 -->
     <!-- 网站信息 -->
     <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="currentUser.avatar"></el-avatar>
       <div class="web-name">{{webInfo.webName}}</div>
       <div class="web-info">
         <div class="blog-info-box">
@@ -86,6 +86,9 @@
 import axios from "axios";
 import * as events from "events";
 export default {
+  avatar: {
+    type: String
+  },
   // 组件的逻辑和配置
   data() {
     return {
@@ -94,6 +97,7 @@ export default {
         size: 5,
         recommendStatus: true
       },
+      currentUser: this.$store.state.currentUser,
       recommendArticles: [],
       admires: [],
       showAdmireDialog: false,

src/components/myAside.vue

@@ -127,7 +127,11 @@
                style="display: flex;justify-content: space-between"
                :key="i">
             <div style="display: flex">
-              <el-avatar style="margin-bottom: 10px" :size="36" :src="item.avatar"></el-avatar>
+              <el-avatar
+                style="margin-bottom: 10px"
+                :size="36"
+                :src="!$common.isEmpty($store.state.currentUser)?$store.state.currentUser.avatar:$store.state.webInfo.avatar">
+              </el-avatar>
               <div style="margin-left: 10px;height: 36px;line-height: 36px;overflow: hidden;max-width: 80px">
                 {{ item.username }}
               </div>