Merge remote-tracking branch 'origin/master'

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,