fe / yohobuy-node · Commits

Go to a project

Authored by 刘传洋
Commit 296d41e7766f0e313495b3a4a29acbfea56e85bd 1 parent e0fad04b

m

Inline Side-by-side
Showing 4 changed files with 54 additions and 42 deletions
... ... @@ -132,10 +132,13 @@
{{>cart-promotion-btn}}
{{#if isPriceGift}}
{{!--{{#if isPriceGift}}
{{#if isNotReach}}
<a class="btn-clear blue order-pay-link" target="_blank" href="{{promotionPageUrl}}">去凑单&nbsp;></a>
{{/if}}
{{/if}}--}}
{{#if isNotReach}}
<a class="btn-clear blue order-pay-link" target="_blank" href="{{promotionPageUrl}}">去凑单&nbsp;></a>
{{/if}}
{{!--{{> cart-sel-gift-tpl }}--}}
... ... @@ -320,51 +323,48 @@
</textarea>
</div>
{{#if cart.isEmpty}}
<div class="bottom-tab bottom-tab-slide">
<span class="bottom-title {{#if cart.deleteShop}}cur{{/if}} {{#unless cart.deleteShop}}none{{/unless}}">凑单商品</span>
<span class="bottom-title {{#unless cart.deleteShop}}cur{{/unless}}">为您优选</span>
<span class="bottom-title">最近浏览</span>
<span class="change">换一批
<span class="iconfont change-icon">&#xe639;</span>
</span>
</div>
<div class="bottom-tab bottom-tab-slide">
<span class="bottom-title {{#if cart.deleteShop}}cur{{/if}} {{#unless cart.deleteShop}}none{{/unless}}">凑单商品</span>
<span class="bottom-title {{#unless cart.deleteShop}}cur{{/unless}}">为您优选</span>
<span class="bottom-title">最近浏览</span>
<span class="change">换一批
<span class="iconfont change-icon">&#xe639;</span>
</span>
</div>
<div class="individual-slide">
<div class="individual-item individual-item-togetherGoods {{#unless cart.deleteShop}}none{{/unless}}">
<input id="" type="hidden" value="">
<ul id="" class="goods clearfix img-list">
{{>individual-slide}}
</ul>
<div class="img-brand-switch">
<a class="prev iconfont" href="javascript:;"></a>
<a class="next iconfont" href="javascript:;"></a>
</div>
<div class="individual-slide">
<div class="individual-item individual-item-togetherGoods {{#unless cart.deleteShop}}none{{/unless}}">
<input id="" type="hidden" value="">
<ul id="" class="goods clearfix img-list">
{{>individual-slide}}
</ul>
<div class="img-brand-switch">
<a class="prev iconfont" href="javascript:;"></a>
<a class="next iconfont" href="javascript:;"></a>
</div>
<div class="individual-item individual-item-recommendGoods {{#if cart.deleteShop}}none{{/if}}">
<input id="" type="hidden" value="{{latestWalk}}">
<ul id="" class="goods img-list clearfix">
{{>individual-slide}}
</ul>
<div class="img-brand-switch">
<a class="prev iconfont " href="javascript:;"></a>
<a class="next iconfont" href="javascript:;"></a>
</div>
</div>
<div class="individual-item individual-item-recommendGoods {{#if cart.deleteShop}}none{{/if}}">
<input id="" type="hidden" value="{{latestWalk}}">
<ul id="" class="goods img-list clearfix">
{{>individual-slide}}
</ul>
<div class="img-brand-switch">
<a class="prev iconfont " href="javascript:;"></a>
<a class="next iconfont" href="javascript:;"></a>
</div>
<div class="individual-item individual-item-latestWalk">
<input id="latest-walk-count" type="hidden" value="">
<ul id="latest-walk-goods" class="goods clearfix img-list">
{{>individual-slide}}
</ul>
<div class="img-brand-switch">
<a class="prev iconfont" href="javascript:;"></a>
<a class="next iconfont" href="javascript:;"></a>
</div>
</div>
<div class="individual-item individual-item-latestWalk">
<input id="latest-walk-count" type="hidden" value="">
<ul id="latest-walk-goods" class="goods clearfix img-list">
{{>individual-slide}}
</ul>
<div class="img-brand-switch">
<a class="prev iconfont" href="javascript:;"></a>
<a class="next iconfont" href="javascript:;"></a>
</div>
</div>
{{> cart-together-tpl }}
{{/if}}
</div>
{{> cart-together-tpl }}
{{/unless}}
<div class="loading"><span></span>请稍后...</div>
... ...
... ... @@ -43,6 +43,9 @@
{{#promotionInfos}}
<li>{{promotionTitle}}
{{>cart-promotion-btn}}
{{#if isNotReach}}
<a class="btn-clear blue order-pay-link" target="_blank" href="{{promotionPageUrl}}">去凑单&nbsp;></a>
{{/if}}
</li>
{{/promotionInfos}}
</ul>
... ...
<div class="yoho-dialog cart-preSell-dialog"
data-role="cart-pre-sell"
style="margin-top:-200px;margin-left: -350px; display:none;">
<span class="close">
<i class="iconfont">&#xe60d;</i>
</span>
... ... @@ -8,7 +9,7 @@
<div class="detail-body">
{{#advanceCart}}
<div class="slide-img">
<p class="sell-class-title">预售商品<strong>3</strong>&nbsp;&nbsp;&nbsp;总金额<strong>￥809.00</strong></p>
<p class="sell-class-title">预售商品<strong>{{stat.selectedGoodsCount}}</strong>&nbsp;&nbsp;&nbsp;总金额<strong>￥809.00</strong></p>
<div class="side-img-dd">
<div class="side-img-container">
<ul class="img-list">
... ...
... ... @@ -175,6 +175,13 @@ $(function() {
$('.img-brand-switch .next').trigger('click');
});
// 商品子优惠显示和隐藏
$('.sale-info').mouseenter(function() {
$(this).addClass('active').children('ul').removeClass('none');
}).mouseleave(function() {
$(this).removeClass('active').children('ul').addClass('none');
});
isCheckAll();
isCheckFav();
... ... @@ -208,3 +215,4 @@ $cartGoodsDetail.on('click', '.btn-favCount', function() {
require('./cart-action');
require('./cart-color-panel');
require('./cart-goods-win');
require('./cart-together');
... ...