Authored by hongweigao

Merge branch 'feature/new-product-detail' of http://git.yoho.cn/fe/yohobuy-node

…into feature/new-product-detail
... ... @@ -5,8 +5,8 @@
</div>
<div class="content">
商品一旦在 30 日内到货,我们将会第一时间<br/>
通知您,请及时关注哦!
商品一旦在 30 日内到货,我们将第一时间通知您,<br/>
请下载有货APP关注消息哦!
</div>
<div class="content">
... ... @@ -14,8 +14,13 @@
<span>添加收藏夹</span>
</div>
<div class="content">
<div class="qr-img"></div>
</div>
<div class="row">
<a class='ok' data-pid="{{pid}}" data-sku="{{sku}}">订阅</a>
<a class='cancel btn-close'>取消</a>
</div>
</div>
... ...
... ... @@ -886,6 +886,8 @@ bindEvent.add(function() {
$('#keep-shopping').click(function() {
$('#type-chose').slideDown(SLIDETIME);
$('#balance').slideUp(SLIDETIME);
cartEvent.emit('selling');
});
// 电子票立即购买
... ...
... ... @@ -2668,6 +2668,14 @@
font-size: 12px;
line-height: 20px;
margin-top: 20px;
.qr-img{
display: inline-block;
width: 100px;
height: 100px;
background: resolve("layout/qr.png");
background-size: 100px;
}
}
.checked {
... ... @@ -2714,6 +2722,9 @@
cursor: pointer;
}
}
}
... ...