fe / yohobuy-node · Commits

Go to a project

Authored by yyq
Commit 089d19ae38110d25e4d9220e3f75e96f44678659 2 parents d7bd18b8 a05cfb82

Merge branch 'feature/sale' of http://git.dev.yoho.cn/web/yohobuy-node into feature/sale

Inline Side-by-side
Showing 8 changed files with 341 additions and 106 deletions
... ... @@ -504,16 +504,16 @@ exports.other = () => {
pageCounts: [
{
href: 'wdad',
count: 100,
count: 100
},
{
href: 'wdad',
count: 80,
count: 80
},
{
href: 'wdad',
count: 60,
},
count: 60
}
],
// curpage 前面的点击的href
... ... @@ -749,6 +749,126 @@ exports.outletBanner = () => {
img: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/180/h/250'
}]
}
},
flashSale: {
name: '限时嗨购',
imgHot: [{
href: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/560/h/260',
img: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/560/h/260',
logo: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/100/h/60',
name: '上衣',
price: '12',
count: '7'
},
{
href: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/560/h/260',
img: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/560/h/260',
logo: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/100/h/60',
name: '上衣',
price: '12',
count: '7'
},
{
href: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/560/h/260',
img: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/560/h/260',
logo: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/100/h/60',
name: '上衣',
price: '12',
count: '7'
},
{
href: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/560/h/260',
img: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/560/h/260',
logo: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/100/h/60',
name: '上衣',
price: '12',
count: '7'
},
{
href: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/560/h/260',
img: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/560/h/260',
logo: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/100/h/60',
name: '上衣',
price: '12',
count: '7'
},
{
href: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/560/h/260',
img: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/560/h/260',
logo: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/100/h/60',
name: '上衣',
price: '12',
count: '7'
},
{
href: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/560/h/260',
img: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/560/h/260',
logo: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/100/h/60',
name: '上衣',
price: '12',
count: '7'
},
{
href: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/560/h/260',
img: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/560/h/260',
logo: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/100/h/60',
name: '上衣',
price: '12',
count: '7'
},
{
href: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/560/h/260',
img: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/560/h/260',
logo: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/100/h/60',
name: '上衣',
price: '12',
count: '7'
},
{
href: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/560/h/260',
img: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/560/h/260',
logo: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/100/h/60',
name: '上衣',
price: '12',
count: '7'
}]
},
goodsMenu: {
title: '最新折扣',
menuList: [
{
cur: true,
href: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/180/h/250',
name: '棉衣'
}, {
href: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/180/h/250',
name: '棉衣'
}, {
href: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/180/h/250',
name: '棉衣'
}, {
href: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/180/h/250',
name: '棉衣'
}, {
href: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/180/h/250',
name: '棉衣'
}, {
href: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/180/h/250',
name: '棉衣'
}, {
href: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/180/h/250',
name: '棉衣'
}, {
cur: false,
href: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/180/h/250',
name: '棉衣'
}
],
more: 'http://img10.static.yhbimg.com/yhb-img01/2016/05/13/19/0144078a008a5dc2be52a6ec65c74c1f2c.jpg?imageView2/1/w/180/h/250'
}
};
};
... ...
... ... @@ -44,4 +44,14 @@
{{> index/outlets-recommend}}
{{/ recommend}}
{{! 限时嗨购}}
{{# flashSale}}
{{> index/flash-sale}}
{{/ flashSale}}
{{! 最新折扣}}
{{> outlets/main-product}}
<!-- {{# newDiscount}} -->
<!-- {{/ newDiscount}} -->
</div>
\ No newline at end of file
... ...
<div class="flash-sale clearfix">
{{> index/floor-header}}
<div class="flash-sale-list">
<ul class="g-list imgopacity clearfix">
{{#each imgHot}}
<li>
<a href="{{href}}" target= "_blank"><div class="flash-sale-banner">
<img src="{{img}}"/></div>
<div class="flash-sale-bottom">
<p class="flash-sale-count">{{count}}折起</p>
<p class="flash-sale-name">{{name}}</p>
<p class="flash-sale-timer">timer</p>
<div class="flash-sale-logo">
<img src="{{logo}}"/>
</div>
</div>
</a>
</li>
{{/each}}
</ul>
</div>
</div>
\ No newline at end of file
... ...
<div class="new-discount">
<p class="new-discount-label">最新折扣</p>
<ul class="discount-nav" urlLocation="{{urlLocation}}">
{{#discountNavItem}}
<li class="discount-nav-list" urlLocation='{{urlLocation}}'>{{title}}</li>
{{/discountNavItem}}
</ul>
<a url="{{discountMore}}">MORE</a>
</div>
\ No newline at end of file
... ...
/*
公共样式
*/
.g-list {
li {
float: left;
a {
position: relative;
display: block;
overflow: hidden;
img {
width: 100%;
height: 100%;
}
}
}
}
.yoho-page {
.floor-header {
position: relative;
... ... @@ -152,3 +170,60 @@
}
}
}
/*
人气单品
*/
.home-page .flash-sale {
.flash-sale-list {
margin-left: -10px;
a {
height: 340px;
width: 560px;
}
li {
margin: 10px;
}
.flash-sale-banner {
position: relative;
height: 260px;
}
.flash-sale-bottom {
height: 78px;
position: relative;
border: 1px solid #000;
border-top-style: none;
}
p.flash-sale-count {
position: absolute;
left: 50px;
top: 20px;
}
p.flash-sale-name {
position: absolute;
left: 120px;
top: 20px;
}
p.flash-sale-timer {
position: absolute;
left: 50px;
top: 50px;
}
.flash-sale-logo {
position: absolute;
right: 50px;
width: 100px;
height: 80px;
img {
width: 100px;
height: 50px;
margin-top: 15px;
}
}
}
}
... ...
... ... @@ -183,8 +183,6 @@
}
}
.right-col a {
margin-bottom: 10px;
&:last-child {
margin-bottom: 0;
}
... ... @@ -197,9 +195,8 @@
.center-col {
position: relative;
width: 700px;
height: 100%;
margin-right: 10px;
width: 860px;
height: 450px;
font-size: 0;
&:hover {
... ... @@ -234,13 +231,12 @@
}
.right-col a {
width: 280px;
height: 120px;
width: 290px;
height: 270px;
}
.right-col a:first-child {
height: 380px;
margin-bottom: 11px;
height: 180px;
}
}
... ...
... ... @@ -258,51 +258,6 @@
}
}
.all-goods-menu {
height: 35px;
line-height: 35px;
padding: 45px 0 10px;
.menu-tag {
color: #d0021b;
font-size: 15px;
font-weight: bold;
text-align: left;
padding: 0 20px 0 10px;
border-right: 1px solid #000;
float: left;
}
.menu-list {
width: 850px;
height: 35px;
overflow: hidden;
float: left;
font-size: 14px;
padding-left: 10px;
li {
display: inline-block;
padding: 0 15px;
}
.on {
background: #000;
height: 28px;
line-height: 28px;
a {
color: #fff;
}
}
}
.more {
font-size: 14px;
float: right;
}
}
.sort-layer {
height: 48px;
... ... @@ -325,54 +280,7 @@
margin: 0 auto;
}
}
.product-list {
width: 1160px;
.list-item {
margin: 23px 10px 23px 0;
float: left;
}
.thumb {
width: 222px;
height: 314px;
display: inline-block;
img {
width: 100%;
height: 100%;
}
}
.detail-text {
padding: 15px 0;
text-align: center;
font-size: 14px;
font-weight: bold;
}
.name {
line-height: 1.5;
padding: 0 20px;
margin-bottom: 3px;
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.discount {
font-size: 12px;
line-height: 22px;
color: #fff;
padding: 0 10px 0 20px;
margin-left: 20px;
background: resolve('product/discount-tag.png') no-repeat;
display: inline-block;
}
}
}
@import "channel";
@import "main-product";
... ...
.main-product {
.all-goods-menu {
height: 35px;
line-height: 35px;
padding: 45px 0 10px;
.menu-tag {
color: #d0021b;
font-size: 15px;
font-weight: bold;
text-align: left;
padding: 0 20px 0 10px;
border-right: 1px solid #000;
float: left;
}
.menu-list {
width: 850px;
height: 35px;
overflow: hidden;
float: left;
font-size: 14px;
padding-left: 10px;
li {
display: inline-block;
padding: 0 15px;
}
.on {
background: #000;
height: 28px;
line-height: 28px;
a {
color: #fff;
}
}
}
.more {
font-size: 14px;
float: right;
}
}
.product-list {
width: 1160px;
.list-item {
width: 222px;
margin: 23px 10px 23px 0;
float: left;
}
.thumb {
width: 100%;
height: 130%;
display: inline-block;
img {
width: 100%;
height: 100%;
}
}
.detail-text {
padding: 15px 0;
text-align: center;
font-size: 14px;
font-weight: bold;
}
.name {
line-height: 1.5;
padding: 0 20px;
margin-bottom: 3px;
display: block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.discount {
font-size: 12px;
line-height: 22px;
color: #fff;
padding: 0 10px 0 20px;
margin-left: 20px;
background: resolve('product/discount-tag.png') no-repeat;
display: inline-block;
}
}
}
... ...