fe / YOHOBUYPC · Commits

Go to a project

Authored by Rock Zhang
Commit 907ab94128012f32aa94fbbec49094505e3863c0 2 parents de2c6d75 0e61b6a7

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

Inline Side-by-side
Showing 9 changed files with 125 additions and 155 deletions
... ... @@ -33,7 +33,6 @@ $('.yoho-header').css({
'z-index': 2,
position: 'fixed'
});
$('.banner-top').css('padding-top', '90px');
$(window).scroll(function() {
var scrTop = $(window).scrollTop();
... ...
... ... @@ -7,7 +7,7 @@
var $ = require('jquery'),
Hammer = require('yoho.hammer');
var floatLayerCloseHammer, floatLayerBtnHammer;
var floatLayerBtnHammer;
function downLoadApp() {
var appUrl = 'http://a.app.qq.com/o/simple.jsp?pkgname=com.yoho&g_f=995445';
... ... @@ -20,43 +20,25 @@ function downLoadApp() {
}, 500);
}
// $('#float-layer-close').bind('tap', function () {
// $('#float-layer-app').hide();
// window.setCookie('_float-layer-app', 'id490655927',
// {
// domain: '.yohobuy.com'
// });
// window.setCookie('_float-layer-app-close', 1,
// {
// domain: '.yohobuy.com',
// expires: 1
// });
// });
if ($('#float-layer-close') && $('#float-layer-close')[0]) {
floatLayerCloseHammer = new Hammer($('#float-layer-close')[0]);
floatLayerCloseHammer.on('tap', function(e) {
$('#float-layer-app').hide();
window.setCookie('_float-layer-app', 'id490655927',
{
domain: '.yohobuy.com'
});
window.setCookie('_float-layer-app-close', 1,
{
domain: '.yohobuy.com',
expires: 1
});
});
}
// $('#float-layer-btn').tap(function () {
// downLoadApp('bottom');
// });
$('#float-layer-close').on('touchend', function(e) {
$('#float-layer-app').hide();
window.setCookie('_float-layer-app', 'id490655927',
{
domain: '.yohobuy.com'
});
window.setCookie('_float-layer-app-close', 1,
{
domain: '.yohobuy.com',
expires: 1
});
return false;
});
if ($('#float-layer-btn') && $('#float-layer-btn')[0]) {
floatLayerBtnHammer = new Hammer($('#float-layer-btn')[0]);
floatLayerBtnHammer.on('tap', function(e) {
downLoadApp('bottom');
e.srcEvent.stopPropagation();
});
if (!window.cookie('_float-layer-app')) {
... ...
/**
* 产品打包入口
* 商品详情
* @author: liangzhifeng<zhifeng.liang@yoho.cn>
* @date: 2015/10/20
*/
... ... @@ -18,4 +18,9 @@ goodsSwiper = new Swiper('.banner-swiper', {
pagination: '.swiper-pagination',
nextButton: '.swiper-button-next',
prevButton: '.swiper-button-prev'
});
\ No newline at end of file
});
// $('#iframe').load(function() {
// var mainheight = $(this).contents().find('body').height() + 30;
// $(this).height(mainheight);
// });
\ No newline at end of file
... ...
... ... @@ -61,6 +61,10 @@
}
.banner-top {
padding-top: 178rem / $pxConvertRem;
}
.hot-brand {
margin: (30rem / $pxConvertRem) 0 0;
... ...
... ... @@ -48,14 +48,14 @@
}
}
.detailName {
.goodsName {
font-size: 28rem / $pxConvertRem;
color: #222222;
padding-bottom: 6px;
text-align: center;
}
.detailTitle {
.goodsTitle {
font-size: 36rem / $pxConvertRem;
text-align: center;
padding-bottom: 2px;
... ... @@ -68,7 +68,7 @@
padding-bottom: 15px;
}
.detailToBuy {
.goToBuy {
padding: 0 10px;
margin-bottom: 20px;
text-align: center;
... ... @@ -115,7 +115,7 @@
}
}
.detailToShop {
.goToShop {
margin: 0 10px 20px;
padding: 10px;
height: 47px;
... ...
... ... @@ -4,119 +4,51 @@
{{> product/banner_swiper_arrow}}
{{/ bannerTop}}
<h2 class="detailName">CHUMS 男式纯色logo休闲长袖T恤</h2>
{{# goodsName}}
<h2 class="goodsName">{{.}}</h2>
{{/ goodsName}}
<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" 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>
<div class="discountNotice">
<p><span>打折</span>【深秋优品加持】折上满￥599享75折</p>
<p><span>打折</span>【深秋优品加持】折上满￥399享85折</p>
<p><span>加价购</span>【全场29元加价购】</p>
<p><span>加价购</span>【全场49元加价购】</p>
<p><span>加价购</span>【全场69元加价购】</p>
</div>
<div class="detailToShop">
<a href="http://chums.m.yohobuy.com" title="CHUMS">
<span class="fn-right fz14">进入店铺 <em class="icon-uni3E"></em></span>
<img class="lazy" src="http://img12.static.yhbimg.com/brandLogo/2015/08/14/11/022c089923cc22b3b068f862dcd3b9d454.jpg?imageView/1/w/47/h/47" data-original="http://img12.static.yhbimg.com/brandLogo/2015/08/14/11/022c089923cc22b3b068f862dcd3b9d454.jpg?imageView/1/w/47/h/47" alt="" width="47" style="display: inline-block;">
CHUMS </a>
</div>
<div class="detailSize detailGoodsInfo">
<h3>商品信息<span>product info</span></h3>
<table>
<tbody>
<tr>
<td>编号：51149815</td>
<td>颜色：白色</td>
</tr>
<tr> <td>领型：圆领</td>
<td>衣长：适中</td>
</tr><tr> <td>袖长：长袖</td>
<td>版型：正常</td>
</tr><tr> <td>厚度：中</td>
<td>经典款型：LOGOT恤</td>
</tr><tr> <td>袖型：正常</td>
<td>肩型：落肩</td>
</tr> <tr>
<td colspan="2">“CHUMS”这一品牌名称，是由Mike 先生好友的爱犬“Chumley”的名字演变而来，其中蕴含了Mike先生希望透过这一品牌，让顾客感受到生活的温馨与美好的心情。
中南美的渔夫们用西班牙语亲切地称这种鸟作蓝脚鲣鸟。由于其快乐、悠闲的风格与CHUMS品牌的理念完全一致，便采用它作为该品牌的吉祥物。
从当初的一根眼镜绳，经过30年的发展， CHUMS已经成为全球时尚市场上的主力军，并将产品线扩大到了包、帽子和服饰。
CHUMS的所有产品一直秉承 “舒适、乐趣、品质”的设计理念，并且融合都市时尚和户外技术装备的特点，所以在美国和欧洲收到了广大消费者的欢迎，特别是在日本更是家喻户晓。
</td>
</tr>
</tbody>
</table>
</div>
<div class="detailSize">
<h3>尺码信息<span>size info</span></h3>
<div id="size_info" class="overthrow">
<table>
<thead> <tr>
<th style="width:100px;">吊牌尺码</th><th style="width:100px;">后衣长</th><th style="width:100px;">前衣长</th><th style="width:100px;">袖长</th><th style="width:100px;">胸围</th><th style="width:100px;">肩宽</th> </tr>
</thead> <tbody> <tr>
<td>S</td><td>60</td><td>60</td><td>56</td><td>92</td><td>41</td> </tr>
<tr>
<td>M</td><td>63</td><td>63</td><td>57</td><td>96</td><td>43</td> </tr>
<tr>
<td>L</td><td>67</td><td>67</td><td>58</td><td>100</td><td>45</td> </tr>
<tr>
<td>XL</td><td>69</td><td>69</td><td>59</td><td>104</td><td>47</td> </tr>
</tbody>
</table>
</div><p class="scrollinfo">提示：左滑查看完整表格信息</p>
</div>
<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>
{{# goodsTitle}}
<h1 class="goodsTitle">{{.}}</h1>
{{/ goodsTitle}}
{{# vipLevel}}
<div class="vipLevel">
{{# list}}
{{#if @last}}
<span>{{text}}</span>
{{^}}
<span>{{text}}</span> |
{{/if}}
{{/ list}}
</div>
{{/ vipLevel}}
{{# goToBuy}}
<div class="goToBuy">
<a href="javascript:void(0);" class="AddFavorite" id="favorite" fav="0" name="collect"><em class="icon-uni31"></em></a>
<a href="{{url}}" name="buy" class="toBuyNow">立即购买</a>
</div>
{{/ goToBuy}}
{{# discountNotice}}
<div class="discountNotice">
{{# list}}
<p><span>{{title}}</span>{{desc}}</p>
{{/ list}}
</div>
{{/ discountNotice}}
{{# goToShop}}
<div class="goToShop">
<a href="{{url}}">
<span class="fn-right fz14">进入店铺 <em class="icon-uni3E"></em></span>
<img class="lazy" data-original="{{img}}" alt="" style="display: inline-block;">
{{title}}</a>
</div>
{{/ goToShop}}
<iframe src="http://www.baidu.com" id="main" width="320" height="300" frameborder="0" scrolling="auto"></iframe>
... ...
... ... @@ -2,7 +2,7 @@
<div class="goods-category">
{{# big_image}}
<div class="category-swiper">
<ul class="swiper-wrapper clearfix">
<ul class="swiper-wrapper">
{{# list}}
<li class="swiper-slide">
<a href="{{url}}">
... ...
... ... @@ -144,7 +144,7 @@
{{/if}}
{{!-- 商品详情 --}}
{{#if goodDetail}}
{{#if goodsDetailPage}}
<script>
seajs.use('js/product/detail/detail');
</script>
... ...
... ... @@ -14,7 +14,7 @@ class DetailController extends AbstractAction
public function indexAction()
{
$data = array (
'goodDetail' => true,
'goodsDetailPage' => true,
'pageHeader' => array (
'navBack' => 'sss ',
'navHome' => 'sss ',
... ... @@ -35,7 +35,55 @@ class DetailController extends AbstractAction
'img' => 'http://img11.static.yhbimg.com/goodsimg/2015/10/12/03/01d7ef2f624eeea15e80bb374607aea317.jpg?imageMogr2/thumbnail/450x600/extent/450x600/background/d2hpdGU=/position/center/quality/90'
)
)
),
'goodsName' => 'CHUMS 男式纯色logo休闲长袖T恤',
'goodsTitle' => '￥298.00',
'vipLevel' => array (
'list' => array (
array (
'text' => '银卡284.00'
),
array (
'text' => '金卡269.00'
),
array (
'text' => '白金263.00'
)
)
),
'goToBuy' => array (
'url' => 'http://m.yohobuy.com/product/buy_269003_348031.html'
),
'discountNotice' => array (
'list' => array (
array (
'title' => '打折',
'desc' => '【深秋优品加持】折上满￥599享75折'
),
array (
'title' => '打折',
'desc' => '【深秋优品加持】折上满￥399享85折'
),
array (
'title' => '加价购',
'desc' => '【全场29元加价购】'
),
array (
'title' => '加价购',
'desc' => '【全场49元加价购】'
),
array (
'title' => '加价购',
'desc' => '【全场69元加价购】'
)
)
),
'goToShop' => array (
'url' => 'http://chums.m.yohobuy.com',
'title' => 'CHUMS',
'img' => 'http://img12.static.yhbimg.com/brandLogo/2015/08/14/11/022c089923cc22b3b068f862dcd3b9d454.jpg?imageView/1/w/47/h/47" data-original="http://img12.static.yhbimg.com/brandLogo/2015/08/14/11/022c089923cc22b3b068f862dcd3b9d454.jpg?imageView/1/w/47/h/47'
)
);
$this->_view->assign('title', '商品详情');
... ...