fix: (#451) 修复动态、帖子、资讯详情第一页的置顶评论重复显示的问题

slimkit · Jul 2, 2018 · 050bb8b · 050bb8b
1 parent b7d06f1
commit 050bb8b
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 21 deletions.
diff --git a/src/page/feed/feedDetail.vue b/src/page/feed/feedDetail.vue
@@ -413,18 +413,20 @@ export default {
       this.fetchComing = true;
       getFeedComments({ feedId: this.feedID, after })
         .then(({ data: { pinneds = [], comments = [] } }) => {
-          !after && (this.pinnedCom = pinneds);
+          if (!after) {
+            this.pinnedCom = pinneds;
+            // 过滤第一页中的置顶评论
+            const pinnedIds = pinneds.map(p => p.id);
+            this.comments = comments.filter(c => pinnedIds.indexOf(c.id) < 0);
+          } else {
+            this.comments = [...this.comments, ...comments];
+          }
 
           if (comments.length) {
-            (this.comments = after
-              ? [...this.comments, ...comments]
-              : comments),
-              (this.maxComId = comments[comments.length - 1].id);
+            this.maxComId = comments[comments.length - 1].id;
           }
 
-          comments.length === limit
-            ? (this.noMoreCom = false)
-            : (this.noMoreCom = true);
+          this.noMoreCom = comments.length !== limit;
           this.$nextTick(() => {
             this.fetchComing = false;
             this.loading = false;

diff --git a/src/page/group/GroupPostDetail.vue b/src/page/group/GroupPostDetail.vue
@@ -191,20 +191,23 @@ export default {
       this.fetchComing = true;
       getPostComments(this.postID, { after })
         .then(({ data: { pinneds = [], comments = [] } }) => {
-          pinneds &&
-            pinneds.length &&
-            (this.pinnedCom = after ? [...this.pinneds, ...pinneds] : pinneds);
+          if (!after) {
+            this.pinnedCom = pinneds;
+            // 过滤第一页中的置顶评论
+            const pinnedIds = pinneds.map(p => p.id);
+            this.comments = comments.filter(c => pinnedIds.indexOf(c.id) < 0);
+          } else {
+            this.comments = [...this.comments, ...comments];
+          }
 
           if (comments.length) {
-            this.comments = after ? [...this.comments, ...comments] : comments;
             this.maxComId = comments[comments.length - 1].id;
           }
-          comments.length === limit
-            ? (this.noMoreCom = false)
-            : (this.noMoreCom = true);
+
+          this.noMoreCom = comments.length !== limit;
           this.$nextTick(() => {
-            this.fetchComing = false;
             this.loading = false;
+            this.fetchComing = false;
           });
         })
         .catch(() => {

diff --git a/src/page/news/newsDetail.vue b/src/page/news/newsDetail.vue
@@ -108,6 +108,7 @@ import md from "@/util/markdown.js";
 import wechatShare from "@/util/wechatShare.js";
 import ArticleCard from "@/page/article/ArticleCard.vue";
 import CommentItem from "@/page/article/ArticleComment.vue";
+import { limit } from "@/api/api.js";
 import {
   deleteNewsComment,
   applyTopNews,
@@ -281,11 +282,20 @@ export default {
 
       getNewsComments(this.newsID, { after })
         .then(({ data: { pinneds = [], comments = [] } }) => {
-          this.pinnedCom = after ? [...this.pinneds, ...pinneds] : pinneds;
-          this.comments = after ? [...this.comments, ...comments] : comments;
-          comments.length
-            ? (this.maxComId = comments[comments.length - 1].id)
-            : (this.noMoreCom = true);
+          if (!after) {
+            this.pinnedCom = pinneds;
+            // 过滤第一页中的置顶评论
+            const pinnedIds = pinneds.map(p => p.id);
+            this.comments = comments.filter(c => pinnedIds.indexOf(c.id) < 0);
+          } else {
+            this.comments = [...this.comments, ...comments];
+          }
+
+          if (comments.length) {
+            this.maxComId = comments[comments.length - 1].id;
+          }
+
+          this.noMoreCom = comments.lenght !== limit;
           this.fetchComing = false;
         })
         .catch(() => {