Merge branch 'master' of http://git.yoho.cn/fe/yoho-community-web

@@ -3,8 +3,10 @@
     <Layout class="article">
       <LayoutHeader theme="white" slot='header' :title="title" :share="shareData" :opacity="currentAuthor.opacity">
         <template v-if="showHeader">
-          <WidgetAvatar class="widget-avatar" :src="currentAuthor.authorHeadIco" :width="70" :height="70"></WidgetAvatar>
-          <span class="user-name">{{currentAuthor.authorName}}</span>
+          <router-link class="avatar-wrapper" :to="`/grass/author/${currentAuthor.authorType}/${currentAuthor.authorUid}`">
+            <WidgetAvatar class="widget-avatar" :src="currentAuthor.authorHeadIco" :width="70" :height="70"></WidgetAvatar>
+            <span class="user-name">{{currentAuthor.authorName}}</span>
+          </router-link>
         </template>
         <template v-if="showHeader" v-slot:opts>
           <WidgetFollow class="widget-follow" :author-uid="currentAuthor.authorUid" :follow="currentAuthor.hasAttention === 'Y'" @on-follow="follow => onFollow(currentAuthor, follow)"></WidgetFollow>
@@ -68,7 +70,8 @@ export default {
         authorHeadIco: '',
         hasAttention: 'N',
         opacity: 1,
-        isShare: false
+        isShare: false,
+        authorType: 1
       }
     };
   },
@@ -102,10 +105,13 @@ export default {
           this.currentId = item.data.articleId;
           this.$emit('on-scroll-change', {articleId: item.data.articleId});
         }
+
         this.currentAuthor.authorUid = item.data.authorUid;
         this.currentAuthor.authorName = item.data.authorName;
         this.currentAuthor.authorHeadIco = item.data.authorHeadIco;
         this.currentAuthor.hasAttention = item.data.hasAttention;
+        this.currentAuthor.authorType = item.data.authorType;
+
         this.showHeader = true;
         const offsetTop = scrollTop - item.top;
 
@@ -176,6 +182,12 @@ export default {
   background-color: #f0f0f0;
 }
 
+.avatar-wrapper {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
 .widget-avatar {
   width: 52px;
   height: 52px;

@@ -119,6 +119,7 @@ export default {
 }
 
 .zanbar {
+  margin-top: 40px;
   margin-bottom: 40px;
   padding-left: 30px;
   padding-right: 30px;

@@ -16,7 +16,7 @@ export default {
 <style :lang="scss" scoped>
 .item {
   margin-bottom: 20px;
-  margin-left: 20px;
+  margin-right: 20px;
 }
 
 </style>

@@ -63,7 +63,6 @@ export default {
 
     },
     onclick(e) {
-      console.log('huangtao12=>',e);
     },
     slideChangeHandler(currentPageIndex) {
       this.currentPageIndex = currentPageIndex;

@@ -350,12 +350,9 @@ export function pushGoodsInfo(finalDetail, goodsList, favsList) {
       finalDetail[key].relatedReco.goods = [];
 
       forEach(goodsSkn, (item, subKey) => {
-        console.log(goodsObj, item)
         if (goodsObj[item]) {
-          console.log(goodsObj[item])
           finalDetail[key].relatedReco.goods[subKey] = goodsObj[item];
         } else {
-          console.log('delete');
           delete finalDetail[key].relatedReco.goods[subKey];
         }
       });