Authored by ccbikai

Merge branch 'feature/sale' into release/4.8

... ... @@ -9,7 +9,7 @@
<ul id="list-nav" class="list-nav clearfix">
{{# sortData}}
<li {{#if @first}} class="active" {{/if}} data-id="{{sortId}}" data-allSub="{{allSub}}">
<li data-id="{{sortId}}" data-allSub="{{allSub}}">
<a href="javascript:void(0);">
<span class="span-test">{{sortName}}</span>
</a>
... ... @@ -35,7 +35,7 @@
</div>
</div>
{{/ sub}}
</div>
</div>
{{/ nav}}
<div id="goods-container" class="goods-container">
... ...
... ... @@ -16,7 +16,7 @@ module.exports = {
siteUrl: '//m.yohobuy.com',
domains: {
api: 'http://devapi.yoho.cn:58078/',
service: 'http://devservice.yoho.cn:28077/'
service: 'http://devservice.yoho.cn:58077/'
},
useOneapm: false,
useCache: false,
... ...
... ... @@ -30,6 +30,7 @@
</header>
{{#if saleNav.list}}
<div class="sale-nav-select">
<span class="arrow"></span>
{{#each saleNav.list}}
<a href="{{url}}">{{title}}</a>
{{/each}}
... ...
... ... @@ -515,13 +515,25 @@ $(window).scroll(function() {
});
// 初始请求最新第一页数据
search([{
type: 'breakSort',
id: $('.coat').data('id')
}, {
type: 'breakSize',
id: $('.coat').data('allsub')
}]);
$(function() {
var type = window.queryString.type;
var selector;
// type 1: 上装, 3:下装, 6: 鞋装
if (type && type !== '1') {
selector = type === '3' ? '.trouser' : '.shoes';
} else {
selector = '.coat';
}
$('#list-nav').find(selector).addClass('active').siblings().removeClass('active');
search([{
type: 'breakSort',
id: $(selector).data('id')
}, {
type: 'breakSize',
id: $(selector).data('allsub')
}]);
});
$listNav.on('touchstart', 'li', function() {
$(this).addClass('bytouch');
... ...
... ... @@ -20,11 +20,9 @@
text-align: center;
font-size: 28px;
line-height: 80px;
transform: scale(1, 0);
transform-origin: top;
transition: all 300ms;
display: none;
&:before {
.arrow {
position: absolute;
top: -10px;
right: 30px;
... ... @@ -36,7 +34,7 @@
}
&.show {
transform: scale(1, 1);
display: block;
}
a {
... ... @@ -56,8 +54,12 @@
background-color: #f0f0f0;
.thumb-row {
padding-top: 10px;
padding-top: 25px;
padding-bottom: 0;
.thumb-row-box {
margin-top: 10px;
}
}
.list-nav,
... ... @@ -71,14 +73,11 @@
.vip-floor {
padding-bottom: 30px;
border-bottom: 1px solid #e0e0e0;
.good-info {
margin-bottom: 20px;
}
.tag-container {
display: none;
}
}
.list-nav {
... ...