fe / YOHOBUYPC · Commits

Go to a project

Authored by hf
Commit 3f2aba05d9b395e7889b558de09ee9e0b1f1dd1c 2 parents 3a6072d1 62fa7b79

Merge remote-tracking branch 'origin/develop' into test

Inline Side-by-side
Showing 13 changed files with 205 additions and 336 deletions
framework @ 119c247f
Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2
Subproject commit 119c247f5cf929aa1e059e40609bb16dd6b58f05
... ...
... ... @@ -40,8 +40,8 @@ var $listNav = $('#list-nav'),
navInfo = {
newest: {
order: 1,
reload: true,
page: 0,
reload: false,
page: 1,
end: false
},
price: {
... ...
... ... @@ -59,6 +59,7 @@ var $listNav = $('#list-nav'),
if ($('.swiper-container .swiper-slide').length > 1) {
swiper = new Swiper('.swiper-container', {
lazyLoading: true,
lazyLoadingInPrevNext: true,
loop: true,
autoplay: 3000,
autoplayDisableOnInteraction: false,
... ...
... ... @@ -57,7 +57,7 @@ var $listNav = $('#list-nav'),
end: false
}
},
$pre, //纪录进入筛选前的active项
$pre = $listNav.find('.active'), //纪录进入筛选前的active项，初始为选中项
searching;
$pgc.addClass('hide');
... ... @@ -68,6 +68,7 @@ $('#today a').text(month + '月' + date + '号');
if ($('.swiper-container .swiper-slide').length > 1) {
swiper = new Swiper('.swiper-container', {
lazyLoading: true,
lazyLoadingInPrevNext: true,
loop: true,
autoplay: 3000,
autoplayDisableOnInteraction: false,
... ...
.header {
height: 87rem / $pxConvertRem;
line-height: 87rem / $pxConvertRem;
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, #323232), color-stop(1, #414141));
background-image: -moz-gradient(linear, left top, left bottom, color-stop(0, #323232), color-stop(1, #414141));
background-image: gradient(linear, left top, left bottom, color-stop(0, #323232), color-stop(1, #414141));
position: relative;
.iconfont {
color: #fff;
}
.nav-btn {
position: absolute;
left: 32rem / $pxConvertRem;
top: 0;
bottom: 0;
z-index: 2;
}
.logo {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
text-align: center;
font-size: 56rem / $pxConvertRem;
}
.search-btn {
position: absolute;
right: 32rem / $pxConvertRem;
top: 0;
bottom: 0;
}
}
.girls-wrap .header {
background: #fd307f;
}
.kids-wrap .logo{
font-style: italic;
font-family: "helvetica","Arial","黑体";
font-weight: bold;
color: #fff;
}
\ No newline at end of file
... ... @@ -75,6 +75,14 @@
background: #FF88AE;
}
.kids-wrap .home-header {
background: #7ad9f9;
}
.lifestyle-wrap .home-header {
background: #4f4138;
}
.kids-wrap .logo {
font-style: italic;
font-family: "helvetica","Arial","榛戜綋";
... ...
... ... @@ -20,29 +20,17 @@
background: #fff;
}
}
.discount-nav {
width: 100%;
height: 60rem / $pxConvertRem;
padding: 10rem / $pxConvertRem 0;
background-color: #fff;
}
.discount-nav-item {
box-sizing: border-box;
float: left;
width: 25%;
height: 60rem / $pxConvertRem;
line-height: 60rem / $pxConvertRem;
text-align: center;
color: #ccc;
border-right: 1px solid #ccc;
&.focus {
color: #000;
.banner-top-single{
width: 100%;
height: 240rem / $pxConvertRem;
img {
display: block;
height: 100%;
width: 100%;
}
}
.list-nav {
> li {
float: left;
... ... @@ -112,7 +100,7 @@
vertical-align: middle;
color: #ccc;
font-size: 1.2em;
margin-top: 220px;
margin-top: 160px;
}
.goods-container {
... ...
... ... @@ -3,7 +3,7 @@
.swiper-container {
width: 100%;
height: 310rem / $pxConvertRem;
height: 240rem / $pxConvertRem;
img {
height: 100%;
... ... @@ -20,12 +20,26 @@
background: #fff;
}
}
.newarrival-nav {
.banner-top-single{
width: 100%;
height: 60rem / $pxConvertRem;
padding: 10rem / $pxConvertRem 0;
background-color: #fff;
height: 240rem / $pxConvertRem;
img {
display: block;
height: 100%;
width: 100%;
}
}
.list-nav {
> li {
float: left;
width: 25%;
height: 33px;
line-height: 33px;
text-align: center;
font-size: 14px;
}
a {
display: block;
... ... @@ -34,21 +48,41 @@
height: 100%;
color: #999;
}
.active > a {
border-bottom: 2px solid #000;
color: #000;
.iconfont {
color: #999;
&.cur {
color: #000;
}
}
}
.filter .iconfont {
font-size: 12px;
@include transition(transform 0.1 ease-in);
}
.filter.active .iconfont {
@include rotate(-180deg);
}
}
.newarrival-nav-item {
box-sizing: border-box;
float: left;
width: 25%;
height: 60rem / $pxConvertRem;
line-height: 60rem / $pxConvertRem;
.no-result {
text-align: center;
vertical-align: middle;
color: #ccc;
border-right: 1px solid #ccc;
font-size: 1.2em;
margin-top: 160px;
}
&.focus {
color: #000;
}
.goods-container {
position: relative;
min-height: 440px;
}
}
... ...
{{> layout/header}}
<div class="good-list-page yoho-page">
{{# goodList}}
{{# search}}
<div id="search-input" class="search-input">
<form action={{url}} method="get">
<i class="search-icon iconfont">&#xe60f;</i>
<input type="text" value={{default}} name="query">
<i class="clear-input iconfont hide">&#xe61a;</i>
<button id="search" class="search" type="submit">搜索</button>
</form>
</div>
{{/ search}}
{{# brandWay}}
<div class="brand-way">
<a href={{url}}>
<img class="brand-thumb" src={{thumb}}>
<span>{{name}}</span>
<span class="entry">
进入品牌
<i class="iconfont">&#xe614;</i>
</span>
</a>
</div>
{{/ brandWay}}
{{# brandHome}}
<div id="brand-header" class="brand-header" data-id={{id}}>
<img class="lazy" data-original={{banner}}>
<a class="btn-intro" href="javascript:void(0);">
品牌介绍
</a>
<a class="btn-col" href="javascript:void(0);">
<span class="iconfont">&#xe622;</span>
收藏
</a>
</div>
<div id="intro-box" class="brand-intro-box hide">
<div id="brand-intro" class="brand-intro">
<h2>品牌介绍</h2>
<div class="con">
{{{intro}}}
</div>
<p class="fo">
<span></span>
100%品牌授权正品
</p>
<span class="iconfont close-intro">&#xe623;</span>
</div>
</div>
{{/ brandHome}}
<ul id="list-nav" class="list-nav clearfix">
<li class="new active">
<a href="javascript:void(0);">
最新
<span class="iconfont cur">&#xe616;</span>
</a>
</li>
<li class="price">
<a href="javascript:void(0);">
价格
<span class="icon">
<i class="iconfont up">&#xe615;</i>
<i class="iconfont down cur">&#xe616;</i>
</span>
</a>
</li>
<li class="discount">
<a href="javascript:void(0);">
折扣
<span class="icon">
<i class="iconfont up">&#xe615;</i>
<i class="iconfont down cur">&#xe616;</i>
</span>
</a>
</li>
<li class="filter">
<a href="javascript:void(0);">
筛选
<span class="iconfont">&#xe613;</span>
</a>
</li>
</ul>
<div id="goods-container" class="goods-container">
<div class="new-goods container">
{{# new}}
{{> good}}
{{/ new}}
</div>
<div class="price-goods container hide"></div>
<div class="discount-goods container hide"></div>
{{> filter}}
</div>
{{#if brand}}
<input id="brand" type="hidden" value={{brand}}>
{{/if}}
{{#if gender}}
<input id="gender" type="hidden" value={{gender}}>
{{/if}}
{{#if msort}}
<input id="msort" type="hidden" value={{msort}}>
{{/if}}
{{#if color}}
<input id="color" type="hidden" value={{color}}>
{{/if}}
{{#if size}}
<input id="size" type="hidden" value={{size}}>
{{/if}}
{{#if price}}
<input id="price" type="hidden" value={{price}}>
{{/if}}
{{#if discount}}
<input id="discount" type="hidden" value={{discount}}>
{{/if}}
{{/ goodList}}
{{> product/list}}
</div>
{{> layout/footer}}
\ No newline at end of file
... ...
{{> layout/header}}
<div class="good-list-page yoho-page">
{{# goodList}}
{{# search}}
<div id="search-input" class="search-input">
<form action={{url}} method="get">
<i class="search-icon iconfont">&#xe60f;</i>
<input type="text" value={{default}} name="query">
<i class="clear-input iconfont hide">&#xe61a;</i>
<button id="search" class="search" type="submit">搜索</button>
</form>
</div>
{{/ search}}
{{# brandWay}}
<div class="brand-way">
<a href={{url}}>
<img class="brand-thumb" src={{thumb}}>
<span>{{name}}</span>
<span class="entry">
进入品牌
<i class="iconfont">&#xe614;</i>
</span>
</a>
</div>
{{/ brandWay}}
{{# brandHome}}
<div id="brand-header" class="brand-header" data-id={{id}}>
<img class="lazy" data-original={{banner}}>
<a class="btn-intro" href="javascript:void(0);">
品牌介绍
</a>
<a class="btn-col" href="javascript:void(0);">
<span class="iconfont">&#xe622;</span>
收藏
</a>
</div>
<div id="intro-box" class="brand-intro-box hide">
<div id="brand-intro" class="brand-intro">
<h2>品牌介绍</h2>
<div class="con">
{{{intro}}}
</div>
<p class="fo">
<span></span>
100%品牌授权正品
</p>
<span class="iconfont close-intro">&#xe623;</span>
</div>
</div>
{{/ brandHome}}
<ul id="list-nav" class="list-nav clearfix">
<li class="new active">
<a href="javascript:void(0);">
最新
<span class="iconfont cur">&#xe616;</span>
</a>
</li>
<li class="price">
<a href="javascript:void(0);">
价格
<span class="icon">
<i class="iconfont up">&#xe615;</i>
<i class="iconfont down cur">&#xe616;</i>
</span>
</a>
</li>
<li class="discount">
<a href="javascript:void(0);">
折扣
<span class="icon">
<i class="iconfont up">&#xe615;</i>
<i class="iconfont down cur">&#xe616;</i>
</span>
</a>
</li>
<li class="filter">
<a href="javascript:void(0);">
筛选
<span class="iconfont">&#xe613;</span>
</a>
</li>
</ul>
<div id="goods-container" class="goods-container">
<div class="new-goods container clearfix">
{{# new}}
{{> good}}
{{/ new}}
</div>
<div class="price-goods container clearfix hide"></div>
<div class="discount-goods container clearfix hide"></div>
{{> filter}}
</div>
{{#if brand}}
<input id="brand" type="hidden" value={{brand}}>
{{/if}}
{{#if gender}}
<input id="gender" type="hidden" value={{gender}}>
{{/if}}
{{#if msort}}
<input id="msort" type="hidden" value={{msort}}>
{{/if}}
{{#if color}}
<input id="color" type="hidden" value={{color}}>
{{/if}}
{{#if size}}
<input id="size" type="hidden" value={{size}}>
{{/if}}
{{#if price}}
<input id="price" type="hidden" value={{price}}>
{{/if}}
{{#if discount}}
<input id="discount" type="hidden" value={{discount}}>
{{/if}}
{{#if query}}
<input id="query" type="hidden" value={{query}}>
{{/if}}
{{/ goodList}}
{{> product/list}}
</div>
{{> layout/footer}}
\ No newline at end of file
... ...
{{> layout/header}}
<div class="good-list-page yoho-page">
<div class="newarrival-page yoho-page">
{{# headerBanner}}
{{> product/banner_swipe_and_single}}
{{/ headerBanner}}
... ...
... ... @@ -18,8 +18,10 @@
</div>
</div>
{{^}}
<div class="banner-top-single">
<a href={{url}}>
<img class="img" src={{img}}>
</a>
</div>
{{/if}}
... ...
{{# goodList}}
{{# search}}
<div id="search-input" class="search-input">
<form action={{url}} method="get">
<i class="search-icon iconfont">&#xe60f;</i>
<input type="text" value={{default}} name="query">
<i class="clear-input iconfont hide">&#xe61a;</i>
<button id="search" class="search" type="submit">搜索</button>
</form>
</div>
{{/ search}}
{{# brandWay}}
<div class="brand-way">
<a href={{url}}>
<img class="brand-thumb" src={{thumb}}>
<span>{{name}}</span>
<span class="entry">
进入品牌
<i class="iconfont">&#xe614;</i>
</span>
</a>
</div>
{{/ brandWay}}
{{# brandHome}}
<div id="brand-header" class="brand-header" data-id={{id}}>
<img class="lazy" data-original={{banner}}>
<a class="btn-intro" href="javascript:void(0);">
品牌介绍
</a>
<a class="btn-col" href="javascript:void(0);">
<span class="iconfont">&#xe622;</span>
收藏
</a>
</div>
<div id="intro-box" class="brand-intro-box hide">
<div id="brand-intro" class="brand-intro">
<h2>品牌介绍</h2>
<div class="con">
{{{intro}}}
</div>
<p class="fo">
<span></span>
100%品牌授权正品
</p>
<span class="iconfont close-intro">&#xe623;</span>
</div>
</div>
{{/ brandHome}}
<ul id="list-nav" class="list-nav clearfix">
<li class="new active">
<a href="javascript:void(0);">
最新
<span class="iconfont cur">&#xe616;</span>
</a>
</li>
<li class="price">
<a href="javascript:void(0);">
价格
<span class="icon">
<i class="iconfont up">&#xe615;</i>
<i class="iconfont down cur">&#xe616;</i>
</span>
</a>
</li>
<li class="discount">
<a href="javascript:void(0);">
折扣
<span class="icon">
<i class="iconfont up">&#xe615;</i>
<i class="iconfont down cur">&#xe616;</i>
</span>
</a>
</li>
<li class="filter">
<a href="javascript:void(0);">
筛选
<span class="iconfont">&#xe613;</span>
</a>
</li>
</ul>
<div id="goods-container" class="goods-container">
<div class="new-goods container clearfix">
{{# new}}
{{> good}}
{{/ new}}
</div>
<div class="price-goods container clearfix hide"></div>
<div class="discount-goods container clearfix hide"></div>
{{> filter}}
</div>
{{#if brand}}
<input id="brand" type="hidden" value={{brand}}>
{{/if}}
{{#if gender}}
<input id="gender" type="hidden" value={{gender}}>
{{/if}}
{{#if msort}}
<input id="msort" type="hidden" value={{msort}}>
{{/if}}
{{#if color}}
<input id="color" type="hidden" value={{color}}>
{{/if}}
{{#if size}}
<input id="size" type="hidden" value={{size}}>
{{/if}}
{{#if price}}
<input id="price" type="hidden" value={{price}}>
{{/if}}
{{#if discount}}
<input id="discount" type="hidden" value={{discount}}>
{{/if}}
{{#if query}}
<input id="query" type="hidden" value={{query}}>
{{/if}}
{{/ goodList}}
\ No newline at end of file
... ...