Merge branch 'master' into cygx8.6

src/views/htgj/index.vue

@@ -11,9 +11,6 @@
       <div>
         <Tabs v-model:active="tabActive" title-active-color="#2C83FF" title-inactive-color="#707070" @click-tab="onClickTabs">
           <Tab v-for="item in tabBars" :key="item.ChartPermissionId" :name="item.ChartPermissionId" :title="item.PermissionName"></Tab>
-          <template #nav-right v-if="tabBars.length">
-            <img class="tabs-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/limit_icon.png" alt="" />
-          </template>
         </Tabs>
       </div>
     </div>

src/views/htgj/report.vue

@@ -54,11 +54,11 @@
       <img src="@/assets/cygx/noauth.png" mode="" class="nodata_ico" />
       <div v-if="haveData == 2">
         <p>您暂无权限查看报告</p>
-        <p>若想查看可联系销售开通试用权限</p>
+        <p>若想查看可联系海通销售开通试用权限</p>
       </div>
       <div v-else>
         <p>您的试用权限已到期</p>
-        <p>若想继续试用，请联系销售</p>
+        <p>若想继续试用，请联系海通销售</p>
       </div>
     </div>
     <topbar v-if="haveData != 1" class="top-haveData-bar" showText="弘则研究" />

src/views/htgj/strategyDetail.vue

@@ -153,11 +153,11 @@ const { reportInfo } = toRefs(state);
       <img src="@/assets/cygx/noauth.png" mode="" class="nodata_ico" />
       <div v-if="haveData == 2">
         <p>您暂无权限查看报告</p>
-        <p>若想查看可联系销售开通试用权限</p>
+        <p>若想查看可联系海通销售开通试用权限</p>
       </div>
       <div v-else>
         <p>您的试用权限已到期</p>
-        <p>若想继续试用，请联系销售</p>
+        <p>若想继续试用，请联系海通销售</p>
       </div>
     </div>
     <topbar v-if="haveData != 1" class="top-haveData-bar" showText="弘则研究" />

src/views/hzyb/Index.vue

@@ -148,6 +148,27 @@ const handleCloseAudioPup=()=>{
     -ms-user-select: none;
     -khtml-user-select:none;
 }
+#report-rich-content{
+  position: relative;
+  .hide-watermark-box{
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    align-items: center;
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    font-size: 40px;
+    z-index: 999999;
+    background: transparent;
+    left: 0;
+    top: 0;
+    pointer-events: none;
+    color: rgba(0,0,0,0.005); // 水印蒙层字体颜色设置为白色透明
+  }
+}
+
 </style>
 
 <style lang="scss" scoped>

src/views/hzyb/report/ChapterDetail.vue

@@ -19,13 +19,17 @@
           </div>
         </div>
       </div>
-      <div class="rich-content" ref="richConBox">
+      <div id="report-rich-content" class="rich-content" ref="richConBox">
         <div v-if="info.auth_ok">
           <ul>
               <li v-for="item in realContent" :key="item" v-html="item"></li>
           </ul>
         </div>
         <div v-html="info.report_chapter_item.content_sub" v-else ></div>
+        <!-- 隐藏的水印 -->
+        <div class="hide-watermark-box" v-if="userInfo">
+          <div v-for="item in 20" :key="item">{{userInfo.mobile}}</div>
+        </div>
       </div>
       <!-- 指标数据模块 -->
       <div class="ticker-wrap" v-if="tickerInfo">

src/views/hzyb/report/Detail.vue

@@ -65,13 +65,17 @@
                 </div>
             </div>
 
-            <div class="rich-content" style="position: relative;" ref="richConBox">
+            <div id="report-rich-content" class="rich-content" style="position: relative;" ref="richConBox">
                 <div v-if="info.auth_ok">
                     <ul>
                         <li v-for="item in realContent" :key="item" v-html="item"></li>
                     </ul>
                 </div>
                 <div v-html="info.report_info.content_sub" v-else></div>
+                <!-- 隐藏的水印 -->
+                <div class="hide-watermark-box" v-if="userInfo">
+                    <div v-for="item in 20" :key="item">{{userInfo.mobile}}</div>
+                </div>
             </div>
 
             <!-- 无权限 -->