话题页面对接完成

pages/news/detail/_id.vue

@@ -47,13 +47,7 @@
         </div>
 
         <div class="article__footer">
-<<<<<<< HEAD
           <p class="link">本文编辑：<span>{{articleDetail.author}}</span></p>
-
-=======
-<!--          <p class="link">原文链接：<a target="_blank" :href="articleDetail.link"> <span>{{articleDetail.link}}</span></a></p>-->
-         <p></p>
->>>>>>> b133e4cc6d18aebdb046c0dc71e7c16ee0e52fee
           <p class="report" @click="$router.push({path:'/web/report',query:{type:'news',id:articleDetail.contentId}})">举报</p>
           <div class="project" v-if="false">
             <p>