Merge branch 'master' of http://8.136.199.33:3000/hongze/hongze_yb_pc

src/views/activity/ChapterDetail.vue

@@ -4,6 +4,7 @@ import moment from 'moment'
 import {ref,onMounted,nextTick} from 'vue'
 import { useRoute } from 'vue-router'
 import {useWaterMark} from '@/hooks/waterMark.js'
+import { apiBaseConfig } from '@/api/common'
 
 import {apiGetChapterReportDetail,apiGetReportDetail} from '@/api/activity'
 import { useStore } from 'vuex'
@@ -29,6 +30,16 @@ const getInfo=async ()=>{
 }
 getInfo()
 
+const disclaimer = ref('')
+function getConfig() {
+  apiBaseConfig().then(res => {
+    if (res.code == 200) {
+      disclaimer.value = res.data.disclaimer
+    }
+  })
+}
+getConfig()
+
 // 获取底部列表
 let info2=ref(null)
 let botList=ref([])
@@ -95,7 +106,7 @@ const chapterTypeChange=(item)=>{
                     <span>{{info.report_chapter_item.author}}</span>
                     <span class="time">{{moment(info2.researchReportDate).format('YYYY-MM-DD HH:mm:ss')}}</span>
                 </div>
-                <div class="tips">
+                <div class="tips" v-if="disclaimer">
                     <span>注：请务必阅读</span>
                     <span style="color:#F3A52F;margin-left:20px;cursor: pointer;" @click="showDisclaimers=true">免责声明</span>
                 </div>

src/views/activity/ReportDetail.vue

@@ -5,6 +5,7 @@ import {ref,onMounted,nextTick} from 'vue'
 import { useRoute ,useRouter} from 'vue-router'
 import { useStore } from 'vuex';
 import {useWaterMark} from '@/hooks/waterMark.js'
+import { apiBaseConfig } from '@/api/common'
 
 const route=useRoute()
 const router=useRouter()
@@ -31,6 +32,16 @@ const getInfo=async ()=>{
 }
 getInfo()
 
+const disclaimer = ref('')
+function getConfig() {
+  apiBaseConfig().then(res => {
+    if (res.code == 200) {
+      disclaimer.value = res.data.disclaimer
+    }
+  })
+}
+getConfig()
+
 // 设置tag颜色
 const getTagColor=(str)=>{
     if( str.includes('多')||str.includes('强')||str.includes('反弹') ){
@@ -136,7 +147,7 @@ let showDisclaimers=ref(false)
                     <span>{{info.report_info.author}}</span>
                     <span class="time">{{moment(info.research_report_info.researchReportDate).format('YYYY-MM-DD HH:mm:ss')}}</span>
                 </div>
-                <div class="tips">
+                <div class="tips" v-if="disclaimer">
                     <span>注：请务必阅读</span>
                     <span style="color:#F3A52F;margin-left:20px;cursor: pointer;" @click="showDisclaimers=true">免责声明</span>
                 </div>

src/views/report/ChapterDetail.vue

@@ -28,6 +28,7 @@ import {addTokenToIframe} from '@/utils/common.js'
 import reportCancel from './components/reportCancel.vue'
 import ReportContent from './components/ReportContent.vue'
 import Disclaimer from '@/components/Disclaimer.vue'
+import { apiBaseConfig } from '@/api/common'
 
 const route=useRoute()
 const router=useRouter()
@@ -55,6 +56,16 @@ const getReportPPTImgs=async (e)=>{
     }
 }
 
+const disclaimer = ref('')
+function getConfig() {
+  apiBaseConfig().then(res => {
+    if (res.code == 200) {
+      disclaimer.value = res.data.disclaimer
+    }
+  })
+}
+getConfig()
+
 //获取晨报中指标数据
 let tickerInfo=ref(null)
 let tickerHead=ref([])
@@ -495,7 +506,7 @@ const posterParams=computed(()=>{
                         <div class="flex tips" style="position:relative">
                             <div>
                                 <div class="abstract" v-if="info.report_chapter_item.abstract">摘要：{{info.report_chapter_item.abstract}}</div>
-                                <div>
+                                <div v-if="disclaimer">
                                     <span>*注：请务必阅读</span>
                                     <span style="color:#F3A52F;margin-left:20px;cursor: pointer;" @click="showDisclaimers=true">免责声明</span>
                                 </div>

src/views/report/Detail.vue

@@ -21,6 +21,7 @@ import { onClickOutside } from '@vueuse/core'
 import reportCancel from './components/reportCancel.vue'
 import ReportContent from './components/ReportContent.vue'
 import Disclaimer from '@/components/Disclaimer.vue'
+import { apiBaseConfig } from '@/api/common'
 moment.locale('zh-cn')
 
 const route=useRoute()
@@ -59,6 +60,16 @@ const getReportPPTImgs=async ()=>{
     }
 }
 
+const disclaimer = ref('')
+function getConfig() {
+  apiBaseConfig().then(res => {
+    if (res.code == 200) {
+      disclaimer.value = res.data.disclaimer
+    }
+  })
+}
+getConfig()
+
 // 获取报告详情
 let info=ref(null)
 let audioData=ref(null)
@@ -668,7 +679,7 @@ const closeShowAttentionPop=()=>{
                             <div>
                                 <div v-if="info.road_video_id">点击<span style="color: #F3A52F;cursor: pointer;" @click="goVideoPage(info)">查看视频</span></div>
                                 <div class="abstract" v-if="info.report_info.abstract">摘要：{{info.report_info.abstract}}</div>
-                                <div>
+                                <div v-if="disclaimer">
                                     <span>*注：请务必阅读</span>
                                     <span style="color:#F3A52F;margin-left:20px;cursor: pointer;" @click="showDisclaimers=true">免责声明</span>
                                 </div>