合并冲突

src/views/chartShow/index.vue

@@ -77,7 +77,7 @@
         <li v-if="$route.query.source==='ybxcx'&&$route.query.isETAForumChart!='true'"><collectBtn/></li>
         <!-- eta小程序报告详情中的有收藏 -->
         <li v-if="$route.query.source==='etamini'&&$route.query.isETAForumChart!='true'" @click="handleChangeChartCollect">{{IsCollect?'取消收藏':'收藏'}}</li>
-        <li v-if="$route.query.source==='ht_chart'"><collectBtnHT/></li>
+        <li v-if="$route.query.source==='ht_chart'&&$route.query.isETAForumChart!='true'"><collectBtnHT/></li>
         <li @click="copyUrl" class="copy" v-if="isShare"><i class="el-icon-share"/>分享</li>
         <li @click="refreshChart" v-if="chartInfo.UniqueCode&&$route.query.source!=='smartReportGetImg'&&$route.query.isETAForumChart!='true'"><i class="el-icon-refresh"/>刷新</li>
       </ul>
@@ -103,8 +103,12 @@ export default defineComponent({
   components: {
     chart,
     collectBtn,
+<<<<<<< HEAD
     collectBtnHT,
     NoAuth
+=======
+    collectBtnHT
+>>>>>>> eta_forum_2.0
   },
   setup() {
     const route = useRoute();