Merge branch '2019zt' of http://svn.ouj.com:3000/FED/dwweb-pc into 2019zt

2019专题/1908DOTA2/src/modules/page/index.js

@@ -47,7 +47,6 @@ String.prototype.mytrim = function(){
 
 // 随时提issues
 function initTab(){
-    var $str = ""
     // $(".scroeOne").on("mouseenter",".nav",function(){
     //     $(".scroeOne .score-content").addClass("hide").removeClass("show")
     //     $(this).addClass("active").siblings().removeClass("active")
@@ -70,11 +69,21 @@ function initTab(){
     //     $str = ""
     // })
     console.log($('.scroeTwo .nav_item'))
-    var mtIdOne = 0
-    var subIdOne = 0
+    var mtIdOne = 1
+    var subIdOne = 1
     var $conTwo = $('.scroe-content-two .score-content')
     var $conOne = $('.scroe-content-one .score-content')
 
+    var isPc = !/Android|webOS|iPhone|Windows Phone|iPod|BlackBerry|SymbianOS/i.test(window.navigator.userAgent) && !/[\?&]pc(?:[=&].*|$)/.test(window.location.href)
+    if(isPc){
+
+        var $conThree = $('.scroe-content-three .score-content')
+    }else{
+        var $conThree = $('.scroe-h5-content')
+        $conThree.eq(0).show()
+
+    }
+
     $('.scroeOne .nav_item').on('mouseenter',function(){
         $(this).addClass('active').siblings().removeClass('active')
         mtIdOne = $(this).attr('data-mt')
@@ -98,19 +107,35 @@ function initTab(){
         show($conTwo)
     })
 
+    $('.scroeThree .nav_item').on('mouseenter',function(){
+        $(this).addClass('active').siblings().removeClass('active')
+        mtIdOne = $(this).attr('data-mt')
+        
+        show($conThree)
+    })
+    $('.scroeThree .nav_item_sub').hover(function(){
+        $(this).addClass('active').siblings().removeClass('active')
+        subIdOne = $(this).attr('data-st')
+        show($conThree)
+    })
+
+
 
     function show($con){
-        if(mtIdOne==1&&subIdOne ==1){
+        console.log(mtIdOne,subIdOne)
+        console.log($con)
+        if(parseInt(mtIdOne) ==1&& parseInt(subIdOne) ==1){
             $con.eq(0).show().siblings().hide()
         }
-        if(mtIdOne==1&&subIdOne ==2){
+        if(parseInt(mtIdOne)==1&&parseInt(subIdOne) ==2){
             $con.eq(1).show().siblings().hide()
         }
-        if(mtIdOne==2&&subIdOne ==1){
+        if(parseInt(mtIdOne)==2&&parseInt(subIdOne) ==1){
             $con.eq(2).show().siblings().hide()
         }
-        if(mtIdOne==2&&subIdOne ==2){
+        if(parseInt(mtIdOne)==2&&parseInt(subIdOne) ==2){
             $con.eq(3).show().siblings().hide()
+            
         }
     }
 }
@@ -147,7 +172,6 @@ var V = {
 
         for(var i=0; i<len; i++){
             nextTop = itemTop[i+1];
-           
             if( itemTop[i] <= scrollTop && scrollTop <= nextTop){
                 $sidebarList.eq(i).siblings().find("a").removeClass("active");
                 $sidebarList.eq(i).find("a").addClass("active");
@@ -165,7 +189,6 @@ var C = {
         C.initRankTag()
         C.initTeam()
         C.initWordLimit()
-        initNav()
     },
     initRankTag : function(){
         new Tag('.rankMainTag')

2019专题/1908DOTA2/src/sass/global.scss

@@ -58,7 +58,7 @@ body{
     width: 1136px;
     margin: 0 auto;
 }
-.team-item-last-h5{
+.team-item-last-h5,.scroe-content-h5-box{
     display: none;
 }
 .zt-mod_hd{
@@ -443,9 +443,9 @@ body{
     }
     .score-content {
       background: url(/src/img/score_background.png) repeat;
-      overflow-y: scroll;
+      overflow-y: auto;
       position: relative;
-      height: 717px;
+      height:717px;
       &::-webkit-scrollbar {
         width: 12px;
       }
@@ -616,9 +616,68 @@ body{
         }
       }
     }
-  }
 
+    .scroe-content-three{
+        color:#fff;
+        max-height:717px;
+        .score-content{
+            width:100%;
+            max-height:717px;
+            height:auto;
+            overflow-y: auto;
+        }
+
+    }
+
+    .scroe-content-box{
+        height:78px;
+        line-height:78px;
+        color:#fff;
+        text-align: center;
+        li{
+            float:left;
+            width:120px;
+            font-size:16px;
+            img{
+                vertical-align: middle;
+                padding-right:5px;
+            }
+            border-bottom:1px solid rgba(255,255,255,0.01);
+            @include opacity(0.4);
+            &:nth-child(1){
+             @include opacity(0.7);
+            }
+          
+        }
+      
+        .success{
+            color:#57DA0F;
 
+        }
+        .fail{
+            color:#FF0000;
+        }
+      
+    }
+    .scroe-content-info{
+        &:hover{
+            background:#000;
+            li{
+                color:#fff;
+                opacity: 1;
+            }
+           
+        }
+    }
+    .scroe-content-title{
+        color:#fff;
+        li{
+            font-size: 18px;
+            font-weight: bold;
+        }
+        background:#3e3359;
+    }
+  }
 .zt-mod-intro{
     .intro-wrap{
         position: relative;
@@ -1064,21 +1123,25 @@ $vari: 750 / 640;
       width:px2rem(750);
       margin:0;
     }
-      .zt-title{
-          position: absolute;
-          z-index:222;
-          left:0;
-          .big-title{
-              width:px2rem(640);
-              height:px2rem(184);
-              display: block;
-              background:url("/src/img/big-title.png")no-repeat center ;
-   
-             background-size: cover;
-          }
-      }
-    #dw-topbar,.dwCommonFooter,.zt-mod-sidebar,.dw-mini-popup-wrap,.zt-mod-live,.g-zt-adv{
+    .zt-title{
+        position: absolute;
+        z-index:222;
+        left:0;
+        .big-title{
+            width:px2rem(640);
+            height:px2rem(184);
+            display: block;
+            background:url("/src/img/big-title.png")no-repeat center ;
+
+            background-size: cover;
+        }
+    }
+    #dw-topbar,.dwCommonFooter,.zt-mod-sidebar,.dw-mini-popup-wrap,.zt-mod-live,.g-zt-adv,.scroe-content-box,.scroe-content-three{
+        display: none;
+    }
+    .zt-mod-score .scroe-content-three{
         display: none;
+
     }
     .team-item-last{
         display: none;
@@ -1452,8 +1515,48 @@ $vari: 750 / 640;
                 }
             }
         }
+      
+        .scroe-h5-content{
+            display: none;
+        }
+        .scroe-content-h5-box{
+            color:#fff;
+            display: flex;
+            text-align: center;
+            li{
+                flex:1;
+                line-height: px2rem(71);
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                opacity: 0.4;
+                img{
+                    display: inline-block;
+                    width:px2rem(40);
+                    height:px2rem(40);
+                    background:#ccc;
+                    margin-right:5px;
+                }
+              &:first-child{
+                flex:2;
+                margin-left:px2rem(30);
+                justify-content: flex-start;
+
+              }
+            }
+            &:nth-child(even){
+                background:#271a44;
+            }
+            &:nth-child(odd){
+                background: #32264e;
+            }
+        }
+        .scroe-content-h5-title{
+            background:#271a44 !important;
+        }
     }
   
+  
 }
 
 .g-tag_panel{