fe / YOHOBUYWAP · Commits

Go to a project

Authored by Rock Zhang
Commit 774c787de18fd442ad7a3b8004634a9a4c2cf8f0 2 parents 9a04c7ac 7e603be8

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

Inline Side-by-side
Showing 7 changed files with 133 additions and 5 deletions
... ... @@ -26,3 +26,4 @@ dist
coverage
css/
.sass-cache/
script/nginx/logs/
\ No newline at end of file
... ...
... ... @@ -81,7 +81,8 @@
padding-left: 5%;
width: 21.875%;
height: 140rem / $pxConvertRem;
border-top: 1px solid #e0e0e0;
a {
position: relative;
display: block;
... ...
... ... @@ -62,6 +62,12 @@
font-weight: bold;
}
.vipLevel {
color: #999999;
text-align: center;
padding-bottom: 15px;
}
.detailToBuy {
padding: 0 10px;
margin-bottom: 20px;
... ... @@ -77,7 +83,10 @@
color: white;
margin-right: 20rem / $pxConvertRem;
overflow: hidden;
float: left !important;
}
.toBuyNow {
height: 50px;
line-height: 50px;
... ... @@ -87,11 +96,23 @@
font-size: 1.84em;
overflow: hidden;
font-weight: bold;
background-color: #ed0010;
}
}
.discountNotice {
margin-bottom: 20px;
p {
height: 44px;
line-height: 44px;
padding: 0 10px;
margin-bottom: 1px;
font-size: 12px;
background-color: #eeeeee;
}
}
.detailToShop {
... ... @@ -101,11 +122,50 @@
line-height: 47px;
overflow: hidden;
background-color: #eee;
.fz14 {
font-size: 1.2em;
float: right !important;
}
}
.detailSize {
.detailSize {
padding: 0 10px;
margin-bottom: 20px;
h3 {
text-align: center;
font-size: 1.3em;
margin-bottom: 5px;
span {
font-size: 0.6em;
display: block;
text-transform: uppercase;
}
}
table {
background-color: white;
width: 100%;
}
td {
text-align: left;
padding: 0.4em 0.8em;
border: 1px solid white;
background-color: #eee;
font-size: 1em;
}
}
.detail-img {
padding: 0 10px;
margin-bottom: 10px;
}
}
... ...
... ... @@ -8,8 +8,10 @@
<h1 class="detailTitle">￥298.00</h1>
<div class="vipLevel"><span>银卡￥284.00</span>丨<span>金卡￥269.00</span>丨<span>白金￥263.00</span></div>
<div class="detailToBuy">
<a href="javascript:void(0);" class="AddFavorite fn-left" id="favorite" fav="0" name="collect" product="269003"><em class="icon-uni31"></em></a>
<a href="javascript:void(0);" class="AddFavorite" id="favorite" fav="0" name="collect" product="269003"><em class="icon-uni31"></em></a>
<a href="http://m.yohobuy.com/product/buy_269003_348031.html" name="buy" class="toBuyNow">立即购买</a>
</div>
... ... @@ -77,5 +79,46 @@ CHUMS的所有产品一直秉承 “舒适、乐趣、品质”的设计理念
<div class="detail-img">
<img class="lazy" src="http://img02.static.yohobuy.com/product/2015/07/31/11/028fa13126b19a838b9d642f96bf5976b2.jpg?imageMogr2/thumbnail/640x5000" data-original="http://img02.static.yohobuy.com/product/2015/07/31/11/028fa13126b19a838b9d642f96bf5976b2.jpg?imageMogr2/thumbnail/640x5000" alt="MACROPUS 绝对机能系列双肩包" style="display: block;">
<img class="lazy" src="http://img02.static.yohobuy.com/product/2015/07/31/11/0293b0e5966a9b190a349d0a5f13084c42.jpg?imageMogr2/thumbnail/640x5000" data-original="http://img02.static.yohobuy.com/product/2015/07/31/11/0293b0e5966a9b190a349d0a5f13084c42.jpg?imageMogr2/thumbnail/640x5000" alt="MACROPUS 绝对机能系列双肩包" style="display: block;">
<img class="lazy" src="http://img01.static.yohobuy.com/product/2015/07/31/11/014968ff8c6b6480edd9cbbd1e3a4c8a96.jpg?imageMogr2/thumbnail/640x5000" data-original="http://img01.static.yohobuy.com/product/2015/07/31/11/014968ff8c6b6480edd9cbbd1e3a4c8a96.jpg?imageMogr2/thumbnail/640x5000" alt="MACROPUS 绝对机能系列双肩包" style="display: block;">
<img class="lazy" src="http://img01.static.yohobuy.com/product/2015/07/31/11/019c0a096996a05125713f1cf2ff62b6f1.jpg?imageMogr2/thumbnail/640x5000" data-original="http://img01.static.yohobuy.com/product/2015/07/31/11/019c0a096996a05125713f1cf2ff62b6f1.jpg?imageMogr2/thumbnail/640x5000" alt="MACROPUS 绝对机能系列双肩包" style="display: block;">
<img class="lazy" src="http://img01.static.yohobuy.com/product/2015/07/31/11/0109068bd71afb7e40ac326803d145f93f.jpg?imageMogr2/thumbnail/640x5000" data-original="http://img01.static.yohobuy.com/product/2015/07/31/11/0109068bd71afb7e40ac326803d145f93f.jpg?imageMogr2/thumbnail/640x5000" alt="MACROPUS 绝对机能系列双肩包" style="display: block;">
<img class="lazy" src="http://img01.static.yohobuy.com/product/2014/01/28/17/01417067dcf7379d6a06768c62ee961c00.jpg?imageMogr2/thumbnail/640x5000" data-original="http://img01.static.yohobuy.com/product/2014/01/28/17/01417067dcf7379d6a06768c62ee961c00.jpg?imageMogr2/thumbnail/640x5000" alt="MACROPUS 绝对机能系列双肩包" style="display: block;">
<img class="lazy" src="http://img02.static.yohobuy.com/product/2015/07/06/11/0242daecfc6d31047b123da2a7861a0bb4.jpg?imageMogr2/thumbnail/640x5000" data-original="http://img02.static.yohobuy.com/product/2015/07/06/11/0242daecfc6d31047b123da2a7861a0bb4.jpg?imageMogr2/thumbnail/640x5000" alt="MACROPUS 绝对机能系列双肩包" style="display: block;">
<img class="lazy" src="http://img02.static.yohobuy.com/product/2015/07/06/11/0270b729a9aab25dfbcbabc9498a6e4bda.jpg?imageMogr2/thumbnail/640x5000" data-original="http://img02.static.yohobuy.com/product/2015/07/06/11/0270b729a9aab25dfbcbabc9498a6e4bda.jpg?imageMogr2/thumbnail/640x5000" alt="MACROPUS 绝对机能系列双肩包" style="display: block;">
<img class="lazy" src="http://img02.static.yohobuy.com/product/2015/07/06/11/026cff8c4e0a690afa9cb70e7ba11454c6.jpg?imageMogr2/thumbnail/640x5000" data-original="http://img02.static.yohobuy.com/product/2015/07/06/11/026cff8c4e0a690afa9cb70e7ba11454c6.jpg?imageMogr2/thumbnail/640x5000" alt="MACROPUS 绝对机能系列双肩包" style="display: block;">
<img class="lazy" src="http://img02.static.yohobuy.com/product/2015/07/31/11/023c68cbd9776ff83ba881f8314b366877.jpg?imageMogr2/thumbnail/640x5000" data-original="http://img02.static.yohobuy.com/product/2015/07/31/11/023c68cbd9776ff83ba881f8314b366877.jpg?imageMogr2/thumbnail/640x5000" alt="MACROPUS 绝对机能系列双肩包" style="display: block;">
<img class="lazy" src="http://img02.static.yohobuy.com/product/2015/07/31/11/02890fac8400e8d302c9d3caeca8634c18.jpg?imageMogr2/thumbnail/640x5000" data-original="http://img02.static.yohobuy.com/product/2015/07/31/11/02890fac8400e8d302c9d3caeca8634c18.jpg?imageMogr2/thumbnail/640x5000" alt="MACROPUS 绝对机能系列双肩包" style="display: block;">
<img class="lazy" src="http://img02.static.yohobuy.com/product/2015/07/31/11/0257faa55e04a9e44b8edff8f2e0a663b0.jpg?imageMogr2/thumbnail/640x5000" data-original="http://img02.static.yohobuy.com/product/2015/07/31/11/0257faa55e04a9e44b8edff8f2e0a663b0.jpg?imageMogr2/thumbnail/640x5000" alt="MACROPUS 绝对机能系列双肩包" style="display: block;">
<img class="lazy" src="http://img01.static.yohobuy.com/product/2014/01/28/17/01417067dcf7379d6a06768c62ee961c00.jpg?imageMogr2/thumbnail/640x5000" data-original="http://img01.static.yohobuy.com/product/2014/01/28/17/01417067dcf7379d6a06768c62ee961c00.jpg?imageMogr2/thumbnail/640x5000" alt="MACROPUS 绝对机能系列双肩包" style="display: block;">
<img class="lazy" src="http://img02.static.yohobuy.com/product/2015/07/06/11/02226e365addb260fb596ad2a552daac7e.jpg?imageMogr2/thumbnail/640x5000" data-original="http://img02.static.yohobuy.com/product/2015/07/06/11/02226e365addb260fb596ad2a552daac7e.jpg?imageMogr2/thumbnail/640x5000" alt="MACROPUS 绝对机能系列双肩包" style="display: block;">
<img class="lazy" src="http://img02.static.yohobuy.com/product/2015/07/06/11/02b7f43227b5ba4be339b85b47702260f0.jpg?imageMogr2/thumbnail/640x5000" data-original="http://img02.static.yohobuy.com/product/2015/07/06/11/02b7f43227b5ba4be339b85b47702260f0.jpg?imageMogr2/thumbnail/640x5000" alt="MACROPUS 绝对机能系列双肩包" style="display: block;">
<img class="lazy" src="http://img02.static.yohobuy.com/product/2015/07/06/11/025d5886aa4377677e044022145ab6ca3d.jpg?imageMogr2/thumbnail/640x5000" data-original="http://img02.static.yohobuy.com/product/2015/07/06/11/025d5886aa4377677e044022145ab6ca3d.jpg?imageMogr2/thumbnail/640x5000" alt="MACROPUS 绝对机能系列双肩包" style="display: block;">
<img class="lazy" src="http://img02.static.yohobuy.com/product/2015/07/06/11/029c6d31e9aaf104421e193ac7cdd64437.jpg?imageMogr2/thumbnail/640x5000" data-original="http://img02.static.yohobuy.com/product/2015/07/06/11/029c6d31e9aaf104421e193ac7cdd64437.jpg?imageMogr2/thumbnail/640x5000" alt="MACROPUS 绝对机能系列双肩包" style="display: block;">
<img class="lazy" src="http://img02.static.yohobuy.com/product/2015/07/31/11/02a8526a96a29f212711bf910054b40d6b.jpg?imageMogr2/thumbnail/640x5000" data-original="http://img02.static.yohobuy.com/product/2015/07/31/11/02a8526a96a29f212711bf910054b40d6b.jpg?imageMogr2/thumbnail/640x5000" alt="MACROPUS 绝对机能系列双肩包" style="display: block;">
<img class="lazy" src="http://img02.static.yohobuy.com/product/2015/07/31/11/02efd446f5735d19b4648beddf2a31fa60.jpg?imageMogr2/thumbnail/640x5000" data-original="http://img02.static.yohobuy.com/product/2015/07/31/11/02efd446f5735d19b4648beddf2a31fa60.jpg?imageMogr2/thumbnail/640x5000" alt="MACROPUS 绝对机能系列双肩包" style="display: block;">
<img class="lazy" src="http://img02.static.yohobuy.com/product/2015/07/31/11/026eddbf3d6332ea641e91ce7515ebcc3a.jpg?imageMogr2/thumbnail/640x5000" data-original="http://img02.static.yohobuy.com/product/2015/07/31/11/026eddbf3d6332ea641e91ce7515ebcc3a.jpg?imageMogr2/thumbnail/640x5000" alt="MACROPUS 绝对机能系列双肩包" style="display: block;">
<img class="lazy" src="http://img01.static.yohobuy.com/product/2014/01/28/17/01417067dcf7379d6a06768c62ee961c00.jpg?imageMogr2/thumbnail/640x5000" data-original="http://img01.static.yohobuy.com/product/2014/01/28/17/01417067dcf7379d6a06768c62ee961c00.jpg?imageMogr2/thumbnail/640x5000" alt="MACROPUS 绝对机能系列双肩包" style="display: block;">
<img class="lazy" src="http://img01.static.yohobuy.com/product/2015/07/06/11/01cd92a99779901ce39b9e4c05e72caa35.jpg?imageMogr2/thumbnail/640x5000" data-original="http://img01.static.yohobuy.com/product/2015/07/06/11/01cd92a99779901ce39b9e4c05e72caa35.jpg?imageMogr2/thumbnail/640x5000" alt="MACROPUS 绝对机能系列双肩包" style="display: block;">
<img class="lazy" src="http://img01.static.yohobuy.com/product/2015/07/06/11/01cf2362d0233a0c00539e3ad6c8548afe.jpg?imageMogr2/thumbnail/640x5000" data-original="http://img01.static.yohobuy.com/product/2015/07/06/11/01cf2362d0233a0c00539e3ad6c8548afe.jpg?imageMogr2/thumbnail/640x5000" alt="MACROPUS 绝对机能系列双肩包" style="display: block;">
<img class="lazy" src="http://img01.static.yohobuy.com/product/2015/07/06/11/01bacfb07355ff35a62ad1cfafb81eab75.jpg?imageMogr2/thumbnail/640x5000" data-original="http://img01.static.yohobuy.com/product/2015/07/06/11/01bacfb07355ff35a62ad1cfafb81eab75.jpg?imageMogr2/thumbnail/640x5000" alt="MACROPUS 绝对机能系列双肩包" style="display: block;">
</div>
</div>
{{> layout/footer}}
\ No newline at end of file
... ...
{{>layout/header}}
<div class="newarrival-page yoho-page">
{{# headerBanner}}
{{> home/banner_top}}
{{> product/banner_swipe_and_single}}
{{/ headerBanner}}
<ul id="newarrival-nav" class="newarrival-nav clearfix">
... ...
{{>layout/header}}
<div class="discount-page yoho-page">
{{# headerBanner}}
{{> home/banner_top}}
{{> product/banner_swipe_and_single}}
{{/ headerBanner}}
<ul id="discount-nav" class="discount-nav clearfix">
... ...
{{#if list}}
<div class="banner-top">
<div class="banner-swiper swiper-container">
<ul class="swiper-wrapper">
{{# list}}
<li class="swiper-slide">
<a href="{{url}}">
<img src="{{img}}" alt="">
</a>
</li>
{{/ list}}
</ul>
</div>
<div class="swiper-pagination">
<div class="pagination-inner">
</div>
</div>
</div>
{{^}}
<a href={{url}}>
<img class="img" src={{img}}>
</a>
{{/if}}
\ No newline at end of file
... ...