fe / yohobuy-node · Commits

Go to a project

Authored by OF1706
Commit 24343eeb62868bc322c950eb6fbe38794a67a495 1 parent 80693df4

模态框 重构物

Inline Side-by-side
Showing 4 changed files with 46 additions and 24 deletions
... ... @@ -70,7 +70,7 @@ const formatCartGoods = (cartGoods, isAdvanceCart, inValid, isOffShelves, analys
pid: it.product_id,
isChecked: it.selected === 'Y',
productTitle: it.product_name,
imgCover: it.goods_images ? helpers.image(it.goods_images, 66, 90) : '',
imgCover: it.goods_images ? helpers.image(it.goods_images, 64,88) : '',
productColor: it.factory_goods_name,
productSize: it.size_name,
productPrice: transPrice(it.last_vip_price), // self::transPrice($value['real_price']);
... ...
<div class="order-ensure-page shop-cart yoho-page clearfix">
<div class="shop-cart yoho-page clearfix">
<div class="order-edit order-cart" id="cart-page">
<div class="order-title cart-page-title order-ensure-title">
{{> shopping-step}}
... ... @@ -32,14 +32,13 @@
<table>
{{# cart.deleteShop}}
<tr data-productnum="{{productNum}}" data-productsku="{{productSku}}">
<td style="width:40%; text-align: left;">成功删除<a class="title" href="{{link}}"
<td style="width:35%; text-align: left;">成功删除<a class="title" href="{{link}}"
target="_blank">{{productTitle}}</a>
</td>
<td style="width:10%;"><span class="productPrice">{{productPrice}}</span></td>
<td style="width:10%;"></td>
<td style="width:10%;">{{productNum}}件</td>
<td style="width:10%;"></td>
<td style="width:20%; border-right: none; text-align: right;">
<td style="width:14%;"><span class="productPrice">{{productPrice}}</span></td>
<td style="width:15%;">{{productNum}}件</td>
<td style="width:16%;"></td>
<td style="width:11.8%; border-right: none; text-align: right;">
<a href="javascript:void(0);"><span class="goBack">撤销本次删除</span></a>
</td>
</tr>
... ... @@ -54,11 +53,11 @@
<p class="left" style="width:6%;">
<i class="cart-item-check iconfont cart-item-checked"></i>&nbsp;&nbsp;全选
</p>
<p style="width:40%">商品信息</p>
<p style="width:35%">商品信息</p>
<p style="width:14%">单价</p>
<p style="width:13%;">数量</p>
<p style="width:16%;">小计（元）</p>
<p class="right" style="width:11%;">操作</p>
<p style="width:15%;">数量</p>
<p style="width:16%;">小计</p>
<p class="right" style="width:11.8%;">操作</p>
</div>
{{#advanceCart}}
... ... @@ -292,6 +291,25 @@
{{#if noSelectGiftTip}}data-noSelectGiftTip="true"{{/if}}>去结算</a>
</div>
{{/stat}}
<div class="cart-del-goods">
<p class="cart-del-goods-title">已删除商品，您可以重新购买或移入收藏：</p>
<ul>
<li>
<span class="good-name" style="width: 392px;">TEEBACOO虎头字母短袖T恤</span>
<span class="good-price" style="width: 148px;">¥760.00</span>
<span class="good-num" style="width: 128px;">2</span>
<span class="good-operate" style="width: 260px;"><a>重新购买</a><a>移入收藏</a></span>
</li>
<li>
<span class="good-name" style="width: 392px;">TEEBACOO虎头字母短袖T恤</span>
<span class="good-price" style="width: 148px;">¥760.00</span>
<span class="good-num" style="width: 128px;">2</span>
<span class="good-operate" style="width: 260px;"><a>重新购买</a><a>移入收藏</a></span>
</li>
</ul>
</div>
{{> cart-pre-sell-tpl }}
</div>
{{/cart}}
... ... @@ -369,12 +387,15 @@
{{/unless}}
<div class="loading"><span></span>请稍后...</div>
<div id="Y_goodsSelectWin" class="goods-select-win yoho-dialog cart-togetherGoods" style="top:50px;display:none;">
<div class="close">
<i class="iconfont">&#xe60d;</i>
<div class="modal-overflow" style="display: none;">
<div class="body-modal-black"></div>
<div id="Y_goodsSelectWin" class="goods-select-win yoho- cart-togetherGoods" style="top:50px;">
<div class="close">
<i class="iconfont">&#xe60d;</i>
</div>
<div class="content goods-select-content">
</div>
</div>
<div class="content goods-select-content"></div>
</div>
</div>
... ...
... ... @@ -561,7 +561,7 @@
<ul class="table">
<li class="pre-sell-box tr tr-disabled" {{#if pid}}data-pid="{{pid}}"{{/if}} {{#if id}}data-id="{{id}}"{{/if}} {{#if skn}}data-skn="{{skn}}"{{/if}} {{#if sku}}data-sku="{{sku}}"{{/if}} {{#if productNum}}data-productnum="{{productNum}}"{{/if}} {{#if goodsType}}data-goodstype="{{goodsType}}"{{/if}}>
<div class="pay-pro td" style="width: 45%;">
<del class="cart-item-disabled">失效</del>
<i class="cart-item-disabled iconfont"></i>
<a class="pay-pro-icon" href="{{link}}" target="_blank">
<img src="{{imgCover}}">
<span class="incentive">预售</span>
... ...
... ... @@ -13,10 +13,11 @@
data-size="{{productSize}}"
{{#if isGift}} data-isgift="true"{{/if}}
{{#if isPriceGift}}data-ispricegift="true"{{/if}} >
<div class="pay-pro td" style="width: 45%;">
<sub class="out-of-stock">您勾选的商品库存不足</sub>
<div class="pay-pro td" style="width: 368px;">
{{#unless isGift}}
{{#if inValid}}
<i class="cart-item-disabled">失效</i>
<i class="cart-item-disabled iconfont"></i>
{{else}}
<i class="cart-item-check iconfont {{#isChecked}}cart-item-checked{{/isChecked}}"
data-role="cart-item-check"
... ... @@ -34,7 +35,7 @@
<em class="pay-pro-detail"><span><b title="{{productColor}}">颜色：{{productColor}}</b> 尺码：{{productSize}}<i class="iconfont">&#xe6c7;</i></span></em>
</p>
</div>
<div class="product-price td" style="width:17%;">¥{{productPrice}}
<div class="product-price td" style="width:148px;">¥{{productPrice}}
{{#if promotionInfos}}
<div class="sale-info">
<span class="sale-info-title">促销信息<i></i></span>
... ... @@ -51,7 +52,7 @@
</div>
{{/if}}
</div>
<div style="width:10%;" class="adjust-cart-num td">
<div style="width:128px;" class="adjust-cart-num td">
{{#if isGift}}
<div>{{productNum}}</div>
{{^}}
... ... @@ -68,13 +69,13 @@
{{/if}}
{{/if}}
</div>
<div style="width:17%;" class="sub-total red td">
<div style="width:160px;" class="sub-total red td">
¥{{productSubtotal}}
{{#if yohoIcon}}
<p class="tip-message tip-message-coin"><i class="yoho-coin"></i>返{{yohoIcon}}有货币</p>
{{/if}}
</div>
<div style="width:11%;" class="cart-operation td">
<div style="width:100px;" class="cart-operation td">
<span class="cart-del-btn" data-role="cart-del-btn">删除</span>
<span class="cart-col-btn" data-role="cart-mov2fav-btn">移入收藏</span>
</div>
... ...