fe / yohobuy-node · Commits

Go to a project

Authored by OF1706
Commit 4836d89c3d7ff177b2344503604bcedf67e4c392 2 parents 03f0f339 176fc99a

Merge branch 'feature/shoppingCart' of http://git.yoho.cn/fe/yohobuy-node into feature/shoppingCart

Inline Side-by-side
Showing 8 changed files with 142 additions and 105 deletions
... ... @@ -967,6 +967,11 @@ const queryUserPromotionGift = (promotionId, uid, shoppingKey) => {
// 获取选中商品的数据详情
if (currentProduct && currentProduct.id) {
promotionGifts.data.productInfo = yield getProductInfoAsync(currentProduct.id);
// 价格为活动价
if (promotionGifts.data.productInfo) {
promotionGifts.data.productInfo.salePrice = '¥' + currentProduct.subjoinPrice;
}
}
return promotionGifts;
... ...
... ... @@ -367,6 +367,7 @@
<i class="iconfont">&#xe60d;</i>
</div>
<div class="content goods-select-content">
<div class="detail-body"></div>
</div>
</div>
</div>
... ...
<div class="modal-overflow" style="display: none;" data-role="mdialog" id="Y_CartSelectDialog">
<div class="body-modal-black"></div>
<div class="mmodal-dialog cart-preSell-dialog" style="top:50px;">
<div class="close" data-role="mdialog-close">
<i class="iconfont">&#xe60d;</i>
</div>
<div class="content">
<div class="detail-body">
{{#advanceCart}}
<div class="slide-img">
<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">
{{#each pools}}
{{#each goodsList}}
<li class="img-item">
<span class="hide goods-id">{{id}}</span>
<div class="good">
<a class="good-cont" href="{{link}}" target="_blank">
<img src="{{imgCover}}">
<span class="incentive">预售</span>
</a>
</div>
</li>
{{/each}}
{{/each}}
</ul>
</div>
<div class="img-brand-switch">
<a class="prev iconfont" href="javascript:;">&#xe609;</a>
<a class="next iconfont" href="javascript:;">&#xe608;</a>
</div>
</div>
</div>
<a class="btn-account">去结算</a>
{{/advanceCart}}
{{#ordinaryCart}}
<div class="slide-img">
<p class="sell-class-title">普通商品<strong>{{stat.selectedGoodsCount}}</strong>&nbsp;&nbsp;&nbsp;总金额<strong>¥&nbsp;{{stat.lastOrderAmount}}</strong></p>
<div class="side-img-dd">
<div class="side-img-container">
<ul class="img-list">
{{#each pools}}
{{#each goodsList}}
<li class="img-item">
<span class="hide goods-id">{{id}}</span>
<div class="good">
<a class="good-cont" href="{{link}}" target="_blank">
<img class="lazy" src="{{imgCover}}"/>
</a>
</div>
<!--<i class="iconfont checked">&#xe6cb;</i>-->
</li>
{{/each}}
{{/each}}
</ul>
</div>
<div class="img-brand-switch">
<a class="prev iconfont" href="javascript:;">&#xe609;</a>
<a class="next iconfont" href="javascript:;">&#xe608;</a>
</div>
</div>
</div>
<a class="btn-account btn-account-black">去结算</a>
{{/ordinaryCart}}
<p class="pre-sell-tip">温馨提示：您需要分开结算【预售商品】和【普通商品】</p>
</div>
</div>
</div>
</div>
<!--
<div class="yoho-dialog cart-preSell-dialog"
data-role="cart-pre-sell"
style="margin-top:-200px;margin-left: -350px; display:none;">
... ... @@ -7,66 +80,9 @@
</span>
<div class="content">
<div class="detail-body">
{{#advanceCart}}
<div class="slide-img">
<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">
{{#each pools}}
{{#each goodsList}}
<li class="img-item">
<span class="hide goods-id">{{id}}</span>
<div class="good">
<a class="good-cont" href="{{link}}" target="_blank">
<img src="{{imgCover}}">
<span class="incentive">预售</span>
</a>
</div>
</li>
{{/each}}
{{/each}}
</ul>
</div>
<div class="img-brand-switch">
<a class="prev iconfont" href="javascript:;">&#xe609;</a>
<a class="next iconfont" href="javascript:;">&#xe608;</a>
</div>
</div>
</div>
<a class="btn-account">去结算</a>
{{/advanceCart}}
{{#ordinaryCart}}
<div class="slide-img">
<p class="sell-class-title">普通商品<strong>{{stat.selectedGoodsCount}}</strong>&nbsp;&nbsp;&nbsp;总金额<strong>¥&nbsp;{{stat.lastOrderAmount}}</strong></p>
<div class="side-img-dd">
<div class="side-img-container">
<ul class="img-list">
{{#each pools}}
{{#each goodsList}}
<li class="img-item">
<span class="hide goods-id">{{id}}</span>
<div class="good">
<a class="good-cont" href="{{link}}" target="_blank">
<img class="lazy" src="{{imgCover}}"/>
</a>
</div>
<!--<i class="iconfont checked">&#xe6cb;</i>-->
</li>
{{/each}}
{{/each}}
</ul>
</div>
<div class="img-brand-switch">
<a class="prev iconfont" href="javascript:;">&#xe609;</a>
<a class="next iconfont" href="javascript:;">&#xe608;</a>
</div>
</div>
</div>
<a class="btn-account btn-account-black">去结算</a>
{{/ordinaryCart}}
<p class="pre-sell-tip">温馨提示：您需要分开结算【预售商品】和【普通商品】</p>
</div>
</div>
</div>
-->
... ...
<div class="detail-body">
<div class="slide-img">
<p class="sell-class-title"><!--选赠品:-->
<em class="slide-img-title">
<span>{{promotionTitle}}</span>
<!--<code class="spacing">|</code>
<span>59元加价购</span>
<code class="spacing">|</code>
<span>99元加价购</span>-->
</em>
</p>
<div class="side-img-dd">
<ul class="img-list">
{{#each goodsList}}
<li class="img-item {{#if active}}active{{/if}}"
data-id="{{id}}"
data-skn="{{skn}}"
data-ispricegift="{{isPriceGift}}"
data-isgift="{{isGift}}">
<span class="hide goods-id">{{goods_id}}</span>
<div class="good">
<a href="javascript:void(0)" target="_blank"> {{!--{{link}}--}}
<img class="lazy" src="{{imgCover}}"/>
</a>
</div>
{{#if_cond ../selectedSkn '==' skn}}<i class="iconfont checked">&#xe6cb;</i>{{/if_cond}}
</li>
{{/each}}
</ul>
<div class="img-brand-switch">
<a class="prev iconfont" href="javascript:;">&#xe609;</a>
<a class="next iconfont" href="javascript:;">&#xe608;</a>
</div>
<div class="slide-img">
<p class="sell-class-title">
{{#if isGift}}选赠品:{{/if}}<!--选赠品:-->
{{#if isPriceGift}}{{promotionTitle}}{{/if}}
{{!--<em class="slide-img-title">
<span class="active">{{promotionTitle}}</span>
<!--<code class="spacing">|</code>
<span>59元加价购</span>
<code class="spacing">|</code>
<span>99元加价购</span>-->
</em>--}}
</p>
<div class="side-img-dd">
<ul class="img-list">
{{#each goodsList}}
<li class="img-item {{#if active}}active{{/if}}"
data-id="{{id}}"
data-skn="{{skn}}"
{{#if subjoinPrice}}data-subjoinprice="{{subjoinPrice}}"{{/if}}
{{#if isPriceGift}}data-ispricegift="{{isPriceGift}}"{{/if}}
{{#if isGift}}data-isgift="{{isGift}}"{{/if}}>
<span class="hide goods-id">{{goods_id}}</span>
<div class="good">
<a href="javascript:void(0)" target="_blank"> {{!--{{link}}--}}
<img class="lazy" src="{{imgCover}}"/>
</a>
</div>
{{#if_cond ../selectedSkn '==' skn}}<i class="iconfont checked">&#xe6cb;</i>{{/if_cond}}
</li>
{{/each}}
</ul>
<div class="img-brand-switch">
<a class="prev iconfont" href="javascript:;">&#xe609;</a>
<a class="next iconfont" href="javascript:;">&#xe608;</a>
</div>
</div>
<div class="product-detail-info" data-promotionid="{{promotionId}}" {{#if swap}}data-swap="{{swap}}"{{/if}}>
{{#productInfo}}
{{> cart-product-info-tpl}}
{{/productInfo}}
</div>
</div>
<div class="product-detail-info"
data-promotionid="{{promotionId}}"
data-maxselectnum="{{maxSelectNumber}}"
{{#if swap}}data-swap="{{swap}}"{{/if}}>
{{#productInfo}}
{{> cart-product-info-tpl}}
{{/productInfo}}
</div>
... ...
... ... @@ -29,15 +29,15 @@
</div>
<div class="price">
{{#if salePrice}}
<span class="newprice">现价：<b class="promotion-price">¥{{salePrice}}</b></span>
<span class="oldprice">原价：<del>¥{{marketPrice}}</del></span>
<span class="newprice">现价：<b class="promotion-price">{{salePrice}}</b></span>
<span class="oldprice">活动价：<del>{{marketPrice}}</del></span>
{{^}}
<span class="newprice {{#presalePrice}}none{{/presalePrice}}">原价：<b class="promotion-price">¥{{marketPrice}}</b></span>
<span class="newprice {{#presalePrice}}none{{/presalePrice}}">原价：<b class="promotion-price">{{marketPrice}}</b></span>
{{/if}}
{{#if presalePrice}}
<span class="oldprice">原价：<del>¥{{marketPrice}}</del></span>
<span class="newprice">预售价：<b class="promotion-price">¥{{presalePrice}}</b></span>
<span class="oldprice">原价：<del>{{marketPrice}}</del></span>
<span class="newprice">预售价：<b class="promotion-price">{{presalePrice}}</b></span>
{{/if}}
{{#arrivalDate}}
<span class="arrivalDate">上市期：{{arrivalDate}}</span>
... ...
... ... @@ -303,7 +303,8 @@ var Cart = {
alert('还有赠品未领取！');
}
$('.cart-preSell-dialog').show();
capi.showMDialog('#Y_CartSelectDialog');
// $('.cart-preSell-dialog').show();
// $('.cart-togetherGoods').show();
... ...
... ... @@ -19,7 +19,7 @@ var $ = require('yoho-jquery'),
'[data-role=pg-resel-btn]'];
function renderAndShowGiftWin(plist) {
$goodsSelWin.find('.content').empty().html(giftsWinTpl(plist));
$goodsSelWin.find('.detail-body').empty().html(giftsWinTpl(plist));
capi.showMDialog('#Y_goodsSelectWinDialog');
}
... ... @@ -91,6 +91,16 @@ GoodsWinAction = {
$this.addClass('active');
capi.getProductInfo(id, skn).then(res => {
// 赠品价格为 0, 加价购价格为 活动价
if ($this.data('isgift')) {
res.salePrice = 0;
} else if ($this.data('ispricegift')) {
if ($this.data('subjoinprice')) {
res.salePrice = '¥' + $this.data('subjoinprice');
}
}
$goodsSelWin.find('.product-detail-info').empty().append(productInfoTpl(res));
});
},
... ...
... ... @@ -158,7 +158,7 @@ $('.bottom-tab-slide').on('click', '.bottom-title', function() {
function showTogetherSelWin(id, skn) {
capi.getProductInfo(id, skn).then(res => {
$goodsSelWin.find('.content').empty().append(productInfoTpl(res));
$goodsSelWin.find('.detail-body').empty().append(productInfoTpl(res));
});
capi.showMDialog('#Y_goodsSelectWinDialog');
... ...