Commit 6944a1f4 by murphywuwu

up

parent 1f466c71
...@@ -1492,29 +1492,29 @@ ...@@ -1492,29 +1492,29 @@
if (realWidth >= windowW && realWidth >= realHeight) { if (realWidth >= windowW && realWidth >= realHeight) {
if(mH>windowH){ if(mH>windowH){
image.attr('style','max-height:'+windowH+'px;width:auto'); image.attr('style','max-height:'+windowH+'px;width:auto');
$('.slick-prev,.slick-next').css({ // $('.slick-prev,.slick-next').css({
'margin-top':Top, // 'margin-top':Top,
'height':windowH // 'height':windowH
}) // })
}else{ }else{
image.attr('style','margin-top:'+Top+'max-width:'+windowW+'px;height:auto'); image.attr('style','margin-top:'+Top+'max-width:'+windowW+'px;height:auto');
$('.slick-prev,.slick-next').css({ // $('.slick-prev,.slick-next').css({
'margin-top':Top, // 'margin-top':Top,
'height':realHeight // 'height':realHeight
}) // })
} }
}else if(realHeight >= windowH && realWidth < realHeight ){//如果小于浏览器的宽度按照原尺寸显示 }else if(realHeight >= windowH && realWidth < realHeight ){//如果小于浏览器的宽度按照原尺寸显示
image.attr('style','max-height:'+windowH+'px;width:auto;'); image.attr('style','max-height:'+windowH+'px;width:auto;');
$('.slick-prev,.slick-next').css({ // $('.slick-prev,.slick-next').css({
'margin-top':Top, // 'margin-top':Top,
'height':windowH // 'height':windowH
}) // })
}else{ }else{
image.attr('style','margin-top:'+Top+'px;width:auto; height:auto;'); image.attr('style','margin-top:'+Top+'px;width:auto; height:auto;');
$('.slick-prev,.slick-next').css({ // $('.slick-prev,.slick-next').css({
'margin-top':Top, // 'margin-top':Top,
'height':realHeight // 'height':realHeight
}) // })
} }
} }
}; };
......
...@@ -67,6 +67,36 @@ To change `display` (e.g. `display: inline-block;`), we suggest using a common C ...@@ -67,6 +67,36 @@ To change `display` (e.g. `display: inline-block;`), we suggest using a common C
height: 26px; height: 26px;
} }
html, body {
height: 100%;
}
.am-container {
height: 100%;
}
.am-slider {
height: 100%;
}
.slider {
position: relative;
height: 100%;
}
.slick-arrow {
position: absolute;
transform: translateY(-50%) !important;
top: 50% !important;
margin-top: 0 !important;
height: 100% !important;
}
.slick-list {
height: 100% !important;
}
.slick-track {
height: 100% !important;
}
.slick-slide {
height: 100% !important;
max-height: 100% !important;
}
*, *,
*:after, *:after,
*:before { *:before {
......
...@@ -96,15 +96,6 @@ ...@@ -96,15 +96,6 @@
</ul> </ul>
</div> </div>
</div> </div>
<!--回到顶部-->
<div data-am-widget="gotop" class="am-gotop am-gotop-fixed" >
<a href="#top" title="回到顶部">
<span class="am-gotop-title">回到顶部</span>
<i class="am-gotop-icon am-icon-chevron-up"></i>
</a>
</div>
<script> <script>
/*轮播图配置*/ /*轮播图配置*/
$('.lazy').slick({ $('.lazy').slick({
......
...@@ -59,7 +59,7 @@ $(function(){ ...@@ -59,7 +59,7 @@ $(function(){
/*图片懒加载*/ /*图片懒加载*/
$("img.lazy").lazyload({ $("img.lazy").lazyload({
placeholder : "../images/transparent.gif", placeholder : "./images/transparent.gif",
threshold:100, threshold:100,
effect: "fadeIn", effect: "fadeIn",
event: 'scroll', event: 'scroll',
......
...@@ -54,9 +54,6 @@ ...@@ -54,9 +54,6 @@
</ul> </ul>
</div> </div>
</div> </div>
<% include ./components/goTop.html %>
<script> <script>
/*轮播图配置*/ /*轮播图配置*/
$('.lazy').slick({ $('.lazy').slick({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment