Merge branch 'master' into feature/v4.9.65

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

@@ -49,32 +49,15 @@
     }
     document.getElementsByTagName('head')[0].appendChild(domScript);
   }
-  /* 注册荟聚SDK */
-  function registerClabTarcker (tracker) {
-    if (typeof tracker !== 'undefined' && typeof tracker.track === 'function') {
-      window.clab_tracker = tracker
-    }
+
+  try {
     // 初始化JTrack
     var sdkVersion = 142
     if (window.goTemplateData && window.goTemplateData.version) {
       sdkVersion = window.goTemplateData.version
     }
     loadJS('/common-module/track/j-track.min.js?v=' + sdkVersion)
-  }
-  // 荟聚
-  function initClabTracker () {
-    var trackURL = "https://cbe.huiju.cool/cbe/collect?tid=281617177&at=0&h=web"
-    /* 判断环境 */
-    if (typeof System !== 'undefined' && typeof System.import === 'function') {
-      System.import(trackURL).then(registerClabTarcker);
-    } else {
-      loadJS(trackURL, registerClabTarcker)
-    }
-  }
-
-  try {
-    initClabTracker()
   } catch (error) {
-    console.warn('Error: init clab sdk error', error)
+    console.warn('Error: init jy sdk error', error)
   }
 })();

src/web/staticres/css/pc/index.css

@@ -1265,15 +1265,15 @@ cursor: pointer;
 }
 
 #close2x {
-  width: 24px;
-  height: 24px;
   position: absolute;
-  left: 50%;
-  bottom: -40px;
   margin-left: -12px;
   cursor: pointer;
   display: none;
   z-index: 1000;
+  width: 36px;
+  height: 36px;
+  right: -80px;
+  top: 0;
 }
 
 

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

@@ -3,7 +3,7 @@
     <div id="index_tc_svga"></div>
     <div class="tc_button"></div>
   </div>
-  <img src="/images/pc/close-icon.png" id="close2x">
+  <img src="/images/pc/close-white.png" id="close2x">
 </div>
 <div class="tans"></div>
 <div class="live_preheat">