Merge branch 'feature/0330' into 'release/6.8.8'

Feature/0330



See merge request !25

 <template>
 <template>
-  <img v-lazy="currentSrc" :alt="alt" v-if="currentLazy">
-  <img :src="currentSrc" :alt="alt" v-else lazy="" data-src="">
+  <img v-lazy="currentSrc" :alt="alt" v-if="currentLazy" @error="onError">
+  <img :src="currentSrc" :alt="alt" v-else lazy="" data-src="" @error="onError">
 </template>
 </template>
 
 
 <script>
 <script>
@@ -61,6 +61,11 @@ export default {
         .replace('{width}', this.width)
         .replace('{width}', this.width)
         .replace('{height}', this.height);
         .replace('{height}', this.height);
     }
     }
+  },
+  methods: {
+    onError() {
+      this.$emit('error');
+    }
   }
   }
 };
 };
 </script>
 </script>

 <template>
 <template>
-  <ImageFormat :lazy="lazy" class="img-avatar" :src="imageSrc" :width="width" :height="height"></ImageFormat>
+  <ImageFormat :lazy="lazy" class="img-avatar" :src="imageSrc" :width="width" :height="height" @error="errorHandle"></ImageFormat>
 </template>
 </template>
 
 
 <script>
 <script>
@@ -23,9 +23,20 @@ export default {
       default: false
       default: false
     }
     }
   },
   },
+  data() {
+    return {
+      imgSrc: this.src,
+      defaultSrc: '//img11.static.yhbimg.com/yhb-img01/2016/07/05/13/017ec560b82c132ab2fdb22f7cf6f42b83.png?imageView/2/w/{width}/h/{height}'
+    };
+  },
   computed: {
   computed: {
     imageSrc() {
     imageSrc() {
-      return this.src || '//img11.static.yhbimg.com/yhb-img01/2016/07/05/13/017ec560b82c132ab2fdb22f7cf6f42b83.png?imageView/2/w/{width}/h/{height}';
+      return this.imgSrc || this.defaultSrc;
+    }
+  },
+  methods: {
+    errorHandle() {
+      this.imgSrc = this.defaultSrc;
     }
     }
   }
   }
 };
 };

@@ -16,8 +16,8 @@
           </p>
           </p>
         </div>
         </div>
         <div class="option-btn" :class="{'follow': item.isAttention}">
         <div class="option-btn" :class="{'follow': item.isAttention}">
-          <WidgetFollow class="click-wrap" :author-uid="item.authorUid" :author-type="item.authorType" :follow="item.isAttention" @on-follow="follow => onFollow(follow, index)"></WidgetFollow>
-          {{item.isAttention ? '取消关注' : followName}}
+          <WidgetFollow class="click-wrap" :author-uid="item.userId" :author-type="item.userType" :follow="item.isAttention" @on-follow="follow => onFollow(follow, index)"></WidgetFollow>
+          {{item.isAttention ? '已关注' : followName}}
         </div>
         </div>
       </div>
       </div>
     </div>
     </div>
@@ -136,8 +136,13 @@ export default {
   }
   }
 
 
   .name {
   .name {
+    max-width: 370px;
     font-size: 28px;
     font-size: 28px;
     line-height: 1.4;
     line-height: 1.4;
+    display: block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
   }
   }
 
 
   .extra {
   .extra {