feat: 优化pc端首页弹窗层级问题

src/web/staticres/public-pc/js/check-power-and-switch.js

@@ -206,15 +206,21 @@ var checkVipExpireStyle = `
     width: 24px;
     height: 24px;
 }
+.dialog-close img {
+    display: block;
+    width: 100%;
+}
 </style>
 `
 
 var checkPowerAndSwitch = {
     $modal: '',
+    initd: false,
     targetIdentity: {},
     // 初始化下一个弹窗
     showNext: function() {},
     init: function () {
+        this.initd = true
         this.getUserHighestIdentity()
     },
     initDOM: function () {
@@ -330,11 +336,13 @@ var checkPowerAndSwitch = {
 var checkVipExpireDialog = {
     $modal: '',
     pInfo: {},
+    initd: false,
     // 初始化下一个弹窗
     showNext: function() {
         checkPowerAndSwitch.init()
     },
     init: function () {
+        this.initd = true
         this.vipRenewReminder()
     },
     initDOM: function () {
@@ -494,10 +502,10 @@ var checkVipExpireDialog = {
     }
 };
 
-$(function() {
+function initAnotherDialog() {
     checkVipExpireDialog.init();
     // checkPowerAndSwitch.init();
-})
+}
 
 
 

src/web/templates/pc/entsearchindex.html

@@ -521,7 +521,12 @@
     <script src='{{Msg "seo" "cdn"}}/common-module/collection/js/visited.js?v={{Msg "seo" "version"}}'></script>
     <script src='{{Msg "seo" "cdn"}}/public-pc/js/workspace-desc.js?v={{Msg "seo" "version"}}'></script>
     <script src='{{Msg "seo" "cdn"}}/js/ent-search-index-pc.js?v={{Msg "seo" "version"}}'></script>
-    <script defer src='{{Msg "seo" "cdn"}}/public-pc/js/check-power-and-switch.js?v={{Msg "seo" "version"}}'></script>
+    <script src='{{Msg "seo" "cdn"}}/public-pc/js/check-power-and-switch.js?v={{Msg "seo" "version"}}'></script>
+    <script>
+        $(function(){
+            initAnotherDialog()
+        })
+    </script>
 </body>
 
 </html>

src/web/templates/pc/newIndex.html

@@ -215,6 +215,7 @@
   <script type="text/javascript" src='{{Msg "seo" "cdn"}}/common-module/public/js/china-map-data.min.js?v={{Msg "seo" "version"}}'></script>
   <script type="text/javascript" src='{{Msg "seo" "cdn"}}/js/index/seo_helper.js?v={{Msg "seo" "version"}}'></script>
   <script type="text/javascript" src='{{Msg "seo" "cdn"}}/js/index/index_swiper.js?v={{Msg "seo" "version"}}'></script>
+  <script type="text/javascript" src='{{Msg "seo" "cdn"}}/public-pc/js/check-power-and-switch.js?v={{Msg "seo" "version"}}'></script>
   <!-- 活动弹窗 -->
   {{include "/pc/template/index/activity-dialog.html"}}
   <!-- 新增底部悬浮广告位 -->
@@ -227,7 +228,6 @@
   <script type="text/javascript" src='{{Msg "seo" "cdn"}}/js/index/index_2023.12.js?v={{Msg "seo" "version"}}'></script>
   <script defer src=//cdn-common.jianyu360.com/cdn/lib/echarts/4.8.0/echarts.min.js></script>
   <script defer type="text/javascript" src='{{Msg "seo" "cdn"}}/js/index/index_charts.js?v={{Msg "seo" "version"}}'></script>
-  <script defer type="text/javascript" src='{{Msg "seo" "cdn"}}/public-pc/js/check-power-and-switch.js?v={{Msg "seo" "version"}}'></script>
 </body>
 
 </html>

src/web/templates/pc/pursearchindex.html

@@ -502,12 +502,15 @@
   <script src='{{Msg "seo" "cdn"}}/js/selector/no-data-pc.js?v={{Msg "seo" "version"}}'></script>
   <script src='{{Msg "seo" "cdn"}}/public-pc/js/workspace-desc.js?v={{Msg "seo" "version"}}'></script>
   <script src='{{Msg "seo" "cdn"}}/js/pur-search-index-pc.js?v={{Msg "seo" "version"}}2'></script>
-  <script defer src='{{Msg "seo" "cdn"}}/public-pc/js/check-power-and-switch.js?v={{Msg "seo" "version"}}'></script>
+  <script src='{{Msg "seo" "cdn"}}/public-pc/js/check-power-and-switch.js?v={{Msg "seo" "version"}}'></script>
   <script type="text/javascript">
       var industry = {{.T.industry}}!=null?{{.T.industry}}:"";
       var industrylist = {{.T.industrylist}}!=null?{{.T.industrylist}}:"";
       var sortArray = {{.T.sortArray}}!=null?{{.T.sortArray}}:"";
       var selectPublishtime = {{.T.publishtime}}?{{.T.publishtime}}:"thisyear";
+      $(function(){
+        initAnotherDialog()
+      })
       // $(function() {
       //     // 客户分类
       //     $('.bus-card').find('.right_msg').css('height','22px')

src/web/templates/pc/supsearch.html

@@ -2289,7 +2289,6 @@
 <script src="https://cdn-common.jianyu360.com/cdn/lib/v-charts/1.19.0/index.min.js"></script>
 <script src="https://cdn-common.jianyu360.com/cdn/lib/lodash/4.17.21/lodash.min.js"></script>
 <script src='{{Msg "seo" "cdn"}}/common-module/chart-module/js/chart-common.js?v={{Msg "seo" "version"}}'></script>
-<script defer src='{{Msg "seo" "cdn"}}/public-pc/js/check-power-and-switch.js?v={{Msg "seo" "version"}}'></script>
 <script type="text/javascript">
   $(function(){
     // 从首页 或 点搜索按钮是通过模板渲染的数据
@@ -6100,5 +6099,11 @@ function checkTagDisabled () {
   }
 }
 </script>
+<script src='{{Msg "seo" "cdn"}}/public-pc/js/check-power-and-switch.js?v={{Msg "seo" "version"}}'></script>
+<script>
+  $(function(){
+    initAnotherDialog()
+  })
+</script>
 </body>
 </html>

src/web/templates/pc/template/index/activity-dialog.html

@@ -13,6 +13,12 @@
   </div>
 </div>
 
+<!-- <script>
+  $(function(){
+      initAnotherDialog()
+  })
+</script> -->
+
 <script>
   $(function () {
     // 弹窗(优化一下？)
@@ -26,6 +32,16 @@
     var adv_width = "620";
     var adv_height = "210";
     var adv_background_opacity = 0.6;
+
+    // 初始化下个弹窗
+    function initNextDialog() {
+      try {
+        initAnotherDialog()
+      } catch (error) {
+        console.log(error)        
+      }
+    }
+
     {{$s:=(Ad "jy-pc-index-tap" -1 .Host (cookie "SESSIONID"))}}
     {{if $s}}
     var ADList={{$s}}
@@ -117,6 +133,7 @@
     }
     $("#close2x").click(function () {
       localStorage.setItem("tc", day)
+      initNextDialog()
       $("#index_tc").animate({
         opacity: "hide"
       }, "slow");
@@ -138,15 +155,17 @@
     })
     {{end}}
 
-    // 首页活动弹窗迁移至工作桌面首页，此处活动弹窗不再展示
+    // 首页活动弹窗迁移至工作桌面首页
     var showDay = localStorage.tc;
-    if(adv_img!=""){
+    if(adv_img){
       if(localStorage.tc === undefined){
+        // 展示广告位
         $("#index_tc").css("display","block");
         $("#close2x").css("display","block");
         $(".tans").css("display","block");
       }else{
         if(showDay != day){
+          // 展示广告位
           $("#index_tc").css("display","block");
           $("#close2x").css("display","block");
           $(".tans").css("display","block");
@@ -154,8 +173,12 @@
           $("#index_tc").css("display","none");
           $("#close2x").css("display","none");
           $(".tans").css("display","none");
+          initNextDialog()
         }
       }
+    } else {
+      // 广告位没配置
+      initNextDialog()
     }
   })
 </script>