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 @@ @@ -25,37 +25,10 @@
25 <div class="order-pay"> 25 <div class="order-pay">
26 {{#if cart.isEmpty}} 26 {{#if cart.isEmpty}}
27 <div class="pay-wapper"> 27 <div class="pay-wapper">
28 -<<<<<<< HEAD  
29 - <table>  
30 - <thead>  
31 - <tr>  
32 - <th style="width:7%;">  
33 - 全选  
34 - </th>  
35 - <th style="width:40%;">  
36 - 商品信息  
37 - </th>  
38 - <th style="width:13%;">单价</th>  
39 - <th style="width:10%;">数量</th>  
40 - <th style="width:10%;">小计（元）</th>  
41 - <th style="width:20%;">操作</th>  
42 - </tr>  
43 - </thead>  
44 - <tbody>  
45 - <tr class="pre-sell-box">  
46 - <td colspan="6" class="cart-empty">  
47 - <a href="{{cart.guangUrl}}">选购商品</a>  
48 - <a href="{{cart.viewOrderUrl}}">查看订单</a>  
49 - </td>  
50 - </tr>  
51 - </tbody>  
52 - </table>  
53 -=======  
54 <div class="shop-cart-empty"> 28 <div class="shop-cart-empty">
55 <p>购物车空空的哦，去看看心仪的商品吧~</p> 29 <p>购物车空空的哦，去看看心仪的商品吧~</p>
56 30
57 </div> 31 </div>
58 ->>>>>>> 91cc71042ef15455f75f11fdf21902e4cf115f3a  
59 </div> 32 </div>
60 <div class="dev-revocation {{#unless cart.deleteShop}}none{{/unless}}"> 33 <div class="dev-revocation {{#unless cart.deleteShop}}none{{/unless}}">
61 <table> 34 <table>
@@ -76,18 +49,6 @@ @@ -76,18 +49,6 @@
76 {{^}} 49 {{^}}
77 <!-- 购物车商品列表 --> 50 <!-- 购物车商品列表 -->
78 {{#cart}} 51 {{#cart}}
79 -<<<<<<< HEAD  
80 - <div class="pay-wapper">  
81 - <div class="cart-title">  
82 - <p class="left" style="width:6%;">  
83 - <input type="checkbox"/> 全选  
84 - </p>  
85 - <p style="width:40%">商品信息</p>  
86 - <p style="width:14%">单价</p>  
87 - <p style="width:13%;">数量</p>  
88 - <p style="width:16%;">小计（元）</p>  
89 - <p class="right" style="width:11%;">操作</p>  
90 -=======  
91 <div class="pay-wapper"> 52 <div class="pay-wapper">
92 <div class="cart-title"> 53 <div class="cart-title">
93 <p class="left" style="width:6%;"> 54 <p class="left" style="width:6%;">
@@ -104,7 +65,6 @@ @@ -104,7 +65,6 @@
104 <!-- 预售商品 --> 65 <!-- 预售商品 -->
105 <div class="pre-sell"> 66 <div class="pre-sell">
106 <code>预售商品</code>预售商品不参加活动，不可使用优惠券，不同上市期的商品我们将为您先到先发。 67 <code>预售商品</code>预售商品不参加活动，不可使用优惠券，不同上市期的商品我们将为您先到先发。
107 ->>>>>>> 91cc71042ef15455f75f11fdf21902e4cf115f3a  
108 </div> 68 </div>
109 69
110 {{#advanceCart}} 70 {{#advanceCart}}
@@ -112,62 +72,6 @@ @@ -112,62 +72,6 @@
112 <div class="pre-sell"> 72 <div class="pre-sell">
113 <code>预售商品</code>预售商品不参加活动，不可使用优惠券，不同上市期的商品我们将为您先到先发。 73 <code>预售商品</code>预售商品不参加活动，不可使用优惠券，不同上市期的商品我们将为您先到先发。
114 </div> 74 </div>
115 -  
116 -<<<<<<< HEAD  
117 - {{#if goodsList}}  
118 - <div class="cart-table">  
119 - <ul class="table table-group">  
120 - {{#each goodsList}}  
121 - {{>cart-item}}  
122 - {{/each}}  
123 - </ul>  
124 - </div>  
125 - {{/if}}  
126 -  
127 - {{#if offShelves}}  
128 - <div class="cart-table">  
129 - <ul class="table table-group">  
130 - {{#each offShelves}}  
131 - {{>cart-item}}  
132 - {{/each}}  
133 - </ul>  
134 - </div>  
135 - {{/if}}  
136 -  
137 - {{#if soldOuts}}  
138 - <div class="cart-table">  
139 - <ul class="table table-group">  
140 - {{#each soldOuts}}  
141 - {{>cart-item}}  
142 - {{/each}}  
143 - </ul>  
144 - </div>  
145 - {{/if}}  
146 - {{/advanceCart}}  
147 -  
148 - {{#ordinaryCart}}  
149 - {{#pools}}  
150 - {{#if promotionInfos}}  
151 - <div class="gift-sell mt40">  
152 - {{#promotionInfos}}  
153 - <p data-role="promotion-wrap">  
154 - <code class="{{#unless isReach}}order-pay-mark-white{{/unless}}">{{tag}}</code>{{promotionTitle}}  
155 - <!--<a>去换购</a>-->  
156 - {{#if isGift}}  
157 - {{#if isNotReach}}<a href="javascript:void(0);" data-role="gift-view-btn">查看赠品</a>{{/if}}  
158 - {{#if isSelected}}  
159 - <a href="javascript:void(0);" data-role="gift-resel-btn">重选赠品</a>  
160 - {{else}}  
161 - {{#if isReach}}<a href="javascript:void(0);" data-role="gift-sel-btn">领赠品</a>{{/if}}  
162 - {{/if}}  
163 - {{/if}}  
164 - {{#if isNotReach}}  
165 - <a class="btn-clear blue" target="_blank" href="{{promotionPageUrl}}" data-together-id="1" >去凑单&nbsp;></a>  
166 - {{/if}}  
167 - <textarea data-role="gifts-cansel" class="hide" data-promotionid="{{promotionId}}">{{{giftGoodsListStr}}}</textarea>  
168 - </p>  
169 - {{/promotionInfos}}  
170 -=======  
171 <div class="td pay-pro" style="width: 45%;"> 75 <div class="td pay-pro" style="width: 45%;">
172 <i class="cart-item-check iconfont cart-item-checked" data-goodstype="{{goodsType}}" {{#if isChecked}}checked{{/if}}></i> 76 <i class="cart-item-check iconfont cart-item-checked" data-goodstype="{{goodsType}}" {{#if isChecked}}checked{{/if}}></i>
173 <a class="pay-pro-icon" href="{{link}}" target="_blank"> 77 <a class="pay-pro-icon" href="{{link}}" target="_blank">
@@ -272,7 +176,6 @@ @@ -272,7 +176,6 @@
272 <p class="tip-message {{#isTipNoStore}}tipNoStore{{/isTipNoStore}}">库存不足{{tipMessage}}</p> 176 <p class="tip-message {{#isTipNoStore}}tipNoStore{{/isTipNoStore}}">库存不足{{tipMessage}}</p>
273 {{/if}} 177 {{/if}}
274 {{/if}} 178 {{/if}}
275 ->>>>>>> 91cc71042ef15455f75f11fdf21902e4cf115f3a  
276 </div> 179 </div>
277 {{/if}} 180 {{/if}}
278 181
@@ -333,33 +236,6 @@ @@ -333,33 +236,6 @@
333 </div> 236 </div>
334 {{/if}} 237 {{/if}}
335 {{/ordinaryCart}} 238 {{/ordinaryCart}}
336 -  
337 -<<<<<<< HEAD  
338 - {{#stat}}  
339 - <!-- 总价计算 -->  
340 - <div class="cartnew-sum">  
341 - {{#unless cart.isEmpty}}  
342 - <div class="left">  
343 - <a href="javascript:void(0);" class="btn_h" style="display:none;"><span>清空商品</span></a>  
344 - <input type="checkbox" id="cbSelAllGoods" {{#if cart.isCheckedAll}}checked="checked"{{/if}}>  
345 - <span>全选</span>  
346 - <a class="delAll" href="javascript:void(0);">删除选中商品</a>  
347 - <a class="removeAll" href="javascript:void(0);">移入收藏夹</a>  
348 - <a class="emptyDisabled" href="javascript:void(0);">清空失效商品</a>  
349 - </div>  
350 - {{/unless}}  
351 - <div class="right">  
352 - <p>  
353 - {{#if gainYohoCoin}}<a href="/help/?category_id=87" class="yoho-coin" target="_blank"></a>  
354 - 共返有货币：{{gainYohoCoin}}个&#12288;&#12288;{{/if}}  
355 - 已选商品<strong class="ins">{{selectedGoodsCount}}件</strong>&#12288;&#12288;  
356 - 商品金额：<b>¥&nbsp;{{orderAmount}}</b>  
357 - </p>  
358 - {{#if discountAmount}}<p>活动优惠：<b>-¥&nbsp;{{discountAmount}}</b></p>{{/if}}  
359 - <!--<p>优惠码/优惠券：<b>¥&nbsp;8888.00</b></p>-->  
360 - <p class="sum">  
361 - 应付金额（不含邮费）：<strong><kbd>¥&nbsp;</kbd>{{lastOrderAmount}}</strong></p>  
362 -=======  
363 {{#stat}} 239 {{#stat}}
364 <!-- 总价计算 --> 240 <!-- 总价计算 -->
365 <div class="cartnew-sum"> 241 <div class="cartnew-sum">
@@ -371,16 +247,8 @@ @@ -371,16 +247,8 @@
371 <a class="delAll" href="javascript:void(0);">删除选中商品</a> 247 <a class="delAll" href="javascript:void(0);">删除选中商品</a>
372 <a class="removeAll" href="javascript:void(0);">移入收藏夹</a> 248 <a class="removeAll" href="javascript:void(0);">移入收藏夹</a>
373 <a class="emptyDisabled" href="javascript:void(0);">清空失效商品</a> 249 <a class="emptyDisabled" href="javascript:void(0);">清空失效商品</a>
374 ->>>>>>> 91cc71042ef15455f75f11fdf21902e4cf115f3a  
375 </div> 250 </div>
376 </div> 251 </div>
377 -<<<<<<< HEAD  
378 - <div class="cartnew-submit" id="payDiv">  
379 - <span>添加礼品袋</span>  
380 - <a href="javascript:void(0);" class="btn-account">去结算</a>  
381 - </div>  
382 - {{/stat}}  
383 -=======  
384 </div> 252 </div>
385 <div class="cartnew-submit" id="payDiv"> 253 <div class="cartnew-submit" id="payDiv">
386 <span>添加礼品袋</span> 254 <span>添加礼品袋</span>
@@ -594,7 +462,6 @@ @@ -594,7 +462,6 @@
594 </div> 462 </div>
595 </li> 463 </li>
596 </ul> 464 </ul>
597 ->>>>>>> 91cc71042ef15455f75f11fdf21902e4cf115f3a  
598 </div> 465 </div>
599 {{/cart}} 466 {{/cart}}
600 467