Merge remote-tracking branch 'origin/master'

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">