Browse Source

Merge branch 'ch/need_pool331' of eta_mini/eta_mini_h5 into debug_ht

leichen 2 months ago
parent
commit
ebdc3c50a7
3 changed files with 26 additions and 15 deletions
  1. 4 4
      src/components/DisclaimersWrap.vue
  2. 12 7
      src/views/report/Detail.vue
  3. 10 4
      src/views/report/PDF.vue

+ 4 - 4
src/components/DisclaimersWrap.vue

@@ -17,15 +17,15 @@ getDisclaimers()
 
 <template>
   <!-- 免责声明 -->
-  <t-popup
+  <!-- <t-popup
     v-model:visible="show"
     title="免责声明"
     placement="bottom"
     closeBtn
     closeOnOverlayClick
   >
-    <div class="text-wrap" style="padding:20px;overflow-y: hidden;height: 70vh;">
+    <div class="text-wrap" style="padding:20px;overflow-y: hidden;height: 70vh;"> -->
         <div v-html="text" style="overflow-y: auto;height: 100%;"></div>
-    </div>
-  </t-popup>
+    <!-- </div>
+  </t-popup> -->
 </template>

+ 12 - 7
src/views/report/Detail.vue

@@ -179,9 +179,6 @@ async function handleCollect() {
   }
 }
 
-// 显示免责声明
-const isShowMZSM = ref(false)
-
 // 显示返回顶部
 const showToTop = ref(false)
 const handlePageScroll = useThrottleFn(() => {
@@ -288,14 +285,14 @@ function goDetails(item){
         {{ layoutBaseInfo[item.value] }}
       </div>
     </div>
-    <div
+    <!-- <div
       class="time-box"
       style="text-align: right"
       v-if="reportInfo.headResource.imgUrl"
     >
       <span>如有内容疑问 请查看 &nbsp;</span>
       <span class="btn" @click="isShowMZSM = true">免责声明</span>
-    </div>
+    </div> -->
 
     <template
       v-if="!reportInfo.headResource.imgUrl && !reportInfo.endResource.imgUrl"
@@ -339,7 +336,7 @@ function goDetails(item){
       </div>
       <div class="time-box">
         <span class="time">{{ reportInfo.publishTime }}&nbsp;{{riskLevelInfo}}</span>
-        <span class="btn" @click="isShowMZSM = true">免责声明</span>
+        <!-- <span class="btn" @click="isShowMZSM = true">免责声明</span> -->
       </div>
     </template>
 
@@ -481,7 +478,9 @@ function goDetails(item){
     </div>
   </div>
   <!-- 免责声明 -->
-  <disclaimers-wrap v-model:show="isShowMZSM" />
+  <div class="disclaimers-info" v-else>
+    <disclaimers-wrap/>
+  </div>
   <!-- 关注弹窗 -->
   <t-popup v-model="visible" placement="center" style="width: 80%">
     <t-icon class="close-btn" name="close-circle" size="32" color="#fff" @click="onClose" />
@@ -777,6 +776,12 @@ function goDetails(item){
     }
   }
 }
+.disclaimers-info {
+  // color: #999999;
+  background-color: #fff;
+  border-top: 1px solid #DCDFE6;
+  padding: var(--page-padding);
+}
 .close-btn {
   position: absolute;
   left: 100%;

+ 10 - 4
src/views/report/PDF.vue

@@ -135,8 +135,6 @@ async function handleCollect() {
   }
 }
 
-// 显示免责声明
-const isShowMZSM = ref(false)
 // 显示返回顶部
 const showToTop = ref(false)
 const handlePageScroll = useThrottleFn(() => {
@@ -225,7 +223,7 @@ function goDetails(item){
       </div>
       <div class="time-box">
         <span class="time">{{dayjs(reportInfo.publishedTime).format("YYYY-MM-DD HH:mm:ss")}}&nbsp;{{reportInfo.riskLevel}}</span>
-        <span class="btn" @click="isShowMZSM = true">免责声明</span>
+        <!-- <span class="btn" @click="isShowMZSM = true">免责声明</span> -->
       </div>
     </div>
     <div class="des-box" v-if="reportInfo.abstract">
@@ -310,7 +308,9 @@ function goDetails(item){
     </div>
   </div>
   <!-- 免责声明 -->
-  <disclaimers-wrap v-model:show="isShowMZSM" />
+  <div class="disclaimers-info" v-else>
+    <disclaimers-wrap/>
+  </div>
   <t-popup v-model="visible" placement="center" style="width: 80%">
     <t-icon class="close-btn" name="close-circle" size="32" color="#fff" @click="onClose" />
     <div class="author-popup">
@@ -523,6 +523,12 @@ function goDetails(item){
     }
   }
 }
+.disclaimers-info {
+  // color: #999999;
+  background-color: #fff;
+  border-top: 1px solid #DCDFE6;
+  padding: var(--page-padding);
+}
 .close-btn {
   position: absolute;
   left: 100%;