feat/task1-c-wallet
devil_gong 2018-10-11 10:52:34 +08:00
parent adf8d404b2
commit 857416a501
7 changed files with 22 additions and 23 deletions

View File

@ -1,5 +1,9 @@
<include file="Public/Header" />
<!-- nav start -->
<include file="Public/Nav" />
<!-- nav end -->
<!-- header top nav -->
<include file="Public/HeaderTopNav" />
@ -124,10 +128,6 @@
</notempty>
</div>
<!-- nav start -->
<include file="Public/Nav" />
<!-- nav end -->
<!-- footer start -->
<include file="Public/Footer" />
<!-- footer end -->

View File

@ -1,5 +1,9 @@
<include file="Public/Header" />
<!-- nav start -->
<include file="Public/Nav" />
<!-- nav end -->
<!-- header top nav -->
<include file="Public/HeaderTopNav" />
@ -49,10 +53,6 @@
</notempty>
</div>
<!-- nav start -->
<include file="Public/Nav" />
<!-- nav end -->
<!-- footer start -->
<include file="Public/Footer" />
<!-- footer end -->

View File

@ -147,7 +147,7 @@
</div>
<div class="theme-signin-right">
<div class="img-info">
<img src="__PUBLIC__/Home/{{$default_theme}}/Images/songzi.jpg" />
<img src="{{$goods.images}}" />
</div>
<div class="text-info">
<span class="price-now">¥{{$goods.price}}</span>

View File

@ -1,5 +1,9 @@
<include file="Public/Header" />
<!-- nav start -->
<include file="Public/Nav" />
<!-- nav end -->
<!-- header top nav -->
<include file="Public/HeaderTopNav" />
@ -190,10 +194,6 @@
</if>
</div>
<!-- nav start -->
<include file="Public/Nav" />
<!-- nav end -->
<!-- footer start -->
<include file="Public/Footer" />
<!-- footer end -->

View File

@ -1,5 +1,9 @@
<include file="Public/Header" />
<!-- nav start -->
<include file="Public/Nav" />
<!-- nav end -->
<!-- header top nav -->
<include file="Public/HeaderTopNav" />
@ -28,10 +32,6 @@
<!-- content end -->
</div>
<!-- nav start -->
<include file="Public/Nav" />
<!-- nav end -->
<!-- footer start -->
<include file="Public/Footer" />
<!-- footer end -->

File diff suppressed because one or more lines are too long

View File

@ -89,18 +89,17 @@ $(function()
{
if($(window).width() <= 625)
{
var scroll = $(document).scrollTop();
if($('.nav-search').length > 0)
if($('.nav-search').length > 0 && ($('.nav-search').css('display') || null) == 'block')
{
if(scroll > 40)
if($(document).scrollTop() > 0)
{
$('.nav-search').css('position','fixed');
$('body').css('padding-top','45px');
} else {
$('.nav-search').css('position','relative');
$('body').css('padding-top','0');
}
}
}
});
$(window).resize(function()