fe / yohobuy-node · Commits

Go to a project

Authored by OF1706
Commit d467de943380a8694edfe786f6e7138022bb020d 2 parents 3d154c00 a56bef3e

m

Inline Side-by-side
Showing 1 changed file with 0 additions and 133 deletions
... ... @@ -25,37 +25,10 @@
<div class="order-pay">
{{#if cart.isEmpty}}
<div class="pay-wapper">
<<<<<<< HEAD
<table>
<thead>
<tr>
<th style="width:7%;">
全选
</th>
<th style="width:40%;">
商品信息
</th>
<th style="width:13%;">单价</th>
<th style="width:10%;">数量</th>
<th style="width:10%;">小计（元）</th>
<th style="width:20%;">操作</th>
</tr>
</thead>
<tbody>
<tr class="pre-sell-box">
<td colspan="6" class="cart-empty">
<a href="{{cart.guangUrl}}">选购商品</a>
<a href="{{cart.viewOrderUrl}}">查看订单</a>
</td>
</tr>
</tbody>
</table>
=======
<div class="shop-cart-empty">
<p>购物车空空的哦，去看看心仪的商品吧~</p>
</div>
>>>>>>> 91cc71042ef15455f75f11fdf21902e4cf115f3a
</div>
<div class="dev-revocation {{#unless cart.deleteShop}}none{{/unless}}">
<table>
... ... @@ -76,18 +49,6 @@
{{^}}
<!-- 购物车商品列表 -->
{{#cart}}
<<<<<<< HEAD
<div class="pay-wapper">
<div class="cart-title">
<p class="left" style="width:6%;">
<input type="checkbox"/> 全选
</p>
<p style="width:40%">商品信息</p>
<p style="width:14%">单价</p>
<p style="width:13%;">数量</p>
<p style="width:16%;">小计（元）</p>
<p class="right" style="width:11%;">操作</p>
=======
<div class="pay-wapper">
<div class="cart-title">
<p class="left" style="width:6%;">
... ... @@ -104,7 +65,6 @@
<!-- 预售商品 -->
<div class="pre-sell">
<code>预售商品</code>预售商品不参加活动，不可使用优惠券，不同上市期的商品我们将为您先到先发。
>>>>>>> 91cc71042ef15455f75f11fdf21902e4cf115f3a
</div>
{{#advanceCart}}
... ... @@ -112,62 +72,6 @@
<div class="pre-sell">
<code>预售商品</code>预售商品不参加活动，不可使用优惠券，不同上市期的商品我们将为您先到先发。
</div>
<<<<<<< HEAD
{{#if goodsList}}
<div class="cart-table">
<ul class="table table-group">
{{#each goodsList}}
{{>cart-item}}
{{/each}}
</ul>
</div>
{{/if}}
{{#if offShelves}}
<div class="cart-table">
<ul class="table table-group">
{{#each offShelves}}
{{>cart-item}}
{{/each}}
</ul>
</div>
{{/if}}
{{#if soldOuts}}
<div class="cart-table">
<ul class="table table-group">
{{#each soldOuts}}
{{>cart-item}}
{{/each}}
</ul>
</div>
{{/if}}
{{/advanceCart}}
{{#ordinaryCart}}
{{#pools}}
{{#if promotionInfos}}
<div class="gift-sell mt40">
{{#promotionInfos}}
<p data-role="promotion-wrap">
<code class="{{#unless isReach}}order-pay-mark-white{{/unless}}">{{tag}}</code>{{promotionTitle}}
<!--<a>去换购</a>-->
{{#if isGift}}
{{#if isNotReach}}<a href="javascript:void(0);" data-role="gift-view-btn">查看赠品</a>{{/if}}
{{#if isSelected}}
<a href="javascript:void(0);" data-role="gift-resel-btn">重选赠品</a>
{{else}}
{{#if isReach}}<a href="javascript:void(0);" data-role="gift-sel-btn">领赠品</a>{{/if}}
{{/if}}
{{/if}}
{{#if isNotReach}}
<a class="btn-clear blue" target="_blank" href="{{promotionPageUrl}}" data-together-id="1" >去凑单&nbsp;></a>
{{/if}}
<textarea data-role="gifts-cansel" class="hide" data-promotionid="{{promotionId}}">{{{giftGoodsListStr}}}</textarea>
</p>
{{/promotionInfos}}
=======
<div class="td pay-pro" style="width: 45%;">
<i class="cart-item-check iconfont cart-item-checked" data-goodstype="{{goodsType}}" {{#if isChecked}}checked{{/if}}></i>
<a class="pay-pro-icon" href="{{link}}" target="_blank">
... ... @@ -272,7 +176,6 @@
<p class="tip-message {{#isTipNoStore}}tipNoStore{{/isTipNoStore}}">库存不足{{tipMessage}}</p>
{{/if}}
{{/if}}
>>>>>>> 91cc71042ef15455f75f11fdf21902e4cf115f3a
</div>
{{/if}}
... ... @@ -333,33 +236,6 @@
</div>
{{/if}}
{{/ordinaryCart}}
<<<<<<< HEAD
{{#stat}}
<!-- 总价计算 -->
<div class="cartnew-sum">
{{#unless cart.isEmpty}}
<div class="left">
<a href="javascript:void(0);" class="btn_h" style="display:none;"><span>清空商品</span></a>
<input type="checkbox" id="cbSelAllGoods" {{#if cart.isCheckedAll}}checked="checked"{{/if}}>
<span>全选</span>
<a class="delAll" href="javascript:void(0);">删除选中商品</a>
<a class="removeAll" href="javascript:void(0);">移入收藏夹</a>
<a class="emptyDisabled" href="javascript:void(0);">清空失效商品</a>
</div>
{{/unless}}
<div class="right">
<p>
{{#if gainYohoCoin}}<a href="/help/?category_id=87" class="yoho-coin" target="_blank"></a>
共返有货币：{{gainYohoCoin}}个&#12288;&#12288;{{/if}}
已选商品<strong class="ins">{{selectedGoodsCount}}件</strong>&#12288;&#12288;
商品金额：<b>¥&nbsp;{{orderAmount}}</b>
</p>
{{#if discountAmount}}<p>活动优惠：<b>-¥&nbsp;{{discountAmount}}</b></p>{{/if}}
<!--<p>优惠码/优惠券：<b>¥&nbsp;8888.00</b></p>-->
<p class="sum">
应付金额（不含邮费）：<strong><kbd>¥&nbsp;</kbd>{{lastOrderAmount}}</strong></p>
=======
{{#stat}}
<!-- 总价计算 -->
<div class="cartnew-sum">
... ... @@ -371,16 +247,8 @@
<a class="delAll" href="javascript:void(0);">删除选中商品</a>
<a class="removeAll" href="javascript:void(0);">移入收藏夹</a>
<a class="emptyDisabled" href="javascript:void(0);">清空失效商品</a>
>>>>>>> 91cc71042ef15455f75f11fdf21902e4cf115f3a
</div>
</div>
<<<<<<< HEAD
<div class="cartnew-submit" id="payDiv">
<span>添加礼品袋</span>
<a href="javascript:void(0);" class="btn-account">去结算</a>
</div>
{{/stat}}
=======
</div>
<div class="cartnew-submit" id="payDiv">
<span>添加礼品袋</span>
... ... @@ -594,7 +462,6 @@
</div>
</li>
</ul>
>>>>>>> 91cc71042ef15455f75f11fdf21902e4cf115f3a
</div>
{{/cart}}
... ...