Merge branch 'master' into feature/v4.8.51

src/web/staticres/common-module/message-tip/js/msgbuoy.js

@@ -72,17 +72,17 @@ var getMsgBuoyActive = {
 
                   </div>
                 </div>`
-      var scanDOM = $(scanHTML)
-      this.floatDOM = scanDOM.show()
-      scanDOM.find('#msg_content').html(`<span class="text-content">${textmas}</span>`)
-      if (this.platform === 'pc') {
-        $('#public-nav .iner').append(scanDOM)
-      } else if (this.platform === 'work_bench') {
-        // 插入节点
-        $('.el-header > .navbar-group').append(scanDOM)
-      } else {
-        $('body').append(scanDOM)
-      }
+    var scanDOM = $(scanHTML)
+    this.floatDOM = scanDOM.show()
+    scanDOM.find('#msg_content').html(`<span class="text-content">${textmas}</span>`)
+    if (this.platform === 'pc') {
+      $('#public-nav .iner').append(scanDOM)
+    } else if (this.platform === 'work_bench') {
+      // 插入节点
+      $('.el-header > .navbar-group').append(scanDOM)
+    } else {
+      $('body').append(scanDOM)
+    }
     // 初始化样式表
     this.createStyle()
     // 初始化监听事件
@@ -223,10 +223,10 @@ var getMsgBuoyActive = {
     }
 
     var content = floatDOM.find('.msg_content')[0],
-        box = floatDOM[0],
-        contentWidth = content.offsetWidth,
-        boxWidth = box.offsetWidth
-        box.style.setProperty('animation', '5s')
+      box = floatDOM[0],
+      contentWidth = content.offsetWidth,
+      boxWidth = box.offsetWidth
+    box.style.setProperty('animation', '5s')
 
     var _this = this
     if (!contentWidth || !boxWidth) {
@@ -389,13 +389,13 @@ var getMsgBuoyActive = {
   // 判断平台环境，用于定位样式
   platformOS: function () {
     let ua = navigator.userAgent || window.navigator.userAgent,
-    IsWeChatBrowser = ua.toLowerCase().indexOf('micromessenger') !== -1,
-    androidOrIOS = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(ua),
-    isAndroid = /(?:Android)/.test(ua),
-    isPad = /(?:iPad|PlayBook)/.test(ua) || (isAndroid && !/(?:Mobile)/.test(ua)),
-    isPhone = /(?:iPhone)/.test(ua) && !isPad,
-    isPc = !isPhone && !isAndroid && !IsWeChatBrowser && !androidOrIOS,
-    iswork_bench = /work-bench|dashboard|workspace/i.test(location.href)
+      IsWeChatBrowser = ua.toLowerCase().indexOf('micromessenger') !== -1,
+      androidOrIOS = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(ua),
+      isAndroid = /(?:Android)/.test(ua),
+      isPad = /(?:iPad|PlayBook)/.test(ua) || (isAndroid && !/(?:Mobile)/.test(ua)),
+      isPhone = /(?:iPhone)/.test(ua) && !isPad,
+      isPc = !isPhone && !isAndroid && !IsWeChatBrowser && !androidOrIOS,
+      iswork_bench = /work-bench|dashboard|workspace/i.test(location.href)
 
     if (IsWeChatBrowser) {
       return 'wx'

src/web/templates/common/pchead.html

@@ -204,8 +204,7 @@
 <!-- 浮漂消息公共js方法 -->
 <!-- defer表示最后执行 -->
 <!--不展示强推消息-->
-<script defer src='{{Msg "seo" "cdn"}}/common-module/ad/js/msgbuoy.js?v={{Msg "seo" "version"}}'></script>
-<!--<script defer src='{{Msg "seo" "cdn"}}/common-module/message-tip/js/msgbuoy.js?v={{Msg "seo" "version"}}'></script>-->
+<script defer src='{{Msg "seo" "cdn"}}/common-module/message-tip/js/msgbuoy.js?v={{Msg "seo" "version"}}'></script>
 <script>
   var Activedatastring = 'register'
   var ActivedataType = 'jy-pc-'+ Activedatastring+ '-login'