From 16bd9108af2cb0b30d6ef6685057d4daa955b74b Mon Sep 17 00:00:00 2001
From: mutoe <mutoe@foxmail.com>
Date: Mon, 2 Jul 2018 14:35:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20(#451)=20=E8=87=AA=E5=B7=B1=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E7=9A=84=E5=B8=96=E5=AD=90=E8=AF=84=E8=AE=BA=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B6=E6=96=87=E6=A1=88=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FeedCard/FeedCard.vue      | 194 +++++++++++-----------
 src/components/FeedCard/GroupFeedCard.vue |  41 +++--
 src/components/applyForTop.vue            |  55 +++---
 src/page/feed/feedDetail.vue              |  95 ++++++-----
 src/page/group/GroupPostDetail.vue        |   9 +-
 src/page/news/newsDetail.vue              |  55 +++---
 src/page/question/AnswerDetail.vue        |   6 -
 7 files changed, 242 insertions(+), 213 deletions(-)

diff --git a/src/components/FeedCard/FeedCard.vue b/src/components/FeedCard/FeedCard.vue
index c966d926..76e8a228 100644
--- a/src/components/FeedCard/FeedCard.vue
+++ b/src/components/FeedCard/FeedCard.vue
@@ -1,33 +1,33 @@
 <template>
-  <div 
-    class="m-box-model m-card" 
+  <div
+    class="m-box-model m-card"
     @click="handleView('')">
     <div class="m-box">
       <div
         v-if="timeLine"
         class="m-box-model m-aln-center m-flex-grow0 m-flex-shrink0 m-card-time-line"
         v-html="timeLineText"/>
-      <avatar 
-        v-else 
+      <avatar
+        v-else
         :user="user" />
       <section class="m-box-model m-flex-grow1 m-flex-shrink1 m-card-main">
-        <header 
-          v-if="!timeLine" 
+        <header
+          v-if="!timeLine"
           class="m-box m-aln-center m-justify-bet m-card-usr">
           <h4 class="m-flex-grow1 m-flex-shrink1">{{ user.name }}</h4>
           <div class="m-box m-aln-center">
-            <span 
-              v-if="pinned" 
+            <span
+              v-if="pinned"
               class="m-art-comment-icon-top">置顶</span>
             <span>{{ time | time2tips }}</span>
           </div>
         </header>
-        <article 
-          class="m-card-body" 
+        <article
+          class="m-card-body"
           @click="handleView('')">
           <h2 v-if="title">{{ title }}</h2>
-          <div 
-            v-if="body.length > 0" 
+          <div
+            v-if="body.length > 0"
             class="m-card-con">
             <p
               :class="{needPay}"
@@ -45,29 +45,29 @@
         </article>
       </section>
     </div>
-    <footer 
-      v-if="showFooter" 
-      class="m-box-model m-card-foot m-bt1" 
+    <footer
+      v-if="showFooter"
+      class="m-box-model m-card-foot m-bt1"
       @click.stop>
       <div class="m-box m-aln-center m-card-tools m-lim-width">
-        <a 
-          class="m-box m-aln-center" 
+        <a
+          class="m-box m-aln-center"
           @click.prevent="handleLike">
           <svg class="m-style-svg m-svg-def">
             <use :xlink:href="liked ? '#feed-like' :'#feed-unlike'"/>
           </svg>
           <span>{{ likeCount | formatNum }}</span>
         </a>
-        <a 
-          class="m-box m-aln-center" 
+        <a
+          class="m-box m-aln-center"
           @click.prevent="handleComment">
           <svg class="m-style-svg m-svg-def">
             <use xlink:href="#feed-comment"/>
           </svg>
           <span>{{ commentCount | formatNum }}</span>
         </a>
-        <a 
-          class="m-box m-aln-center" 
+        <a
+          class="m-box m-aln-center"
           @click.prevent="handleView('')">
           <svg class="m-style-svg m-svg-def">
             <use xlink:href="#feed-eye"/>
@@ -75,8 +75,8 @@
           <span>{{ viewCount | formatNum }}</span>
         </a>
         <div class="m-box m-justify-end m-flex-grow1 m-flex-shrink1">
-          <a 
-            class="m-box m-aln-center" 
+          <a
+            class="m-box m-aln-center"
             @click.prevent="handleMore">
             <svg class="m-style-svg m-svg-def">
               <use xlink:href="#feed-more"/>
@@ -84,21 +84,21 @@
           </a>
         </div>
       </div>
-      <ul 
-        v-if="commentCount > 0" 
+      <ul
+        v-if="commentCount > 0"
         class="m-card-comments">
         <li
           v-for="com in comments"
           v-if="com.id"
           :key="com.id">
-          <comment-item 
-            :comment="com" 
+          <comment-item
+            :comment="com"
             @click="commentAction"/>
         </li>
       </ul>
-      <div 
-        v-if="commentCount > 5" 
-        class="m-router-link" 
+      <div
+        v-if="commentCount > 5"
+        class="m-router-link"
         @click="handleView('comment_list')">
         <a>查看全部评论</a>
       </div>
@@ -138,6 +138,7 @@ export default {
       default: false
     },
     feed: {
+      type: Object,
       required: true
     },
     showFooter: {
@@ -308,7 +309,7 @@ export default {
       });
     },
     handleMore() {
-      const base = [
+      const actions = [
         {
           text: this.has_collect ? "取消收藏" : "收藏",
           method: () => {
@@ -335,71 +336,76 @@ export default {
           }
         }
       ];
-      const actions = this.isMine
-        ? [
-            {
-              text: "申请动态置顶",
-              method: () => {
-                bus.$emit("applyTop", {
-                  type: "feed",
-                  api: applyTopFeed,
-                  payload: this.feedID
-                });
-              }
-            },
-            {
-              text: "删除动态",
-              method: () => {
-                setTimeout(() => {
-                  const actionSheet = [
-                    {
-                      text: "删除",
-                      style: { color: "#f4504d" },
-                      method: () => {
-                        deleteFeed(this.feedID).then(() => {
-                          this.$Message.success("删除动态成功");
-                          this.$nextTick(() => {
-                            this.$el.remove();
-                            this.$emit("afterDelete");
-                          });
-                        });
-                      }
-                    }
-                  ];
-                  bus.$emit("actionSheet", actionSheet, "取消", "确认删除?");
-                }, 200);
-              }
-            }
-          ]
-        : [
-            {
-              text: "举报",
-              method: () => {
-                console.log("举报");
-              }
-            }
-          ];
-      bus.$emit("actionSheet", [...base, ...actions], "取消");
+      if (this.isMine) {
+        // 是否是自己文章的评论
+        actions.push({
+          text: "申请动态置顶",
+          method: () => {
+            bus.$emit("applyTop", {
+              type: "feed",
+              api: applyTopFeed,
+              payload: this.feedID
+            });
+          }
+        });
+        actions.push({
+          text: "删除动态",
+          method: () => {
+            setTimeout(() => {
+              const actionSheet = [
+                {
+                  text: "删除",
+                  style: { color: "#f4504d" },
+                  method: () => {
+                    deleteFeed(this.feedID).then(() => {
+                      this.$Message.success("删除动态成功");
+                      this.$nextTick(() => {
+                        this.$el.remove();
+                        this.$emit("afterDelete");
+                      });
+                    });
+                  }
+                }
+              ];
+              bus.$emit("actionSheet", actionSheet, "取消", "确认删除?");
+            }, 200);
+          }
+        });
+      } else {
+        actions.push({
+          text: "举报",
+          method: () => {
+            console.log("举报");
+          }
+        });
+      }
+
+      bus.$emit("actionSheet", actions, "取消");
     },
     commentAction({ isMine = false, placeholder, reply_user, comment }) {
-      isMine
-        ? bus.$emit("actionSheet", [
-            {
-              text: "申请评论置顶",
-              method: () => {
-                bus.$emit("applyTop", {
-                  type: "feedComment",
-                  api: applyTopFeedComment,
-                  payload: { feedId: this.feedID, commentId: comment.id }
-                });
-              }
-            },
-            { text: "删除评论", method: () => this.deleteComment(comment.id) }
-          ])
-        : this.handleComment({
-            placeholder,
-            reply_user
-          });
+      if (isMine) {
+        const isOwner = this.feed.user.id === this.CURRENTUSER.id;
+        const actionSheet = [
+          {
+            text: isOwner ? "评论置顶" : "申请评论置顶",
+            method: () => {
+              bus.$emit("applyTop", {
+                isOwner,
+                type: "feedComment",
+                api: applyTopFeedComment,
+                payload: { feedId: this.feedID, commentId: comment.id }
+              });
+            }
+          },
+          { text: "删除评论", method: () => this.deleteComment(comment.id) }
+        ];
+        bus.$emit("actionSheet", actionSheet);
+      } else {
+        this.handleComment({
+          placeholder,
+          reply_user
+        });
+      }
     },
     sendComment({ reply_user: replyUser, body }) {
       if (body && body.length === 0)
diff --git a/src/components/FeedCard/GroupFeedCard.vue b/src/components/FeedCard/GroupFeedCard.vue
index 3f81493b..5041d1c2 100644
--- a/src/components/FeedCard/GroupFeedCard.vue
+++ b/src/components/FeedCard/GroupFeedCard.vue
@@ -7,6 +7,7 @@ import {
   applyTopPostComment,
   deletePostComment
 } from "@/api/group.js";
+
 export default {
   name: "GroupFeedCard",
   extends: FeedCard,
@@ -120,24 +121,28 @@ export default {
       bus.$emit("actionSheet", [...base], "取消");
     },
     commentAction({ isMine = false, placeholder, reply_user, comment }) {
-      isMine
-        ? bus.$emit("actionSheet", [
-            {
-              text: "申请评论置顶",
-              method: () => {
-                bus.$emit("applyTop", {
-                  type: "postComment",
-                  api: applyTopPostComment,
-                  payload: { postId: this.feedID, commentId: comment.id }
-                });
-              }
-            },
-            { text: "删除评论", method: () => this.deleteComment(comment.id) }
-          ])
-        : this.handleComment({
-            placeholder,
-            reply_user
-          });
+      if (isMine) {
+        const isOwner = this.feed.user.id === this.CURRENTUSER.id;
+        bus.$emit("actionSheet", [
+          {
+            text: isOwner ? "评论置顶" : "申请评论置顶",
+            method: () => {
+              bus.$emit("applyTop", {
+                isOwner,
+                type: "postComment",
+                api: applyTopPostComment,
+                payload: { postId: this.feedID, commentId: comment.id }
+              });
+            }
+          },
+          { text: "删除评论", method: () => this.deleteComment(comment.id) }
+        ]);
+      } else {
+        this.handleComment({
+          placeholder,
+          reply_user
+        });
+      }
     },
     deleteComment(commentId) {
       deletePostComment(this.feedID, commentId).then(() => {
diff --git a/src/components/applyForTop.vue b/src/components/applyForTop.vue
index c4f5aa54..7dda23ed 100644
--- a/src/components/applyForTop.vue
+++ b/src/components/applyForTop.vue
@@ -1,17 +1,17 @@
 <template>
   <transition name="toast">
-    <div 
-      v-if="show" 
-      class="m-box-model m-pos-f" 
-      style="background-color: #f4f5f6; z-index: 101" 
+    <div
+      v-if="show"
+      class="m-box-model m-pos-f"
+      style="background-color: #f4f5f6; z-index: 101"
       @touchmove.prevent>
       <header class="m-box m-aln-center m-head-top m-main m-bb1">
         <div class="m-flex-grow1">
-          <svg 
-            class="m-style-svg m-svg-def" 
+          <svg
+            class="m-style-svg m-svg-def"
             @click="cancel">
-            <use 
-              xmlns:xlink="http://www.w3.org/1999/xlink" 
+            <use
+              xmlns:xlink="http://www.w3.org/1999/xlink"
               xlink:href="#base-back"/>
           </svg>
         </div>
@@ -66,23 +66,26 @@
           </div>
           <p
             class="placeholder m-flex-grow1 m-flex-shrink1"
-            style="padding: .3rem .2rem 0; font-size: .24rem;"><!-- 最近置顶平均{{  }},  -->可用积分{{ currencySum }}</p>
+            style="padding: .3rem .2rem 0; font-size: .24rem;">
+            <!-- 最近置顶平均{{  }},  -->
+            可用积分{{ currencySum }}
+          </p>
         </div>
-        <div 
-          class="plr20 m-lim-width" 
+        <div
+          class="plr20 m-lim-width"
           style="margin-top: 0.6rem">
           <button
             :disabled="disabled || loading"
             class="m-long-btn m-signin-btn"
             @click="handleOk">
-            <svg 
-              v-if="loading" 
+            <svg
+              v-if="loading"
               class="m-style-svg m-svg-def">
-              <use 
-                xmlns:xlink="http://www.w3.org/1999/xlink" 
+              <use
+                xmlns:xlink="http://www.w3.org/1999/xlink"
                 xlink:href="#base-loading"/>
             </svg>
-            <span v-else>申请置顶</span>
+            <span v-else>{{ isOwner ? '确认置顶' : '申请置顶' }}</span>
           </button>
         </div>
       </main>
@@ -104,9 +107,11 @@ export default {
       currencySum: 0,
       loading: false,
       customAmount: null,
+      isOwner: false,
       applyType: "", // 申请置顶的类型
-      applyApi: noop, // 申请置顶的api
-      applyPayload: {} // 申请置顶的负载数据，如feedID等
+      applyApi: noop, // 申请置顶的api 类型是一个 Promise 对象
+      applyPayload: {}, // 申请置顶的负载数据，如feedID等
+      applyCallback: noop
     };
   },
   computed: {
@@ -131,14 +136,19 @@ export default {
      * 弹出申请置顶窗口 (hooks -> applyTop)
      * @author mutoe <mutoe@foxmail.com>
      * @param {Object} options
-     * @param {String} options.type 申请置顶类型
+     * @param {string} options.type 申请置顶类型
      * @param {Promise} options.api 申请置顶的 api，需要返回 axios promise 对象
-     * @param {*} options.payload 申请置顶 api 的第一个参数，可以为任何类型的值，取决于 api 中的设定
+     * @param {string|Object} options.payload 申请置顶 api 的第一个参数，取决于 api 中的设定
+     * @param {boolean} [options.isOwner = false] 是否是文章的所有者
+     * @param {Function} [options.callback = noop] 申请置顶成功后执行的回调方法
      */
-    bus.$on("applyTop", ({ type, api, payload }) => {
+    bus.$on("applyTop", options => {
+      const { type, api, payload, isOwner = false, callback = noop } = options;
       this.applyType = type;
       this.applyApi = api;
       this.applyPayload = payload;
+      this.isOwner = isOwner;
+      this.applyCallback = callback || noop;
       this.open();
     });
   },
@@ -155,6 +165,7 @@ export default {
         .then(({ data = {} }) => {
           this.loading = false;
           this.$Message.success(data);
+          this.applyCallback();
           this.$nextTick(this.cancel);
         })
         .catch(err => {
@@ -185,9 +196,11 @@ export default {
       this.day = null;
       this.customAmount = null;
       this.scrollable = true;
+      this.isOwner = false;
       this.applyType = "";
       this.applyApi = noop;
       this.applyPayload = {};
+      this.applyCallback = noop;
     }
   }
 };
diff --git a/src/page/feed/feedDetail.vue b/src/page/feed/feedDetail.vue
index ad0f2edd..1c454446 100644
--- a/src/page/feed/feedDetail.vue
+++ b/src/page/feed/feedDetail.vue
@@ -6,16 +6,16 @@
     @on-share="shareFeed"
     @on-more="moreAction"
     @on-comment="commentFeed">
-    <header 
-      slot="head" 
-      class="m-box m-justify-bet m-aln-center m-art-head" 
+    <header
+      slot="head"
+      class="m-box m-justify-bet m-aln-center m-art-head"
       style="padding: 0">
       <div class="m-box m-flex-grow1 m-aln-center m-flex-base0">
-        <svg 
-          class="m-style-svg m-svg-def" 
+        <svg
+          class="m-style-svg m-svg-def"
           @click="goBack">
-          <use 
-            xmlns:xlink="http://www.w3.org/1999/xlink" 
+          <use
+            xmlns:xlink="http://www.w3.org/1999/xlink"
             xlink:href="#base-back"/>
         </svg>
       </div>
@@ -33,8 +33,8 @@
         class="m-box m-flex-grow1 m-aln-center m-flex-base0 m-justify-end"
         @click="followUserByStatus(relation.status)">
         <svg class="m-style-svg m-svg-def">
-          <use 
-            :xlink:href="relation.icon" 
+          <use
+            :xlink:href="relation.icon"
             xmlns:xlink="http://www.w3.org/1999/xlink"/>
         </svg>
       </div>
@@ -52,8 +52,8 @@
             class="feed-detail-video"
             controls
             autoplay>
-            <source 
-              :src="video_file" 
+            <source
+              :src="video_file"
               type="video/mp4" >
           </video>
           <async-file
@@ -64,20 +64,20 @@
             <img
               v-if="props.src"
               slot-scope="props"
-              :src="props.src" 
+              :src="props.src"
               @click="onFileClick(img)">
           </async-file>
-          <p 
-            class="m-text-box" 
+          <p
+            class="m-text-box"
             v-html="formatBody(feedContent)"/>
         </div>
         <div class="m-box m-aln-center m-justify-bet m-art-foot">
           <div class="m-flex-grow1 m-flex-shrink1 m-art-like-list">
-            <router-link 
-              v-if="likeCount > 0" 
-              tag="div" 
-              class="m-box m-aln-center" 
-              to="likers" 
+            <router-link
+              v-if="likeCount > 0"
+              tag="div"
+              class="m-box m-aln-center"
+              to="likers"
               append>
               <ul class="m-box m-flex-grow0 m-flex-shrink0">
                 <li
@@ -99,14 +99,14 @@
         </div>
         <!-- todo 打赏功能 -->
         <div class="m-box-model m-box-center m-box-center-a m-art-reward">
-          <button 
-            class="m-art-rew-btn" 
+          <button
+            class="m-art-rew-btn"
             @click="rewardFeed">打 赏</button>
           <p class="m-art-rew-label"><a href="javascript:;">{{ reward.count | formatNum }}</a>人打赏，共<a href="javascript:;">{{ ~~reward.amount }}</a>积分</p>
-          <router-link 
-            tag="ul" 
-            to="rewarders" 
-            append 
+          <router-link
+            tag="ul"
+            to="rewarders"
+            append
             class="m-box m-aln-center m-art-rew-list">
             <li
               v-for="rew in rewardList"
@@ -115,14 +115,14 @@
               class="m-flex-grow0 m-flex-shrink0 m-art-rew m-avatar-box tiny">
               <img :src="rew.user.avatar">
             </li>
-            <li 
-              v-if="rewardList.length > 0" 
+            <li
+              v-if="rewardList.length > 0"
               class="m-box m-aln-center">
-              <svg 
-                class="m-style-svg m-svg-def" 
+              <svg
+                class="m-style-svg m-svg-def"
                 style="fill:#bfbfbf">
-                <use 
-                  xmlns:xlink="http://www.w3.org/1999/xlink" 
+                <use
+                  xmlns:xlink="http://www.w3.org/1999/xlink"
                   xlink:href="#base-arrow-r"/>
               </svg>
             </li>
@@ -130,8 +130,8 @@
         </div>
       </main>
       <!-- 评论列表 -->
-      <div 
-        id="comment_list" 
+      <div
+        id="comment_list"
         class="m-box-model m-art-comments">
         <ul class="m-box m-aln-center m-art-comments-tabs">
           <li>{{ commentCount | formatNum }}条评论</li>
@@ -148,12 +148,12 @@
           :comment="comment"
           @click="replyComment"/>
         <div class="m-box m-aln-center m-justify-center load-more-box">
-          <span 
-            v-if="noMoreCom" 
+          <span
+            v-if="noMoreCom"
             class="load-more-ph">---没有更多---</span>
-          <span 
-            v-else 
-            class="load-more-btn" 
+          <span
+            v-else
+            class="load-more-btn"
             @click.stop="fetchFeedComments(maxComId)">
             {{ fetchComing ? "加载中..." : "点击加载更多" }}
           </span>
@@ -165,6 +165,7 @@
 
 <script>
 import bus from "@/bus.js";
+import { mapState } from "vuex";
 import ArticleCard from "@/page/article/ArticleCard.vue";
 import CommentItem from "@/page/article/ArticleComment.vue";
 import wechatShare from "@/util/wechatShare.js";
@@ -202,6 +203,7 @@ export default {
     };
   },
   computed: {
+    ...mapState(["CURRENTUSER"]),
     feedID() {
       return this.$route.params.feedID;
     },
@@ -217,9 +219,6 @@ export default {
     cover_file() {
       return this.video ? `/api/v2/files/${this.video.video_id}` : false;
     },
-    CURRENTUSER() {
-      return this.$store.state.CURRENTUSER;
-    },
     isMine() {
       return this.feed.user_id === this.CURRENTUSER.id;
     },
@@ -412,11 +411,6 @@ export default {
     fetchFeedComments(after = 0) {
       if (this.fetchComing) return;
       this.fetchComing = true;
-      // this.$http.get(`/feeds/${this.feedID}/comments`, {
-      //   params: {
-      //     after
-      //   }
-      // });
       getFeedComments({ feedId: this.feedID, after })
         .then(({ data: { pinneds = [], comments = [] } }) => {
           !after && (this.pinnedCom = pinneds);
@@ -578,15 +572,20 @@ export default {
       bus.$emit("actionSheet", [...defaultActions, ...actions], "取消");
     },
     replyComment(uid, uname, commentId) {
+      // 是否是自己的评论
       if (uid === this.CURRENTUSER.id) {
+        // 是否是自己文章的评论
+        const isOwner = uid === this.user.id;
         const actionSheet = [
           {
-            text: "申请评论置顶",
+            text: isOwner ? "评论置顶" : "申请评论置顶",
             method: () => {
               bus.$emit("applyTop", {
+                isOwner,
                 type: "feedComment",
                 api: applyTopFeedComment,
-                payload: { feedId: this.feedID, commentId }
+                payload: { feedId: this.feedID, commentId },
+                callback: this.fetchFeedComments
               });
             }
           },
diff --git a/src/page/group/GroupPostDetail.vue b/src/page/group/GroupPostDetail.vue
index fba88e59..c58730b6 100644
--- a/src/page/group/GroupPostDetail.vue
+++ b/src/page/group/GroupPostDetail.vue
@@ -332,15 +332,20 @@ export default {
       bus.$emit("actionSheet", [...defaultActions, ...actions], "取消");
     },
     replyComment(uid, uname, commentId) {
+      // 是否是自己的评论
       if (uid === this.CURRENTUSER.id) {
+        // 是否是自己文章的评论
+        const isOwner = uid === this.user.id;
         const actionSheet = [
           {
-            text: "申请评论置顶",
+            text: isOwner ? "评论置顶" : "申请评论置顶",
             method: () => {
               bus.$emit("applyTop", {
+                isOwner,
                 type: "postComment",
                 api: applyTopPostComment,
-                payload: { postId: Number(this.postID), commentId }
+                payload: { postId: Number(this.postID), commentId },
+                callback: this.fetchFeedComments
               });
             }
           },
diff --git a/src/page/news/newsDetail.vue b/src/page/news/newsDetail.vue
index 86b77bcb..d7d5f970 100644
--- a/src/page/news/newsDetail.vue
+++ b/src/page/news/newsDetail.vue
@@ -7,16 +7,16 @@
     @on-share="shareNews"
     @on-more="moreAction"
     @on-comment="commentNews">
-    <header 
-      slot="head" 
-      class="m-box m-justify-bet m-aln-center m-art-head" 
+    <header
+      slot="head"
+      class="m-box m-justify-bet m-aln-center m-art-head"
       style="padding: 0">
       <div class="m-box m-flex-grow1 m-aln-center m-flex-base0">
-        <svg 
-          class="m-style-svg m-svg-def" 
+        <svg
+          class="m-style-svg m-svg-def"
           @click="goBack">
-          <use 
-            xmlns:xlink="http://www.w3.org/1999/xlink" 
+          <use
+            xmlns:xlink="http://www.w3.org/1999/xlink"
             xlink:href="#base-back"/>
         </svg>
       </div>
@@ -37,11 +37,11 @@
           <span>来自 {{ news.from || '原创' }}</span>
         </p>
       </section>
-      <p 
-        v-if="news.subject" 
+      <p
+        v-if="news.subject"
         class="m-art-subject">{{ news.subject }}</p>
-      <div 
-        class="m-art-body" 
+      <div
+        class="m-art-body"
         v-html="body"/>
       <div class="m-box m-aln-center m-justify-bet m-art-foot">
         <div class="m-flex-grow1 m-flex-shrink1 m-box m-aln-center m-art-like-list">
@@ -85,15 +85,15 @@
         :key="`comment-${comment.id}`"
         :comment="comment"
         @click="replyComment" />
-      <div 
-        v-if="news.audit_status===0" 
+      <div
+        v-if="news.audit_status===0"
         class="m-box m-aln-center m-justify-center load-more-box">
-        <span 
-          v-if="noMoreCom" 
+        <span
+          v-if="noMoreCom"
           class="load-more-ph">---没有更多---</span>
-        <span 
-          v-else 
-          class="load-more-btn" 
+        <span
+          v-else
+          class="load-more-btn"
           @click.stop="fetchNewsComments(maxComId)">
           {{ fetchComing ? "加载中..." : "点击加载更多" }}
         </span>
@@ -105,6 +105,7 @@
 
 <script>
 import bus from "@/bus.js";
+import { mapState } from "vuex";
 import md from "@/util/markdown.js";
 import wechatShare from "@/util/wechatShare.js";
 import ArticleCard from "@/page/article/ArticleCard.vue";
@@ -156,6 +157,7 @@ export default {
     };
   },
   computed: {
+    ...mapState(["CURRENTUSER"]),
     firstImage() {
       let images = this.news.image;
       if (!Object.keys(images).length) {
@@ -168,11 +170,11 @@ export default {
     newsID() {
       return this.$route.params.newsID;
     },
-    uid() {
-      return this.$store.state.CURRENTUSER.id;
+    userID() {
+      return this.news.user_id || 0;
     },
     isMine() {
-      return this.news.user_id === this.uid;
+      return this.news.user_id === this.CURRENTUSER.id;
     },
     liked: {
       get() {
@@ -362,15 +364,20 @@ export default {
       bus.$emit("actionSheet", [...defaultActions, ...actions], "取消");
     },
     replyComment(uid, uname, commentId) {
-      if (uid === this.uid) {
+      // 是否是自己的评论
+      if (uid === this.CURRENTUSER.id) {
+        // 是否是自己文章的评论
+        const isOwner = uid === this.userID;
         const actionSheet = [
           {
-            text: "申请评论置顶",
+            text: isOwner ? "评论置顶" : "申请评论置顶",
             method: () => {
               bus.$emit("applyTop", {
+                isOwner,
                 type: "newsComment",
                 api: applyTopNewsComment,
-                payload: { newsId: this.newsID, commentId }
+                payload: { newsId: this.newsID, commentId },
+                callback: this.fetchNewsComments
               });
             }
           },
diff --git a/src/page/question/AnswerDetail.vue b/src/page/question/AnswerDetail.vue
index 9c88ab21..ccff0a55 100644
--- a/src/page/question/AnswerDetail.vue
+++ b/src/page/question/AnswerDetail.vue
@@ -284,12 +284,6 @@ export default {
         ? bus.$emit(
             "actionSheet",
             [
-              {
-                text: "申请评论置顶",
-                method: () => {
-                  this.$Message.info("置顶功能开发中，敬请期待");
-                }
-              },
               {
                 text: "删除评论",
                 method: () => {