2
0

4 Commits 12bea4855d ... f7925c52b0

Autor SHA1 Mensagem Data
  Eechon f7925c52b0 Merge branch '2018zt' of http://svn.ouj.com:3000/FED/dwweb-pc into 2018zt há 6 anos atrás
  Eechon e4770b2299 球球大作战比赛页面样式 há 6 anos atrás
  Eechon 95a64db2b4 Merge branch '2018zt' of http://svn.ouj.com:3000/FED/dwweb-pc into 2018zt há 6 anos atrás
  Eechon 94b46a9f99 c há 6 anos atrás

+ 1 - 0
2017专题/幻想全明星/src/sass/global.scss

@@ -71,6 +71,7 @@ a {
 
 
 .hide {
+    
     display: none;
 }
 

+ 2 - 1
2018专题/微剧院官网/src/sass/global.scss

@@ -50,7 +50,7 @@ a{
     color: #FFFFFF;
     font-size: 18px;
     line-height: 50px;
-    @include gradient(rgba(0,0,0,1),rgba(0,0,0,0))
+    @include gradient(rgba(0,0,0,1),rgba(0,0,0,0));
     .inner{
         height: 100%;
     }
@@ -388,6 +388,7 @@ a{
     z-index: 999;
     bottom: 50px;
     right: 40px;
+    z-index: 99;
     .list-rel{
         li{
             width: 140px;

+ 3 - 1
2018专题/球球大作战比赛专题/fis-conf.js

@@ -128,4 +128,6 @@ fis.media('prod').match('*.{jpg,png,jpeg,gif,css,scss,js,woff,ttf,svg,eot}', {
     useHash: true
 }).match('sass/(**.png)', {
     release: version + 'img/sprite/$1'
-});
+}).match('*.{js,css,png,jpg,gif,swf}', {
+    useHash: true
+})

+ 5 - 135
2018专题/球球大作战比赛专题/src/_index.html

@@ -16,10 +16,14 @@
     <base target="_blank">
 
     <style>
-        .zt-mod-primary {
+        .o-wrap{
             background-image: url(/src/img/bg-primary.jpg);
         }
 
+       /*  .zt-mod-primary {
+            background-image: url(/src/img/bg-primary.jpg);
+        } */
+
         .bg2 {
             background: url(/src/img/bg2.jpg) center top no-repeat;
         }
@@ -64,140 +68,6 @@
                 </div>
             </div>
         </div>
-        <!-- <div class="zt-mod-schedule pt-30" id="schedule">
-            <div class="g-zt-inner">
-                <div class="zt-mod_hd">
-                    <h2>赛程安排</h2>
-                </div>
-                <div class="zt-mod_bd">
-                    <div class="zt-ui-carousel" data-role="carousel-score" data-widget-cid="widget-4">
-                        <div class="zt-ui-carousel__scroller">
-                            <ul class="list-info clearfix" data-switchable-role="content">
-                                <li class="item-info" data-role="active-index">
-                                    <h2>全民贺岁杯八强赛1</h2>
-                                    <p class="info_time">
-                                        <span>02-09</span>
-                                        <span>12:00</span>
-                                        <span class="fr">场次</span>
-                                    </p>
-                                    <div class="info_res">
-                                        <div class="clearfix">
-                                            <div class="rank rank2">
-                                                <i class="icon"></i>
-                                                <div class="cover">
-                                                    <img src="/src/img/tbd.png" alt="">
-                                                </div>
-                                                <p>待定</p>
-                                            </div>
-                                            <div class="rank rank1">
-                                                <i class="icon"></i>
-                                                <div class="cover">
-                                                    <img src="/src/img/tbd.png" alt="">
-                                                </div>
-                                                <p>待定</p>
-                                            </div>
-                                            <div class="rank rank3">
-                                                <i class="icon"></i>
-                                                <div class="cover">
-                                                    <img src="/src/img/tbd.png" alt="">
-                                                </div>
-                                                <p>待定</p>
-                                            </div>
-                                        </div>
-                                        <h3>
-                                            <a href="#">比赛战报</a>
-                                        </h3>
-                                    </div>
-                                    <div class="info-status green">进行中</div>
-                                </li>
-                                <li class="item-info" data-role="active-index">
-                                    <h2>全民贺岁杯八强赛1</h2>
-                                    <p class="info_time">
-                                        <span>02-09</span>
-                                        <span>12:00</span>
-                                        <span class="fr">场次</span>
-                                    </p>
-                                    <div class="info_res">
-                                        <div class="clearfix">
-                                            <div class="rank rank2">
-                                                <i class="icon"></i>
-                                                <div class="cover">
-                                                    <img src="/src/img/tbd.png" alt="">
-                                                </div>
-                                                <p>待定</p>
-                                            </div>
-                                            <div class="rank rank1">
-                                                <i class="icon"></i>
-                                                <div class="cover">
-                                                    <img src="/src/img/tbd.png" alt="">
-                                                </div>
-                                                <p>待定</p>
-                                            </div>
-                                            <div class="rank rank3">
-                                                <i class="icon"></i>
-                                                <div class="cover">
-                                                    <img src="/src/img/tbd.png" alt="">
-                                                </div>
-                                                <p>待定</p>
-                                            </div>
-                                        </div>
-                                        <h3>
-                                            <a href="#">比赛战报</a>
-                                        </h3>
-                                    </div>
-                                    <div class="info-status orange">已结束</div>
-                                </li>
-                                <li class="item-info" data-role="active-index">
-                                    <h2>全民贺岁杯八强赛1</h2>
-                                    <p class="info_time">
-                                        <span>02-09</span>
-                                        <span>12:00</span>
-                                        <span class="fr">场次</span>
-                                    </p>
-                                    <div class="info_res">
-                                        <div class="clearfix">
-                                            <div class="rank rank2">
-                                                <i class="icon"></i>
-                                                <div class="cover">
-                                                    <img src="/src/img/tbd.png" alt="">
-                                                </div>
-                                                <p>待定</p>
-                                            </div>
-                                            <div class="rank rank1">
-                                                <i class="icon"></i>
-                                                <div class="cover">
-                                                    <img src="/src/img/tbd.png" alt="">
-                                                </div>
-                                                <p>待定</p>
-                                            </div>
-                                            <div class="rank rank3">
-                                                <i class="icon"></i>
-                                                <div class="cover">
-                                                    <img src="/src/img/tbd.png" alt="">
-                                                </div>
-                                                <p>待定</p>
-                                            </div>
-                                        </div>
-                                        <h3>
-                                            <a href="#">比赛战报</a>
-                                        </h3>
-                                    </div>
-                                    <div class="info-status grey">未开始</div>
-                                </li>
-                            </ul>
-                        </div>
-                        <span class="btn-prev is-disabled" data-switchable-role="prev">
-                            <i></i>
-                        </span>
-                        <span class="btn-next" data-switchable-role="next">
-                            <i></i>
-                        </span>
-                        <ul class="ui-slide__tags" data-switchable-role="nav"></ul>
-                    </div>
-                </div>
-            </div>
-        </div> -->
-
         <div class="zt-mod-schedule2 pt-30" id="schedule">
             <div class="g-zt-inner">
                 <div class="zt-mod_hd">

BIN
2018专题/球球大作战比赛专题/src/img/bg-primary.jpg


BIN
2018专题/球球大作战比赛专题/src/img/bg2.jpg


BIN
2018专题/球球大作战比赛专题/src/img/bg3.jpg


BIN
2018专题/球球大作战比赛专题/src/img/icon-next.png


BIN
2018专题/球球大作战比赛专题/src/img/icon-prev.png


BIN
2018专题/球球大作战比赛专题/src/img/pic-nav.png


BIN
2018专题/球球大作战比赛专题/src/img/pic-sidebar.png


+ 2 - 2
2018专题/球球大作战比赛专题/src/modules/page/index.js

@@ -129,12 +129,12 @@ var C = {
             return;            
         }
         $el.niceScroll({
-            cursorcolor: "#0b2b55",
+            cursorcolor: "#255655",
             cursorwidth: "10",
             cursorborder: "none", 
             cursorborderradius: "5px", // border radius in pixel for cursor
             autohidemode: false,
-            background : "#040e1c",
+            background : "#111413",
             railpadding : {
                 top: 0, right: 2, left: 2, bottom: 0
             }

+ 41 - 29
2018专题/球球大作战比赛专题/src/sass/global.scss

@@ -3,7 +3,7 @@ $yahei: "Microsoft YaHei",
 SimHei,
 sans-serif;
 $borderColor :#15335e;
-$contBgColor: #061529;
+$contBgColor: #161a19;
 $titleFont: PingFang sc,"Helvetica Neue",Helvetica,Tahoma,Arial,"Liberation Sans","Hiragino Sans GB","Source Han Sans CN","Source Han Sans SC","Microsoft YaHei","Wenquanyi Micro Hei","WenQuanYi Zen Hei","ST Heiti",SimHei,"WenQuanYi Zen Hei Sharp",sans-serif;
 
 @import "lego/base";
@@ -20,7 +20,7 @@ html {
 body{
     font-size: 12px;
     min-width: 1200px;
-    background: #0d2444;
+    background: #050506;
 }
 
 .clearfix{
@@ -72,7 +72,7 @@ body{
     .link-more{
         float: right;
         font-size: 14px;
-        color: #84ade3;
+        color: #39b8cc;
         &:hover{
             text-decoration: none;
             opacity: 0.8;
@@ -80,13 +80,18 @@ body{
         em{
             font-weight: bold;
             margin-left: 5px;
-            color: #84ade3;
+            color: #39b8cc;
         }
     }
 }
 
+.o-wrap{
+    background-position: center 0;
+    background-repeat: no-repeat;
+}
+
 .zt-mod-primary {
-    padding-top: 630px;
+    padding-top: 675px;
     background-position: center 0;
     background-repeat: no-repeat;
     .sp-nav {
@@ -94,14 +99,14 @@ body{
         text-align: center;
         margin: 0 auto;
         background: $contBgColor;
-        border-top: 2px solid #1d539c;
+        border-top: 2px solid #8dfcee;
         &:before{
             content: "";
             position: absolute;
-            top: -70px;
-            left: 323px;
-            width: 213px;
-            height: 99px;
+            top: -96px;
+            left: 210px;
+            width: 131px;
+            height: 119px;
             background: url(/src/img/pic-nav.png?__sprite) no-repeat;
         }
         ul{
@@ -114,7 +119,7 @@ body{
         a {
             display: block;
             text-align: center;
-            color: #84ade3;
+            color: #39b8cc;
             font-size: 16px;
             outline: none;
             line-height: 88px;
@@ -139,7 +144,7 @@ body{
         width: 255px;
         text-align: center;
         font-size: 14px;
-        color: #84ade3;
+        color: #39b8cc;
         padding: 25px 56px;
         h2{
             color: #f8dd59;
@@ -291,7 +296,7 @@ body{
         width: 255px;
         text-align: center;
         font-size: 14px;
-        color: #84ade3;
+        color: #39b8cc;
         padding: 25px 56px;
         h2{
             color: #f8dd59;
@@ -401,7 +406,7 @@ body{
         a{
             color: #4882cf;
             position: relative;
-            background: #061529;
+            background: #161a19;
             padding: 0 10px;
         }
     }
@@ -547,7 +552,7 @@ body{
         margin: 10px 0 14px;
         text-align: center;
         a{
-            color: #84ade3;
+            color: #39b8cc;
             &:hover{
                 color: #f8dd59;
             }
@@ -586,7 +591,7 @@ body{
         color: #c3c3c3;
     }
     .list-txt__link {
-        color: #84ade3;
+        color: #39b8cc;
         margin-left: 10px;
         margin-right: 5px;
     }
@@ -604,7 +609,7 @@ body{
         color: #90a7c5;
         font-size: 14px;
         line-height: 25px;
-        border-top: 1px dashed #0d2444;
+        border-top: 1px dashed #234942;
         padding: 25px 0 10px;
     }
     .list-intro{
@@ -623,7 +628,7 @@ body{
         }
         p{
             font-size: 14px;
-            color: #84ade3;
+            color: #39b8cc;
             line-height: 50px;
         }
     }
@@ -644,15 +649,15 @@ body{
     background-color: $contBgColor;
     text-align: center;
     color: #ccc;
-    border-top: 2px solid #1d539c;
+    border-top: 2px solid #8dfcee;
     animation: pointFadeInUp .5s infinite .5s alternate;
     &:before{
         content: "";
         position: absolute;
-        top: -70px;
-        left: 20px;
-        width: 75px;
-        height: 80px;
+        top: -104px;
+        left: -25px;
+        width: 163px;
+        height: 105px;
         background: url(/src/img/pic-sidebar.png?__sprite) no-repeat;
     }
     &:after{
@@ -681,7 +686,7 @@ body{
         height: 58px;
         line-height: 58px;
         display: block;
-        color: #84ade3;
+        color: #39b8cc;
         outline: none;
         &.active,&:hover {
             color: #ff6600;
@@ -716,8 +721,8 @@ body{
             display: table;
         }
         thead{
-            background: #0d2444;
-            color: #84ade3;
+            background: #234942;
+            color: #5bb6a1;
             font-size: 14px;
             font-weight: 700;
             height: 30px;
@@ -726,10 +731,13 @@ body{
         tbody{
             line-height: 30px;
             font-size: 14px;
-            color: #84ade3;
+            color: #5bb6a1;
             tr{
+                &:nth-child(odd){
+                    background: #172b2b;
+                }
                 &:nth-child(even){
-                    background: #071931;
+                    background: #1d302d;
                 }
             }
             .cell-2{
@@ -830,7 +838,7 @@ body{
         a{
             display: block;
             outline: none;
-            color: #84ade3;
+            color: #39b8cc;
             &:hover{
                 text-decoration: none;
                 @include opacity(0.8);
@@ -855,6 +863,7 @@ body{
 }
 
 $vari: 750 / 640;
+/* 这个是比例 */
 @function px2rem($size) {
     @return $size / 20 / 2 / $vari+rem;
 }
@@ -869,6 +878,9 @@ $vari: 750 / 640;
         min-width: auto;
         padding-top: 0 !important;
     }
+    .o-wrap{
+        background-size: 100%;
+    }
     #dw-topbar,.dwCommonFooter,.zt-mod-sidebar,.dw-mini-popup-wrap,.zt-mod-live{
         display: none;
     }

+ 15 - 2
2018专题/魔域5月专题/src/modules/page/index.js

@@ -538,21 +538,34 @@ var C = {
 
 
         var $modFlash = $('.mod-flash')
-
+        /* 马丹这里牛逼。用open-mod-flash弄了一个数组一样的东西,通过这个判断触发的是哪个按钮,然后播放对应视频 */
         $('body').on('click', '[open-mod-flash]', function () {
+            /* 给open-mod-flash绑定一个点击事件 正确的是给body绑定一个click,委托给open-mod-flash */
+            /* 这他妈body 又是哪个小饼干?? 是委托机制,暂时不知道为什么要干这种事 干这种事的原因是方便,这样给一个委托,然后后面在创建播放按钮,点击之后都能播放了 */
             var index = $(this).attr('open-mod-flash')
+            /* attr()如果是只有一个名字,是传入属性名;如果参数是名+值(函数),是给属性名设置属性值 */
+            /* index赋值: */
+            /* 这个意思是判断是那一个open-mod-flash,然后让那个show */
             $modFlash.eq(index).show()
+            /* 前面定义的变量,指向mod-flash的class,第index个show  */
         })
         //弹窗视频关闭
         $('body').on('click', '.mod-flash em', function () {
             $(this).closest('.mod-flash').hide()
+            /* 向上找到最近的mod-flash,hide了 */
+            /* closest函数的作用是向上找到最近的一个目标parent元素,close是靠近的意思,st不知道是啥意思 */
         })
 
         //播放视频
         $(".icon-play").click(function () {
             if ($(this).attr('open-mod-flash')) return
-
+            /* 我觉得自定义属性就是单纯的存放值,并没有形成数据结构 */
+            /* 这个click的逻辑是这样的,如果open-mod-flash是true就返回;不然,就执行爸爸hide,叔叔大伯show */
+            /* 这里的return给谁呢? */
             $(this).parent().hide().siblings().show();
+            /* 这tm不是要为难我么 */
+            /* siblings函数查找指定元素的同辈元素 */
+            /* 这里的顺序是什么呢,是parent元素hide了之后,parent的同辈元素show;还是parent元素hide,自己的兄弟元素show */
         })
 
         var modPicIndex = 0,