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

2019专题/1906lol自走棋专题/src/modules/page/page1.js

@@ -0,0 +1,8 @@
+$(function(){
+    $('.bread').find('a').hover(function(){
+      $(this).addClass('hoverStyle')
+      console.log($(this))
+    },function(){
+      $(this).removeClass('hoverStyle')
+    })
+  })

2019专题/1906lol自走棋专题/src/modules/page/page2.js

@@ -0,0 +1,8 @@
+$(function(){
+    $('.crumb').find('a').hover(function(){
+        $(this).addClass('hoverStyle')
+        console.log($(this))
+    },function(){
+        $(this).removeClass('hoverStyle')
+    })
+})

2019专题/1906lol自走棋专题/src/page1.html

@@ -116,15 +116,7 @@
   <script id="dw-footer-without-gem" charset="utf-8" src="//pub.dwstatic.com/common/dwFoot/duowanFooter.js?201809"></script><!--ignore-->
 
     <script>
-    $(function(){
-      $('.bread').find('a').hover(function(){
-        $(this).addClass('hoverStyle')
-        console.log($(this))
-      },function(){
-        $(this).removeClass('hoverStyle')
-      })
-    })
-      
+        require('./modules/page/page1.js')
       </script>
 </body>
 </html>    

2019专题/1906lol自走棋专题/src/page2.html

@@ -123,14 +123,8 @@
     <script src="lib/mod.js"></script>
 
     <script>
-        $(function(){
-            $('.crumb').find('a').hover(function(){
-                $(this).addClass('hoverStyle')
-                console.log($(this))
-            },function(){
-                $(this).removeClass('hoverStyle')
-            })
-        })
+    
+        require('./modules/page/page2.js')
       
     </script>
     <script id="dw-footer-without-gem" charset="utf-8" src="//pub.dwstatic.com/common/dwFoot/duowanFooter.js?201809"></script><!--ignore-->

2019专题/1906魔域专题/src/_index.html

@@ -42,7 +42,7 @@
                 </li>
             </ul>
         </div>
-        <div class="mod-primary" style="background-image: url(/src/img/bg-primary6-30.jpg);">
+        <div class="mod-primary" style="background-image: url(/src/img/bg-primary6-30.jpg?2);">
             <canvas id="fireMask"></canvas>
         </div>
         <div class="mod-ka">
@@ -137,9 +137,9 @@
                                         <div class="lingqu-wrap clearfix" data-giftid="202741">
                                             <div class="linqu-sn" >
                                                 <input type="text" readonly />
-                                                <span class="btn-copy scale-btn">复制</span>
+                                                <span class="btn-copy">复制</span>
                                             </div>
-                                            <div class="btn-lingqu scale-btn" data-gold="0">立即领取</div>
+                                            <div class="btn-lingqu" data-gold="0">立即领取</div>
                                         </div>
                                     </div>
                                 </div>
@@ -194,7 +194,7 @@
                                                 <input type="text" readonly/>
                                                 <span class="btn-copy">复制</span>
                                             </div>
-                                            <div class="btn-lingqu scale-btn" data-gold="2">立即领取</div>
+                                            <div class="btn-lingqu" data-gold="2">立即领取</div>
                                         </div>
                                     </div>
                                 </div>

2019专题/1906魔域专题/src/sass/global.scss

@@ -166,7 +166,7 @@ body {
         }
     }
     .mod-primary {
-        height: 1007px;
+        height: 924px;
         overflow: hidden;
         background: top center no-repeat;
     }
@@ -280,7 +280,7 @@ body {
         .gift-wrap {
             padding: 12px 20px 0;
             .g-wrap {
-                height: 250px;
+                height: 245px;
                 margin-top: 7px;
                 border-top: 1px #68150A solid;
                 &:first-child {
@@ -322,7 +322,6 @@ body {
             width: 440px;
             margin: 0 auto;
             position: relative;
-            margin-bottom: 8px;
             .btn {
                 position: absolute;
                 width: 25px;
@@ -349,7 +348,7 @@ body {
         }
         .banner-wrap {
             width: 360px;
-            height: 95px;
+            height: 92px;
             margin: 0 auto;
             overflow: hidden;
             ul {
@@ -667,13 +666,17 @@ body {
 
 .btn-lingqu {
     float: left;
-    width: 149px;
-    height: 50px;
+    width: 182px;
+    height: 80px;
     font-size: 0;
     color: transparent;
     background: url(../img/btn-lingqu.png?__sprite) center no-repeat;
     margin-top: 1px;
+    transition: transform 0.3s;
     cursor: pointer;
+    &:hover {
+        transform: translate(0, -3px);
+    }
 }
 
 
@@ -854,10 +857,10 @@ body {
 }
 
 .lingqu-wrap {
-    height: 44px;
-    margin-left: 178px;
+    height: 80px;
+    margin-left: 157px;
     &.is-active {
-        margin-left: 95px;
+        margin-left: 86px;
         .linqu-sn {
             display: block;
         }
@@ -886,19 +889,23 @@ body {
             background: transparent;
             display: block;
             float: left;
-            margin-top: 4px;
+            margin-top: 20px;
         }
         .btn-copy {
             @include inline-block();
-            width: 101px;
-            height: 50px;
+            width: 110px;
+            height: 80px;
             font-size: 0;
             color: transparent;
             background: url(../img/btn-copy.png?__sprite) no-repeat;
             display: block;
             float: left;
             margin-left: 10px;
+            transition: transform 0.3s;
             cursor: pointer;
+            &:hover {
+                transform: translate(0, -3px);
+            }
         }
     }
     p {