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

img parise



See merge request !28

@@ -74,6 +74,13 @@ export default {
       });
       });
 
 
       this.posting = false;
       this.posting = false;
+
+      let toastInfo = {
+        txt: '评论成功',
+        type: 'success',
+        time: 1000
+      };
+
       if (result.code === 200) {
       if (result.code === 200) {
         const waitData = this.addType === 0 ? this.fetchArticleUpdate({articleId: this.destId}) : Promise.resolve();
         const waitData = this.addType === 0 ? this.fetchArticleUpdate({articleId: this.destId}) : Promise.resolve();
 
 
@@ -86,12 +93,13 @@ export default {
 
 
         this.reportComment(this.destId);
         this.reportComment(this.destId);
       } else {
       } else {
-        this.$createToast({
+        Object.assign(toastInfo, {
           txt: result.message || '服务器开小差了',
           txt: result.message || '服务器开小差了',
           type: 'warn',
           type: 'warn',
-          time: 1000
-        }).show();
+        });
       }
       }
+
+      this.$createToast(toastInfo).show();
     },
     },
     reportComment(comId) {
     reportComment(comId) {
       this.$store.dispatch('reportYas', {
       this.$store.dispatch('reportYas', {

@@ -242,6 +242,14 @@ export default {
         throw new Error(message);
         throw new Error(message);
       }
       }
 
 
+      if (increHeight) {
+        for (let i = index + 1; i < this.items.length; i++) {
+          if (this.items[i].top) {
+            this.items[i].top += increHeight;
+          }
+        }
+      }
+
       return increHeight;
       return increHeight;
     },
     },
     updateIndex(scrollTop) {
     updateIndex(scrollTop) {

@@ -26,8 +26,8 @@ export default {
   data() {
   data() {
     return {
     return {
       imgSrc: this.src,
       imgSrc: this.src,
-      defaultSrc: '//img11.static.yhbimg.com/yhb-img01/2016/07/05/13/017ec560b82c132ab2fdb22f7cf6f42b83.png?imageView/2/w/{width}/h/{height}'
-    };
+      defaultSrc: '//img12.static.yhbimg.com/article/2019/02/26/16/02456ade977d8dfdbc4ca548b196c1d62b.png?imageView/2/w/{width}/h/{height}'
+    }
   },
   },
   computed: {
   computed: {
     imageSrc() {
     imageSrc() {

@@ -209,7 +209,9 @@ export default {
     },
     },
     onExpand() {
     onExpand() {
       this.animateing = true;
       this.animateing = true;
-      this.$emit('on-expand');
+      this.$nextTick(() => {
+        this.$emit('on-expand');
+      });
     },
     },
     onShowComment() {
     onShowComment() {
       if (this.articleState.commentCount) {
       if (this.articleState.commentCount) {

 <template>
 <template>
   <div class="article-item-slide-wrap">
   <div class="article-item-slide-wrap">
-    <div class="article-item-slide" :style="slideItemStyle" @click="praiseArticle">
+    <div class="article-item-slide" :style="slideItemStyle" @touchend="praiseArticle">
       <ArticleItemSlideImage v-if="data.blockList.length === 1" :lazy="false" :data="data.blockList[0]" :thumb-size="firstBlockSize"></ArticleItemSlideImage>
       <ArticleItemSlideImage v-if="data.blockList.length === 1" :lazy="false" :data="data.blockList[0]" :thumb-size="firstBlockSize"></ArticleItemSlideImage>
       <Slide :key="`slide${data.articleId}`" v-else ref="slide" :data="data.blockList" :refresh-reset-current="false" :initial-index="slideIndex - 1" :threshold="0.2" :auto-play="false" :loop="false" :options="scrollOption" @change="onChange">
       <Slide :key="`slide${data.articleId}`" v-else ref="slide" :data="data.blockList" :refresh-reset-current="false" :initial-index="slideIndex - 1" :threshold="0.2" :auto-play="false" :loop="false" :options="scrollOption" @change="onChange">
         <SlideItem class="slide-item" :style="slideItemStyle" v-for="(item, inx) in data.blockList" :key="inx">
         <SlideItem class="slide-item" :style="slideItemStyle" v-for="(item, inx) in data.blockList" :key="inx">
@@ -32,7 +32,7 @@ import {mapState, createNamespacedHelpers} from 'vuex';
 import lottieJson from '../../../../statics/lottie/detail-heart.json';
 import lottieJson from '../../../../statics/lottie/detail-heart.json';
 const {mapMutations} = createNamespacedHelpers('article');
 const {mapMutations} = createNamespacedHelpers('article');
 
 
-const dblclickDdelay = 500;
+const dblclickDdelay = 200;
 
 
 export default {
 export default {
   name: 'ArticleItemSlide',
   name: 'ArticleItemSlide',

@@ -175,6 +175,10 @@ export default {
       if (scrollTop <= 0) {
       if (scrollTop <= 0) {
         this.showHeader = false;
         this.showHeader = false;
       } else if (item) {
       } else if (item) {
+        if (item.data && item.data.dataType === 2) {
+          return this.showHeader = false;
+        }
+
         if (this.currentId !== item.data.articleId) {
         if (this.currentId !== item.data.articleId) {
           this.currentId = item.data.articleId;
           this.currentId = item.data.articleId;
         }
         }

 <template>
 <template>
   <Layout class="author-fans-page">
   <Layout class="author-fans-page">
-    <LayoutHeader slot='header' theme="white" class="author-page-header">{{isMine ? '我的' : 'TA'}}粉丝</LayoutHeader>
-    <UserList :follow-name="isMine ? '回粉' : '关注'" :on-fetch="onFetch"></UserList>
+    <LayoutHeader slot='header' theme="white" class="author-page-header">{{isMine ? '我' : 'TA'}}的粉丝</LayoutHeader>
+    <UserList ref="userList" :follow-name="isMine ? '回粉' : '关注'" :on-fetch="onFetch"></UserList>
   </Layout>
   </Layout>
 </template>
 </template>
 
 
@@ -31,6 +31,13 @@ export default {
       this._baseParams.authorUid = this.$route.params.id;
       this._baseParams.authorUid = this.$route.params.id;
     }
     }
   },
   },
+  activated() {
+    this.$refs.userList.init();
+  },
+  beforeRouteUpdate(to, from, next) {
+    this.$refs.userList.init();
+    next();
+  },
   methods: {
   methods: {
     ...mapActions(['authorFansList', 'authorMineFansList']),
     ...mapActions(['authorFansList', 'authorMineFansList']),
     onFetch({page, lastedTime}) {
     onFetch({page, lastedTime}) {

 <template>
 <template>
   <Layout class="author-follow-page">
   <Layout class="author-follow-page">
-    <LayoutHeader slot='header' theme="white" class="author-page-header">{{isMine ? '我的' : 'TA'}}关注</LayoutHeader>
-    <UserList :on-fetch="onFetch"></UserList>
+    <LayoutHeader slot='header' theme="white" class="author-page-header">{{isMine ? '我' : 'TA'}}的关注</LayoutHeader>
+    <UserList ref="userList" :on-fetch="onFetch"></UserList>
   </Layout>
   </Layout>
 </template>
 </template>
 
 
@@ -31,6 +31,13 @@ export default {
       this._baseParams.authorUid = this.$route.params.id;
       this._baseParams.authorUid = this.$route.params.id;
     }
     }
   },
   },
+  activated() {
+    this.$refs.userList.init();
+  },
+  beforeRouteUpdate(to, from, next) {
+    this.$refs.userList.init();
+    next();
+  },
   methods: {
   methods: {
     ...mapActions(['authorAttentionList', 'authorMineAttentionList']),
     ...mapActions(['authorAttentionList', 'authorMineAttentionList']),
     onFetch({page, lastedTime}) {
     onFetch({page, lastedTime}) {

@@ -7,7 +7,7 @@
     @scroll-end="fetchList">
     @scroll-end="fetchList">
     <div class="user-list">
     <div class="user-list">
       <div v-for="(item, index) in list" :key="index" class="user-item">
       <div v-for="(item, index) in list" :key="index" class="user-item">
-        <WidgetAvatar class="head-ico" :src="item.headIcon" :width="100" :height="100" @click="toUserPage(item)"></WidgetAvatar>
+        <WidgetAvatar class="head-ico" :src="item.headIcon" :width="100" :height="100" @click.native="toUserPage(item)"></WidgetAvatar>
         <div class="user-info" @click="toUserPage(item)">
         <div class="user-info" @click="toUserPage(item)">
           <p class="name">{{item.nickName}}</p>
           <p class="name">{{item.nickName}}</p>
           <p v-if="item.articleCount || item.fansCount" class="extra">
           <p v-if="item.articleCount || item.fansCount" class="extra">
@@ -53,9 +53,15 @@ export default {
     };
     };
   },
   },
   mounted() {
   mounted() {
-    this.fetchList();
+    this.init();
   },
   },
   methods: {
   methods: {
+    init() {
+      this._page = 1;
+      this.list = [];
+      this.noMore = false;
+      this.fetchList();
+    },
     fetchList() {
     fetchList() {
       let page = this._page || 1;
       let page = this._page || 1;
 
 

@@ -21,22 +21,34 @@ export default [{
   alias: '/author/follow/:type/:id',
   alias: '/author/follow/:type/:id',
   name: 'author.follow',
   name: 'author.follow',
   component: () => import(/* webpackChunkName: "authorFollow" */ './author-follow'),
   component: () => import(/* webpackChunkName: "authorFollow" */ './author-follow'),
+  meta: {
+    keepAlive: true
+  },
 },
 },
 {
 {
   path: '/author/fans/:type/:id',
   path: '/author/fans/:type/:id',
   alias: '/author/fans/:type/:id',
   alias: '/author/fans/:type/:id',
   name: 'author.fans',
   name: 'author.fans',
   component: () => import(/* webpackChunkName: "authorFans" */ './author-fans'),
   component: () => import(/* webpackChunkName: "authorFans" */ './author-fans'),
+  meta: {
+    keepAlive: true
+  },
 },
 },
 {
 {
   path: '/mine/follow',
   path: '/mine/follow',
   alias: '/mine/follow',
   alias: '/mine/follow',
   name: 'mine.follow',
   name: 'mine.follow',
   component: () => import(/* webpackChunkName: "authorFollow" */ './author-follow'),
   component: () => import(/* webpackChunkName: "authorFollow" */ './author-follow'),
+  meta: {
+    keepAlive: true
+  },
 },
 },
 {
 {
   path: '/mine/fans',
   path: '/mine/fans',
   alias: '/mine/fans',
   alias: '/mine/fans',
   name: 'mine.fans',
   name: 'mine.fans',
   component: () => import(/* webpackChunkName: "authorFans" */ './author-fans'),
   component: () => import(/* webpackChunkName: "authorFans" */ './author-fans'),
+  meta: {
+    keepAlive: true
+  },
 }];
 }];