fe / YOHOBUYPC · Commits

Go to a project

Authored by Rock Zhang
Commit 048b209dd05ae19284378157bea6c980cdd0d289 2 parents 48ae3a10 b2003804

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

Inline Side-by-side
Showing 8 changed files with 76 additions and 57 deletions
... ... @@ -63,6 +63,11 @@
//header
{
pageHeader: {
//页面主题标识
boys: true,
girls: true,
kids: true,
lifeStyle: true,
//对应页面有就传，没有就不传
navBack: true,
navTitle: '',
... ...
... ... @@ -40,8 +40,8 @@ var $listNav = $('#list-nav'),
navInfo = {
newest: {
order: 1,
reload: false,
page: 1,
reload: true,
page: 0,
end: false
},
price: {
... ... @@ -355,4 +355,7 @@ $brandHeader.children('.btn-col').bind('tap', function() {
tip.show('网络断开连接了~');
}
});
});
\ No newline at end of file
});
//初始请求最新第一页数据
search();
\ No newline at end of file
... ...
... ... @@ -7,6 +7,22 @@
height: 88rem / $pxConvertRem;
line-height: 88rem / $pxConvertRem;
&.boys {
@include background-image(linear-gradient(#323232, #414141));
}
&.girls {
background: #ff88ae;
}
&.kids {
background: #7ad9f9;
}
&.life-style {
background: #4f4138;
}
.nav-back {
position: absolute;
left: 34rem / $pxConvertRem;
... ...
<div class="good-info" data-id="{{id}}">
<div class="tag-container clearfix">
{{# tags}}
{{# is_new}}
<p class="good-tag new-tag">NEW</p>
{{/ is_new}}
{{# is_advance}}
<p class="good-tag renew-tag">再到着</p>
{{/ is_advance}}
{{# is_discount}}
<p class="good-tag sale-tag">SALE</p>
{{/ is_discount}}
{{# is_yohoood}}
<div class="good-tag yohood-tag"></div>
{{/ is_yohoood}}
{{# is_limited}}
<p class="good-tag limit-tag">限量商品</p>
{{/ is_limited}}
{{/ tags}}
</div>
<div class="good-detail-img">
<a class="good-thumb" href="{{url}}">
<img class="lazy" data-original="{{thumb}}">
</a>
{{# is_soon_sold_out}}
<p class="few-tag">即将售罄</p>
{{/ is_soon_sold_out}}
</div>
<div class="good-detail-text">
<div class="name">
<a href="{{url}}">{{name}}</a>
{{#if .}} {{!-- 剔除值为false的项 --}}
<div class="good-info" data-id="{{id}}">
<div class="tag-container clearfix">
{{# tags}}
{{# is_new}}
<p class="good-tag new-tag">NEW</p>
{{/ is_new}}
{{# is_advance}}
<p class="good-tag renew-tag">再到着</p>
{{/ is_advance}}
{{# is_discount}}
<p class="good-tag sale-tag">SALE</p>
{{/ is_discount}}
{{# is_yohoood}}
<div class="good-tag yohood-tag"></div>
{{/ is_yohoood}}
{{# is_limited}}
<p class="good-tag limit-tag">限量商品</p>
{{/ is_limited}}
{{/ tags}}
</div>
<div class="good-detail-img">
<a class="good-thumb" href="{{url}}">
<img class="lazy" data-original="{{thumb}}">
</a>
{{# is_soon_sold_out}}
<p class="few-tag">即将售罄</p>
{{/ is_soon_sold_out}}
</div>
<div class="price">
<span class="sale-price {{^price}}no-price{{/price}}">￥{{salePrice}}</span>
{{#price}}
<span class="market-price">￥{{.}}</span>
{{/price}}
<div class="good-detail-text">
<div class="name">
<a href="{{url}}">{{name}}</a>
</div>
<div class="price">
<span class="sale-price {{^price}}no-price{{/price}}">￥{{salePrice}}</span>
{{#price}}
<span class="market-price">￥{{.}}</span>
{{/price}}
</div>
</div>
</div>
</div>
{{/if}}
\ No newline at end of file
... ...
... ... @@ -10,7 +10,13 @@
</ul>
<div id="goods-list">
{{> product/goods_container}}
{{# goodsContainer}}
<div class="goods-list {{^show}}hide{{/show}}">
{{# goods}}
{{> good}}
{{/ goods}}
</div>
{{/ goodsContainer}}
</div>
<div id="load-more-info" class="load-more-info">
... ... @@ -19,6 +25,4 @@
</div>
<span class="no-more status hide">没有更多啦</span>
</div>
</div>
\ No newline at end of file
</div>
\ No newline at end of file
... ...
{{#pageHeader}}
<header class="yoho-header">
<header class="yoho-header{{#if boys}} boys{{/if}}{{#if girls}} girls{{/if}}{{#if kids}} kids{{/if}}{{#if lifeStyle}} life-style{{/if}}">
{{#if navBack}}
<a href="javascript:history.go(-1);" class="nav-back"></a>
{{/if}}
... ...
{{# goodsContainer}}
<div class="goods-list {{^show}}hide{{/show}}">
{{# goods}}
{{> good}}
{{/ goods}}
</div>
{{/ goodsContainer}}
\ No newline at end of file
... ... @@ -82,11 +82,7 @@
</li>
</ul>
<div id="goods-container" class="goods-container">
<div class="new-goods container clearfix">
{{# new}}
{{> good}}
{{/ new}}
</div>
<div class="new-goods container clearfix"></div>
<div class="price-goods container clearfix hide"></div>
<div class="discount-goods container clearfix hide"></div>
... ...