fe / yohobuy-node · Commits

Go to a project

Authored by 刘传洋
Commit ded31e153a7382d262a52a94087958fc496809b3 1 parent 38b933f3

m

Inline Side-by-side
Showing 2 changed files with 71 additions and 68 deletions
@@ -230,61 +230,7 @@ @@ -230,61 +230,7 @@
230 <div class="cart-table"> 230 <div class="cart-table">
231 <ul class="table"> 231 <ul class="table">
232 {{#goodsList}} 232 {{#goodsList}}
233 - <li class="pre-sell-box tr {{#isChecked}}active{{/isChecked}}"  
234 - {{#if pid}}data-pid="{{pid}}"{{/if}}  
235 - {{#if id}}data-id="{{id}}"{{/if}}  
236 - {{#if skn}}data-skn="{{skn}}"{{/if}}  
237 - {{#if sku}}data-sku="{{sku}}"{{/if}}  
238 - {{#if productNum}}data-productnum="{{productNum}}"{{/if}}  
239 - {{#if goodsType}}data-goodstype="{{goodsType}}"{{/if}}>  
240 - <div class="pay-pro td" style="width: 45%;">  
241 - <input class="cart-item-check {{#isChecked}}cart-item-checked{{/isChecked}}"  
242 - readonly="readonly" data-goodstype="{{goodsType}}"  
243 - {{#if isChecked}}checked{{/if}}/>  
244 - <a class="pay-pro-icon" href="{{link}}" target="_blank">  
245 - <img src="{{imgCover}}">  
246 - <span class="incentive red">预售</span>  
247 - </a>  
248 - <p class="pay-pro-info">  
249 - <a href="{{link}}" target="_blank">{{productTitle}}</a>  
250 - <span><b title="{{productColor}}">颜色：红色{{productColor}}</b> 尺码：{{productSize}}</span>  
251 - </p>  
252 - </div>  
253 - <div class="product-price td" style="width:17%;">¥{{productPrice}}  
254 - {{#if promotionInfos}}  
255 - <div class="sale-info">  
256 - <span class="sale-info-title">促销信息<i></i></span>  
257 - <ul class="none">  
258 - {{#promotionInfos}}  
259 - <li>{{promotionTitle}}<a href="#">去换购</a></li>  
260 - {{/promotionInfos}}  
261 - </ul>  
262 - </div>  
263 - {{/if}}  
264 - </div>  
265 - <div style="width:10%;" class="adjust-cart-num td">  
266 - {{#if isGift}}  
267 - <div>{{productNum}}</div>  
268 - {{^}}  
269 - {{#if isPriceGift}}  
270 - <div>{{productNum}}</div>  
271 - {{^}}  
272 - <div class="cart-num-cont">  
273 - <span class="minus"></span>  
274 - <input type="text" value="{{productNum}}" readonly="readonly"/>  
275 - <span class="plus"></span>  
276 - </div>  
277 -  
278 - <p class="tip-message {{#isTipNoStore}}tipNoStore{{/isTipNoStore}}">{{tipMessage}}</p>  
279 - {{/if}}  
280 - {{/if}}  
281 - </div>  
282 - <div style="width:17%;" class="sub-total red td">¥{{productSubtotal}}</div>  
283 - <div style="width:11%;" class="cart-operation td">  
284 - <span class="cart-del-btn">删除</span>  
285 - <span class="cart-col-btn">移入收藏</span>  
286 - </div>  
287 - </li> 233 + {{> cart-item}}
288 {{/goodsList}} 234 {{/goodsList}}
289 </ul> 235 </ul>
290 </div> 236 </div>
@@ -299,23 +245,25 @@ @@ -299,23 +245,25 @@
299 <!-- --> 245 <!-- -->
300 {{#if offShelves}} 246 {{#if offShelves}}
301 {{#offShelves}} 247 {{#offShelves}}
302 - 248 + {{> cart-item}}
303 {{/offShelves}} 249 {{/offShelves}}
304 {{/if}} 250 {{/if}}
305 251
306 <!-- --> 252 <!-- -->
307 {{#if soldOuts}} 253 {{#if soldOuts}}
308 - {{#soldOuts}}{{/soldOuts}} 254 + {{#soldOuts}}
  255 + {{> cart-item}}
  256 + {{/soldOuts}}
309 {{/if}} 257 {{/if}}
310 258
311 <!-- 全场已选择的 加价购+赠品 --> 259 <!-- 全场已选择的 加价购+赠品 -->
312 {{#if goodsList}} 260 {{#if goodsList}}
313 {{#each goodsList}} 261 {{#each goodsList}}
314 - 262 + {{> cart-item}}
315 {{/each}} 263 {{/each}}
316 {{/if}} 264 {{/if}}
317 265
318 - <div class="cart-table"> 266 + <d<!--iv class="cart-table">
319 <ul class="table"> 267 <ul class="table">
320 <li class="pre-sell-box tr" {{#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}}> 268 <li class="pre-sell-box tr" {{#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}}>
321 <div class="pay-pro td" style="width: 45%;"> 269 <div class="pay-pro td" style="width: 45%;">
@@ -408,10 +356,10 @@ @@ -408,10 +356,10 @@
408 </div> 356 </div>
409 </li> 357 </li>
410 </ul> 358 </ul>
411 - </div> 359 + </div>-->
412 360
413 <!-- 折扣 --> 361 <!-- 折扣 -->
414 - <div class="gift-sell mt20"> 362 + <!--<div class="gift-sell mt20">
415 <p><code>折扣</code>【New Balance】活动商品已购满2件，享优惠¥261.00<button class="btn-clear" data-together-id="3" >去凑单&nbsp;></button></p> 363 <p><code>折扣</code>【New Balance】活动商品已购满2件，享优惠¥261.00<button class="btn-clear" data-together-id="3" >去凑单&nbsp;></button></p>
416 </div> 364 </div>
417 <div class="cart-table"> 365 <div class="cart-table">
@@ -492,9 +440,9 @@ @@ -492,9 +440,9 @@
492 </li> 440 </li>
493 </ul> 441 </ul>
494 </div> 442 </div>
495 - 443 +-->
496 <!-- 折扣 赠品 --> 444 <!-- 折扣 赠品 -->
497 - <div class="gift-sell mt20"> 445 + <!--<div class="gift-sell mt20">
498 <p><code class="order-pay-mark-white">折扣</code>【New Balance】活动商品已购满2件，享优惠¥261.00<button class="btn-clear" data-together-id="4" >去凑单&nbsp;></button></p> 446 <p><code class="order-pay-mark-white">折扣</code>【New Balance】活动商品已购满2件，享优惠¥261.00<button class="btn-clear" data-together-id="4" >去凑单&nbsp;></button></p>
499 <p><code>赠品</code>【Life·After Life】活动商品已购满1件，可领取赠品<a>领赠品</a><button class="btn-clear" data-together-id="5" >去凑单&nbsp;></button></p> 447 <p><code>赠品</code>【Life·After Life】活动商品已购满1件，可领取赠品<a>领赠品</a><button class="btn-clear" data-together-id="5" >去凑单&nbsp;></button></p>
500 </div> 448 </div>
@@ -538,10 +486,10 @@ @@ -538,10 +486,10 @@
538 </div> 486 </div>
539 </li> 487 </li>
540 </ul> 488 </ul>
541 - </div> 489 + </div>-->
542 490
543 <!-- 其他 --> 491 <!-- 其他 -->
544 - <div class="cart-table mb20"> 492 + <!--<div class="cart-table mb20">
545 <ul class="table table-group"> 493 <ul class="table table-group">
546 <li class="pre-sell-box tr" {{#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}}> 494 <li class="pre-sell-box tr" {{#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}}>
547 <div class="pay-pro td" style="width: 45%;"> 495 <div class="pay-pro td" style="width: 45%;">
@@ -660,10 +608,10 @@ @@ -660,10 +608,10 @@
660 </div> 608 </div>
661 </li> 609 </li>
662 </ul> 610 </ul>
663 - </div> 611 + </div>-->
664 612
665 <!-- 失效 --> 613 <!-- 失效 -->
666 - <div class="cart-table cart-table-disabled"> 614 + <!--<div class="cart-table cart-table-disabled">
667 <ul class="table"> 615 <ul class="table">
668 <li class="pre-sell-box tr" {{#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}}> 616 <li class="pre-sell-box tr" {{#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}}>
669 <div class="pay-pro td" style="width: 45%;"> 617 <div class="pay-pro td" style="width: 45%;">
@@ -745,7 +693,7 @@ @@ -745,7 +693,7 @@
745 </div> 693 </div>
746 </li> 694 </li>
747 </ul> 695 </ul>
748 - </div> 696 + </div>-->
749 697
750 {{#if promotionInfos}} 698 {{#if promotionInfos}}
751 <div class="gift-sell mt20"> 699 <div class="gift-sell mt20">
  1 +<li class="pre-sell-box tr {{#isChecked}}active{{/isChecked}}"
  2 + {{#if pid}}data-pid="{{pid}}"{{/if}}
  3 + {{#if id}}data-id="{{id}}"{{/if}}
  4 + {{#if skn}}data-skn="{{skn}}"{{/if}}
  5 + {{#if sku}}data-sku="{{sku}}"{{/if}}
  6 + {{#if productNum}}data-productnum="{{productNum}}"{{/if}}
  7 + {{#if goodsType}}data-goodstype="{{goodsType}}"{{/if}} >
  8 + <div class="pay-pro td" style="width: 45%;">
  9 + <input class="cart-item-check {{#isChecked}}cart-item-checked{{/isChecked}}"
  10 + readonly="readonly" data-goodstype="{{goodsType}}"
  11 + {{#if isChecked}}checked{{/if}}/>
  12 + <a class="pay-pro-icon" href="{{link}}" target="_blank">
  13 + <img src="{{imgCover}}">
  14 + <span class="incentive red">预售</span>
  15 + </a>
  16 + <p class="pay-pro-info">
  17 + <a href="{{link}}" target="_blank">{{productTitle}}</a>
  18 + <span><b title="{{productColor}}">颜色：红色{{productColor}}</b> 尺码：{{productSize}}</span>
  19 + </p>
  20 + </div>
  21 + <div class="product-price td" style="width:17%;">¥{{productPrice}}
  22 + {{#if promotionInfos}}
  23 + <div class="sale-info">
  24 + <span class="sale-info-title">促销信息<i></i></span>
  25 + <ul class="none">
  26 + {{#promotionInfos}}
  27 + <li>{{promotionTitle}}<a href="#">去换购</a></li>
  28 + {{/promotionInfos}}
  29 + </ul>
  30 + </div>
  31 + {{/if}}
  32 + </div>
  33 + <div style="width:10%;" class="adjust-cart-num td">
  34 + {{#if isGift}}
  35 + <div>{{productNum}}</div>
  36 + {{^}}
  37 + {{#if isPriceGift}}
  38 + <div>{{productNum}}</div>
  39 + {{^}}
  40 + <div class="cart-num-cont">
  41 + <span class="minus"></span>
  42 + <input type="text" value="{{productNum}}" readonly="readonly"/>
  43 + <span class="plus"></span>
  44 + </div>
  45 +
  46 + <p class="tip-message {{#isTipNoStore}}tipNoStore{{/isTipNoStore}}">{{tipMessage}}</p>
  47 + {{/if}}
  48 + {{/if}}
  49 + </div>
  50 + <div style="width:17%;" class="sub-total red td">¥{{productSubtotal}}</div>
  51 + <div style="width:11%;" class="cart-operation td">
  52 + <span class="cart-del-btn">删除</span>
  53 + <span class="cart-col-btn">移入收藏</span>
  54 + </div>
  55 +</li>