Merge branch 'release' into dev4.6.2.15

src/jfw/modules/app/src/web/staticres/jyapp/js/common.js

@@ -1074,7 +1074,7 @@ function checkMsgCount(acync, str, callback) {
       } else {
         localStorage.setItem('isMsgNum', num)
       }
-      
+
       callback && callback()
     }
   })
@@ -1272,7 +1272,9 @@ function redSpotOnMenu () {
 function redSpotBackFuc (r, flag) {
   var noticeCount = r.notice;
   //JyObj.getUnReadMessageCount("");
-  checkMsgCount(false, 0)
+  // #fix 修复三级页同步请求导致页面白屏时间过长
+  var isContent = location.href.indexOf('/article/content/') === -1
+  checkMsgCount(isContent, 0)
   // message红点
   if (noticeCount > 0) {
     $(".trigger-div-notice .dot-red").show()
@@ -1660,5 +1662,5 @@ function newVersionUpdateLog(event,new_version){
 	    phonetype: getPhoneType(),//手机型号
 		system: androidVersion()
 	})
-	
-}
+
+}

src/jfw/modules/app/src/web/templates/big-member/meta.html

@@ -19,7 +19,7 @@
   if (typeof window._jyGlobal !== 'object') { window._jyGlobal = {} }
   try { window._jyGlobal.baseURL = {{Msg "seo" "buryingPointUrl"}} } catch (e) { window._jyGlobal.baseURL = '' }
 </script>
-<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/track/track.umd.min.js?v={{Msg "seo" "mod_version"}}'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/track/j-track.min.js?v={{Msg "seo" "mod_version"}}'></script>
 <!--E-meta-->
 
 <!--S-必定会使用的资源-->

src/jfw/modules/app/src/web/templates/common/js.html

@@ -9,4 +9,4 @@
       console.log = function () {}
   }
 </script>
-<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/track/track.umd.min.js?v={{Msg "seo" "mod_version"}}'></script>
+<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/track/j-track.min.js?v={{Msg "seo" "mod_version"}}'></script>

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -340,7 +340,7 @@
             </div>
             <!-- 最新标讯 -->
             <div class="home_data">
-                <h3 class="data_nav" onclick="location.reload()">最新标讯</h3>
+                <h3 class="data_nav">最新标讯</h3>
                 <div class="data_list">
                     <!--首页列表-->
                 </div>

src/web/staticres/common-module/public/fotter.js

@@ -85,17 +85,58 @@ var jyClabUtils = {
 }
 
 try {
+
+    function checkHasJquery () {
+        if (typeof jQuery === 'undefined') {
+            return false
+        }
+        return $.fn.jquery
+    }
+
+    function loadJS (url, success) {
+        var scripts = document.getElementsByTagName('script')
+        for (var i = 0; i < scripts.length; i++) {
+            if (scripts[i].src && scripts[i].src.indexOf(url) > -1) {
+                if (success) success();
+                return;
+            }
+        }
+        var domScript = document.createElement('script');
+        domScript.src = url;
+        success = success || function () {
+        };
+        domScript.onload = domScript.onreadystatechange = function () {
+            if (!this.readyState || 'loaded' === this.readyState || 'complete' === this.readyState) {
+                success();
+                this.onload = this.onreadystatechange = null;
+                //this.parentNode.removeChild(this);
+            }
+        }
+        document.getElementsByTagName('head')[0].appendChild(domScript);
+    }
+
+    function initClabTrack () {
+        // 荟聚
+        $('body').on('click','*[data-cl-event]', function () {
+            clab_tracker && clab_tracker.track($(this).attr('data-cl-event'))
+        })
+    }
+
     jyClabUtils.init()
     // 荟聚
-    $.getScript('//cbe.huiju.cool/cbe/collect?tid=281617177&at=0&h=web', function () {
+    loadJS('//cbe.huiju.cool/cbe/collect?tid=281617177&at=0&h=web', function () {
         clab_tracker.ready(function () {
             this.push({"pageType":"web"});
             this.track("open_page", jyClabUtils.getNowPageInfo());
         })
-        $('body').on('click','*[data-cl-event]', function () {
-            clab_tracker && clab_tracker.track($(this).attr('data-cl-event'))
-        })
     })
+
+    if (checkHasJquery()) {
+        initClabTrack()
+    } else {
+        loadJS('//cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js', initClabTrack)
+    }
+
 } catch (error) {
     console.log(error)
-}
+}

src/web/staticres/common-module/public/head.js

@@ -15,3 +15,14 @@
     s.parentNode.insertBefore(hm, s);
   }, 300);
 })();
+try {
+  // 剑鱼荟聚Event
+  var hm = document.createElement("script");
+  hm.src = '/common-module/track/j-track.min.js?v=1'
+  setTimeout(function(){
+    var s = document.getElementsByTagName("script")[0];
+    s.parentNode.insertBefore(hm, s);
+  }, 300);
+} catch (e) {
+  console.log(error)
+}

src/web/templates/big-member/wx/meta.html

@@ -19,7 +19,7 @@
   if (typeof window._jyGlobal !== 'object') { window._jyGlobal = {} }
   try { window._jyGlobal.baseURL = {{Msg "seo" "buryingPointUrl"}} } catch (e) { window._jyGlobal.baseURL = '' }
 </script>
-<script src='{{Msg "seo" "cdn"}}/js/track/track.umd.min.js?v={{Msg "seo" "mod_version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/common-module/track/j-track.min.js?v={{Msg "seo" "mod_version"}}'></script>
 <!--E-meta-->
 
 <!--S-必定会使用的资源-->

src/web/templates/big-member/wx/page_unit_portrayal.html

@@ -23,7 +23,7 @@
     if (typeof window._jyGlobal !== 'object') { window._jyGlobal = {} }
     try { window._jyGlobal.baseURL = {{Msg "seo" "buryingPointUrl"}} } catch (e) { window._jyGlobal.baseURL = '' }
     </script>
-    <script src='{{Msg "seo" "cdn"}}/js/track/track.umd.min.js?v={{Msg "seo" "mod_version"}}'></script>
+    <script src='{{Msg "seo" "cdn"}}/common-module/track/j-track.min.js?v={{Msg "seo" "mod_version"}}'></script>
     <script src="/big-member/js/rem.js"></script>
     <!--S-当前页面的css资源-->
     <link rel="stylesheet" href=//cdn-common.jianyu360.com/cdn/lib/reset-css/5.0.1/reset.min.css />

src/web/templates/common/pnc.html

@@ -54,7 +54,7 @@
     });
   }
 </script>
-<script src='{{Msg "seo" "cdn"}}/js/track/track.umd.min.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/common-module/track/j-track.min.js?v={{Msg "seo" "mod_version"}}'></script>
 {{Html `<!--[if lt IE 9]><script src="{{Msg "seo" "cdn"}}/js/jquery.js?v={{Msg "seo" "version"}}"><![endif]-->`}}
 <script src="{{Msg "seo" "cdn"}}/js/jquery.cookie.js"></script>
 <script src="{{Msg "seo" "cdn"}}/js/bootstrap.min.js"></script>

src/web/templates/common/weixin.html

@@ -4,4 +4,4 @@
   if (typeof window._jyGlobal !== 'object') { window._jyGlobal = {} }
   try { window._jyGlobal.baseURL = {{Msg "seo" "buryingPointUrl"}} } catch (e) { window._jyGlobal.baseURL = '' }
 </script>
-<script src='{{Msg "seo" "cdn"}}/js/track/track.umd.min.js?v={{Msg "seo" "version"}}'></script>
+<script src='{{Msg "seo" "cdn"}}/common-module/track/j-track.min.js?v={{Msg "seo" "mod_version"}}'></script>