Merge branch 'dev/v4.8.49_zsy' of qmx/jy into feature/v4.8.49

src/web/staticres/public-pc/js/header-nav.js

@@ -182,7 +182,7 @@ $(function(){
     var l = $(this).find('.jynav-list').length;
     if(l >= 0){
       //  隐藏消息悬浮窗
-      $('#public-nav .iner .jynav li').find('.jy-list-msg').hide()
+      // $('#public-nav .iner .jynav li').find('.jy-list-msg').hide()
       $(this).find('.jynav-list').toggle()
       $(this).find('.msg-img1').hide()
       $(this).find('.msg-img2').show()
@@ -202,8 +202,8 @@ $(function(){
     setNavTheme(curTheme,1)
     docScroll()
 
-    //  隐藏消息悬浮窗
-    $('#public-nav .iner .jynav li').find('.jy-list-msg').show()
+    //  展示消息悬浮窗
+    // $('#public-nav .iner .jynav li').find('.jy-list-msg').show()
 
     $("#public-nav .iner .jynav li").find('.jynav-list').hide()
     $(this).find('.msg-img1').show()
@@ -358,7 +358,7 @@ function fixScaleScroll () {
   })
 }
 
-// 更改页面head-title, meta-keywords、meta-description  
+// 更改页面head-title, meta-keywords、meta-description
 // 页面SEO(TDK)
 function seoTdkUpdate (title, keywords, description) {
   // console.log(goTemplateData, goTemplateData.inIframe);
@@ -369,7 +369,7 @@ function seoTdkUpdate (title, keywords, description) {
   _title = _headDom.getElementsByTagName("title")[0]
   _meta = _headDom.getElementsByTagName("meta")
   _title.innerText = title
-  for (var index = 0; index < _meta.length; index++) { 
+  for (var index = 0; index < _meta.length; index++) {
     switch (_meta[index].name.toLowerCase()) {
       case 'keywords':
         _meta[index].content = keywords
@@ -380,5 +380,5 @@ function seoTdkUpdate (title, keywords, description) {
       default:
         break
     }
-  } 
-}
+  }
+}

src/web/templates/common/pchead.html

@@ -125,19 +125,20 @@
                    class="jy-nav-msg msg-img2" alt=""/>
               <span class="tips" id="tips"></span>
             </a>
-            <div class="jy-list-msg msg-style">
-              <div class="msg-par">
-                <div class="m-head">
-                  <span class="spa">消息中心<i>（ <em id="noNum">0</em> 条未读 ）</i></span>
-                  <img class="imgs"
-                       src='{{Msg "seo" "cdn"}}/images/pc/guan.png?v={{Msg "seo" "version"}}'>
-                  <img id="imgActive" class="imgs1"
-                       src='{{Msg "seo" "cdn"}}/images/pc/guan_active.png?v={{Msg "seo" "version"}}'>
-                </div>
-                <div class="m-ul"></div>
-                <div class="m-foot"><a href="/swordfish/frontPage/messageCenter/sess/index">查看全部</a></div>
-              </div>
-            </div>
+                <!-- 未读消息弹窗-->
+<!--            <div class="jy-list-msg msg-style">-->
+<!--              <div class="msg-par">-->
+<!--                <div class="m-head">-->
+<!--                  <span class="spa">消息中心<i>（ <em id="noNum">0</em> 条未读 ）</i></span>-->
+<!--                  <img class="imgs"-->
+<!--                       src='{{Msg "seo" "cdn"}}/images/pc/guan.png?v={{Msg "seo" "version"}}'>-->
+<!--                  <img id="imgActive" class="imgs1"-->
+<!--                       src='{{Msg "seo" "cdn"}}/images/pc/guan_active.png?v={{Msg "seo" "version"}}'>-->
+<!--                </div>-->
+<!--                <div class="m-ul"></div>-->
+<!--                <div class="m-foot"><a href="/swordfish/frontPage/messageCenter/sess/index">查看全部</a></div>-->
+<!--              </div>-->
+<!--            </div>-->
           </li>
           <li class="slider"></li>
         </ul>
@@ -171,7 +172,8 @@
 
 <!-- 浮漂消息公共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/ad/js/msgbuoy.js?v={{Msg "seo" "version"}}'></script>-->
 <script>
   var Activedatastring = 'register'
   var ActivedataType = 'jy-pc-'+ Activedatastring+ '-login'