Parcourir la source

积分逻辑更改

tangxijun il y a 5 ans
Parent
commit
c4403a7ffa

Fichier diff supprimé car celui-ci est trop grand
+ 256 - 811
2019专题/1908DOTA2/src/_index.html


+ 26 - 22
2019专题/1908DOTA2/src/modules/page/index.js

@@ -47,57 +47,61 @@ String.prototype.mytrim = function(){
 
 // 随时提issues
 function initTab(){
-
+    var isPc = !/Android|webOS|iPhone|Windows Phone|iPod|BlackBerry|SymbianOS/i.test(window.navigator.userAgent) && !/[\?&]pc(?:[=&].*|$)/.test(window.location.href)
+    console.log(isPc)
     var mtIdOne = 1
     var subIdOne = 1
     var $conTwo = $('.scroe-content-two .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')
+        $conTwo.eq(0).show()
     }else{
-        var $conThree = $('.scroe-h5-content')
-        $conThree.eq(0).show()
+        $conTwo.eq(4).show()
     }
+    $('[data-type=statuList').show()
 
     $('.scroeTwo .nav_item').on('mouseenter',function(){
         $(this).addClass('active').siblings().removeClass('active')
         mtIdOne = $(this).attr('data-mt')
+        if(mtIdOne==1){
+            $('[data-type=statuImg').hide()
+            $('[data-type=statuList').show()
+        }else{
+            $('[data-type=statuImg').show()
+            $('[data-type=statuList').hide()
+        }
         show($conTwo)
     })
+
     $('.scroeTwo .nav_item_sub').hover(function(){
         $(this).addClass('active').siblings().removeClass('active')
         subIdOne = $(this).attr('data-st')
         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){
+        console.log(mtIdOne,subIdOne)
         if(parseInt(mtIdOne) ==1&& parseInt(subIdOne) ==1){
-            $con.eq(0).show().siblings().hide()
+            if(!isPc){
+                console.log('111')
+                $con.eq(4).show().siblings().hide()
+            }else{
+                $con.eq(0).show().siblings().hide()
+            }
         }
         if(parseInt(mtIdOne)==1&&parseInt(subIdOne) ==2){
-            $con.eq(1).show().siblings().hide()
+            if(!isPc){
+                console.log('2222')
+                $con.eq(5).show().siblings().hide()
+            }else{
+                $con.eq(1).show().siblings().hide()
+            }
         }
         if(parseInt(mtIdOne)==2&&parseInt(subIdOne) ==1){
             $con.eq(2).show().siblings().hide()
         }
         if(parseInt(mtIdOne)==2&&parseInt(subIdOne) ==2){
             $con.eq(3).show().siblings().hide()
-            
         }
     }
 }

+ 44 - 53
2019专题/1908DOTA2/src/sass/global.scss

@@ -412,6 +412,7 @@ body{
     }
     .score-nav-sub {
       width: 100%;
+      display: none;
       .nav_item_sub {
         width: 50%;
         line-height: 41px;
@@ -442,10 +443,12 @@ body{
       display: none;
     }
     .score-content {
+        display: none ;
+
       background: url(/src/img/score_background.png) repeat;
       overflow-y: auto;
       position: relative;
-      height:717px;
+      max-height:717px;
       &::-webkit-scrollbar {
         width: 12px;
       }
@@ -617,18 +620,6 @@ 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;
@@ -1136,13 +1127,10 @@ $vari: 750 / 640;
             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{
+    #dw-topbar,.dwCommonFooter,.zt-mod-sidebar,.dw-mini-popup-wrap,.zt-mod-live,.g-zt-adv{
         display: none;
     }
-    .zt-mod-score .scroe-content-three{
-        display: none;
 
-    }
     .team-item-last{
         display: none;
     }
@@ -1499,22 +1487,26 @@ $vari: 750 / 640;
         }
         .score-content{
             width: 1200px;
+            display: none;
             // overflow-x:scroll;
         }
+
         .score-nav-sub{
             .nav_item_sub {
                 span{
                     width: inherit;
                 }
             }
-        }
-        .score-nav-main{
+        }      
+          .score-nav-main{
             height:px2rem(78);
             .nav_item{
+                font-size:px2rem(28);
                 line-height: px2rem(78)
             }
         }
         .score-nav-sub{
+            display: none;
             .nav_item_sub{
                 line-height: px2rem(75);
                 span{
@@ -1539,47 +1531,46 @@ $vari: 750 / 640;
             }
         }
       
-        .scroe-h5-content{
+     
+        .group-box-PC{
             display: none;
         }
-        .scroe-content-h5-box{
-            color:#fff;
-            display: flex;
-            text-align: center;
-            padding:0 15px;
-            li{
-                flex:1;
-                line-height: px2rem(71);
+        .group-box-h5{
+            width:100%;
+            .scroe-content-box{
                 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;
+                padding:0 15px;
+                height:px2rem(71);
+                line-height:px2rem(71);
+                // align-items: center;
+                // justify-content: center;
+                li{
+                    font-size:px2rem(24);
+                    width:auto;
+                    height:px2rem(71);
+                    flex:1;
+                    opacity: 0.4;
+                    img{
+                        display: inline-block;
+                        width:px2rem(40);
+                        height:px2rem(40);
+                        background:#ccc;
+                        margin-right:5px;
+                    }
+                  &:first-child{
+                    flex:2;
+                    text-align: left;
+                  }
+                }
+                &:nth-child(even){
+                    background:#271a44;
+                }
+                &:nth-child(odd){
+                    background: #32264e;
                 }
-              &:first-child{
-                flex:2;
-                justify-content: flex-start;
-
-              }
-            }
-            &:nth-child(even){
-                background:#271a44;
-            }
-            &:nth-child(odd){
-                background: #32264e;
             }
         }
-        .scroe-content-h5-title{
-            background:#271a44 !important;
-        }
     }
-  
-  
 }
 
 .g-tag_panel{

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff