Merge remote-tracking branch 'origin/master'

@@ -605,7 +605,6 @@ const yoho = {
   },
 
   share(args, success, fail) {
-    console.log(args)
     if (this.isYohoBuy && window.yohoInterface) {
       window.yohoInterface.triggerEvent(success || nullFun, fail || nullFun, {
         method: 'go.showshareaction',

@@ -22,14 +22,10 @@ export default {
       const hint = this.user ? `回复${this.user}:` : '';
 
       if (this.$yoho.isYohoBuy) {
-        this.$yoho.getInput({
-          hint,
-          success: (content) => {
-            this.comment(content);
-          },
-          fail: (e) => {
-            console.error(e);
-          }
+        this.$yoho.getInput({hint}, (content) => {
+          this.comment(content);
+        }, (e) => {
+          console.error(e);
         });
       } else {
         this.$createDialog({

@@ -96,12 +96,12 @@ export default {
       });
     },
     onShare() {
+      console.log(this.data.imageUrl)
       this.$yoho.share({
         title: '逛资讯',
         imgUrl: this.data.imageUrl,
         link: `http://yoho-community-web.test3.ingress.dev.yohocorp.com/article/${this.data.articleId}`,
         desc: this.data.intro,
-        hideType: ['7', '8', '9']
       });
     },
     onExpand() {

@@ -53,7 +53,7 @@ export default {
         praiseCount: this.data.praiseCount,
         favoriteCount: this.data.favoriteCount,
         articleId: this.data.articleId,
-        imageUrl: first(this.slideData)
+        imageUrl: get(first(this.slideData.blockList), 'contentData', '').replace('{mode}', 2).replace('{width}', 200).replace('{height}', 200)
       };
     },
     commentData() {

@@ -12,9 +12,6 @@
           </div>
         </div>
       </div>
-      <template v-slot:opts>
-        <WidgetShare class="header-share"></WidgetShare>
-      </template>
     </LayoutHeader>
     <cube-sticky :pos="scrollY">
         <cube-scroll
@@ -28,19 +25,19 @@
             <div class="author-section">
               <ul class="author-fans">
                 <li>
-                  <span class="num">{{baseData.attCount}}</span>
+                  <span class="num">{{baseData.attCount || 0}}</span>
                   <p class="name">
                     <span>关注</span>
                   </p>
                 </li>
                 <li>
-                  <span class="num">{{baseData.fansCount}}</span>
+                  <span class="num">{{baseData.fansCount || 0}}</span>
                   <p class="name">
                     <span>粉丝</span>
                   </p>
                 </li>
                 <li>
-                  <span class="num">{{baseData.praiseAndfavorite}}</span>
+                  <span class="num">{{baseData.praiseAndfavorite || 0}}</span>
                   <p class="name">
                     <span>获赞与收藏</span>
                   </p>
@@ -184,7 +181,7 @@
         this.autherBaseInfo(this.autherInfo).then(res => {
           if (res.code === 200) {
             this.baseData = res.data;
-            this.isOwner = res.data.isOwner;
+            this.isOwner = true || +res.data.userType === 1;
             this.isAttention = res.data.isAttention === 'Y';
           }
         });
@@ -298,7 +295,7 @@
     .h-follow {
       position: absolute;
       top: 0;
-      right: -50px;
+      right: -130px;
     }
   }
 

@@ -11,7 +11,9 @@
           <div class="layer-image" :style="{'height': i.coverHeight + 'px'}">
             <ImageFormat v-if="!i._temporary" :src="i[srcKey]" :width="coverImageWidth" :height="i.coverHeight"></ImageFormat>
           </div>
-          <div class="description">{{i.content}}</div>
+          <div class="description">
+            <p>{{i.content}}</p>
+          </div>
         </router-link>
 
         <div class="attribution">
@@ -303,14 +305,17 @@ export default {
     .description {
       line-height: 1.5;
       padding: 10px 20px;
-      word-break: break-all;
-      text-overflow: -o-ellipsis-lastline;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      display: -webkit-box;
-      -webkit-line-clamp: 2;
-      line-clamp: 2;
-      -webkit-box-orient: vertical;
+
+      > p {
+        word-break: break-all;
+        text-overflow: -o-ellipsis-lastline;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-line-clamp: 2;
+        line-clamp: 2;
+        -webkit-box-orient: vertical;
+      }
     }
 
     .attribution {

@@ -2,6 +2,7 @@ module.exports = {
   '/api/grass/getGrassUserBaseInfo': {
     api: 'app.grass.getGrassUserBaseInfo',
     cache: true,
+    auth: true,
     params: {
       authorUid: {type: Number, require: true},
       authorType: {type: Number, require: true}
@@ -9,7 +10,7 @@ module.exports = {
   },
   '/api/grass/getGrassPubAndFavorNum': {
     api: 'app.grass.getGrassPubAndFavorNum',
-    cache: true,
+    auth: true,
     params: {
       authorUid: {type: Number, require: true},
       authorType: {type: Number, require: true}
@@ -17,7 +18,7 @@ module.exports = {
   },
   '/api/grass/userPublishedArticleList': {
     api: 'app.grass.userPublishedArticleList',
-    cache: true,
+    auth: true,
     params: {
       authorUid: {type: Number, require: true},
       authorType: {type: Number, require: true},
@@ -27,7 +28,7 @@ module.exports = {
   },
   '/api/grass/userFavouriteArticleList': {
     api: 'app.grass.userFavouriteArticleList',
-    cache: true,
+    auth: true,
     params: {
       authorUid: {type: Number, require: true},
       authorType: {type: Number, require: true},