fe / yohobuy-node · Commits

Go to a project

Authored by 刘传洋
Commit ced2aa595e87fce2ff11121bcd892673153f554a 2 parents 990d67b1 5d501fcd

m

Inline Side-by-side
Showing 8 changed files with 627 additions and 155 deletions
@@ -11,7 +11,8 @@ @@ -11,7 +11,8 @@
11 <div class="cartnew-tips"> 11 <div class="cartnew-tips">
12 <div class="tipsbox" id="tipsbox"> 12 <div class="tipsbox" id="tipsbox">
13 <a href="javascript:void(0);" class="btn_close" title="关闭"></a> 13 <a href="javascript:void(0);" class="btn_close" title="关闭"></a>
14 - <strong>温馨提示：</strong>亲爱的顾客，您还没有 <a href="{{cart.loginUrl}}" class="a_eu">登录</a> 哦，所有商品价格、活动信息以登录后显示为准. 14 + <strong>温馨提示：</strong>亲爱的顾客，您还没有 <a href="{{cart.loginUrl}}" class="a_eu">登录</a>
  15 + 哦，所有商品价格、活动信息以登录后显示为准.
15 </div> 16 </div>
16 </div> 17 </div>
17 {{^}} 18 {{^}}
@@ -25,17 +26,19 @@ @@ -25,17 +26,19 @@
25 <div class="order-pay"> 26 <div class="order-pay">
26 {{#if cart.isEmpty}} 27 {{#if cart.isEmpty}}
27 <div class="pay-wapper"> 28 <div class="pay-wapper">
28 - <div class="shop-cart-empty">  
29 - <i class="iconfont"></i>  
30 - <p>购物车空空的哦，去看看心仪的商品吧~</p>  
31 - <a href="#">去购物</a>  
32 - </div> 29 + <div class="shop-cart-empty">
  30 + <i class="iconfont"></i>
  31 + <p>购物车空空的哦，去看看心仪的商品吧~</p>
  32 + <a href="#">去购物</a>
  33 + </div>
33 </div> 34 </div>
34 <div class="dev-revocation {{#unless cart.deleteShop}}none{{/unless}}"> 35 <div class="dev-revocation {{#unless cart.deleteShop}}none{{/unless}}">
35 <table> 36 <table>
36 {{# cart.deleteShop}} 37 {{# cart.deleteShop}}
37 <tr data-productnum="{{productNum}}" data-productsku="{{productSku}}"> 38 <tr data-productnum="{{productNum}}" data-productsku="{{productSku}}">
38 - <td style="width:40%; text-align: left;">成功删除<a class="title" href="{{link}}" target="_blank">{{productTitle}}</a></td> 39 + <td style="width:40%; text-align: left;">成功删除<a class="title" href="{{link}}"
  40 + target="_blank">{{productTitle}}</a>
  41 + </td>
39 <td style="width:10%;"><span class="productPrice">{{productPrice}}</span></td> 42 <td style="width:10%;"><span class="productPrice">{{productPrice}}</span></td>
40 <td style="width:10%;"></td> 43 <td style="width:10%;"></td>
41 <td style="width:10%;">{{productNum}}件</td> 44 <td style="width:10%;">{{productNum}}件</td>
@@ -53,7 +56,7 @@ @@ -53,7 +56,7 @@
53 <div class="pay-wapper"> 56 <div class="pay-wapper">
54 <div class="cart-title"> 57 <div class="cart-title">
55 <p class="left" style="width:6%;"> 58 <p class="left" style="width:6%;">
56 - <i class="cart-item-check iconfont cart-item-checked"></i> 全选 59 + <i class="cart-item-check iconfont cart-item-checked"></i> 全选
57 </p> 60 </p>
58 <p style="width:40%">商品信息</p> 61 <p style="width:40%">商品信息</p>
59 <p style="width:14%">单价</p> 62 <p style="width:14%">单价</p>
@@ -104,14 +107,24 @@ @@ -104,14 +107,24 @@
104 {{#if promotionInfos}} 107 {{#if promotionInfos}}
105 <div class="gift-sell mt40"> 108 <div class="gift-sell mt40">
106 {{#promotionInfos}} 109 {{#promotionInfos}}
107 - <div data-role="promotion-wrap" >  
108 - <code class="{{#unless isReach}}order-pay-mark-white{{/unless}}">{{tag}}</code>{{promotionTitle}} 110 +
  111 + <div class="gift-sell-info" data-role="promotion-wrap">
  112 + <code class="order-pay-mark
  113 + {{#unless isReach}}order-pay-mark-white{{/unless}}">
  114 + {{tag}}
  115 + </code>{{promotionTitle}}
  116 +
109 {{#if isGift}} 117 {{#if isGift}}
110 - {{#if isNotReach}}<a href="javascript:void(0);" data-role="gift-view-btn">查看赠品</a>{{/if}} 118 + {{#if isNotReach}}
  119 + <a class="order-pay-link" href="javascript:void(0);"
  120 + data-role="gift-view-btn">查看赠品</a>{{/if}}
111 {{#if isSelected}} 121 {{#if isSelected}}
112 - <a href="javascript:void(0);" data-role="gift-resel-btn">重选赠品</a> 122 + <a class="order-pay-link" href="javascript:void(0);"
  123 + data-role="gift-resel-btn">重选赠品</a>
113 {{else}} 124 {{else}}
114 - {{#if isReach}}<a href="javascript:void(0);" data-role="gift-sel-btn">领赠品</a>{{/if}} 125 + {{#if isReach}}
  126 + <a class="order-pay-link" href="javascript:void(0);"
  127 + data-role="gift-sel-btn">领赠品</a>{{/if}}
115 {{/if}} 128 {{/if}}
116 {{/if}} 129 {{/if}}
117 130
@@ -126,7 +139,7 @@ @@ -126,7 +139,7 @@
126 {{/if}} 139 {{/if}}
127 140
128 {{#if isNotReach}} 141 {{#if isNotReach}}
129 - <a class="btn-clear blue" target="_blank" href="{{promotionPageUrl}}" data-together-id="1" >去凑单&nbsp;></a> 142 + <a class="btn-clear blue order-pay-link" target="_blank" href="{{promotionPageUrl}}">去凑单&nbsp;></a>
130 {{/if}} 143 {{/if}}
131 {{/if}} 144 {{/if}}
132 145
@@ -189,7 +202,9 @@ @@ -189,7 +202,9 @@
189 {{#if promotionInfos}} 202 {{#if promotionInfos}}
190 <div class="gift-sell mt20"> 203 <div class="gift-sell mt20">
191 {{#promotionInfos}} 204 {{#promotionInfos}}
192 - <p><code>{{tag}}</code>{{promotionTitle}}<a class="btn-clear blue" data-together-id="6">去凑单&nbsp;&gt;</a></p> 205 + <p class="gift-sell-info"><code>{{tag}}</code>{{promotionTitle}}<a class="btn-clear blue"
  206 + data-together-id="6">去凑单&nbsp;&gt;</a>
  207 + </p>
193 {{/promotionInfos}} 208 {{/promotionInfos}}
194 </div> 209 </div>
195 {{/if}} 210 {{/if}}
@@ -200,8 +215,10 @@ @@ -200,8 +215,10 @@
200 <div class="cartnew-sum"> 215 <div class="cartnew-sum">
201 {{#unless cart.isEmpty}} 216 {{#unless cart.isEmpty}}
202 <div class="left"> 217 <div class="left">
203 - <a href="javascript:void(0);" class="btn_h" style="display:none;"><span>清空商品</span></a>  
204 - <i class="cart-item-check iconfont" id="cbSelAllGoods" {{#if cart.isCheckedAll}}checked="checked"{{/if}}></i> 218 + <a href="javascript:void(0);" class="btn_h"
  219 + style="display:none;"><span>清空商品</span></a>
  220 + <i class="cart-item-check iconfont" id="cbSelAllGoods"
  221 + {{#if cart.isCheckedAll}}checked="checked"{{/if}}></i>
205 <span>全选</span> 222 <span>全选</span>
206 <a class="delAll" href="javascript:void(0);">删除选中商品</a> 223 <a class="delAll" href="javascript:void(0);">删除选中商品</a>
207 <a class="removeAll" href="javascript:void(0);">移入收藏夹</a> 224 <a class="removeAll" href="javascript:void(0);">移入收藏夹</a>
@@ -210,8 +227,9 @@ @@ -210,8 +227,9 @@
210 {{/unless}} 227 {{/unless}}
211 <div class="right"> 228 <div class="right">
212 <p> 229 <p>
213 - {{#if gainYohoCoin}}<a href="/help/?category_id=87" class="yoho-coin" target="_blank"></a>  
214 - 共返有货币：{{gainYohoCoin}}个&#12288;&#12288;{{/if}} 230 + {{#if gainYohoCoin}}
  231 + <a href="/help/?category_id=87" class="yoho-coin" target="_blank"></a>
  232 + 共返有货币：{{gainYohoCoin}}个&#12288;&#12288;{{/if}}
215 已选商品<strong class="ins">{{selectedGoodsCount}}件</strong>&#12288;&#12288; 233 已选商品<strong class="ins">{{selectedGoodsCount}}件</strong>&#12288;&#12288;
216 商品金额：<b>¥&nbsp;{{orderAmount}}</b> 234 商品金额：<b>¥&nbsp;{{orderAmount}}</b>
217 </p> 235 </p>
@@ -225,65 +243,67 @@ @@ -225,65 +243,67 @@
225 <span>添加礼品袋</span> 243 <span>添加礼品袋</span>
226 <a href="javascript:void(0);" class="btn-account">去结算</a> 244 <a href="javascript:void(0);" class="btn-account">去结算</a>
227 </div> 245 </div>
  246 + {{> cart-pre-sell-tpl }}
228 {{/stat}} 247 {{/stat}}
229 </div> 248 </div>
230 {{/cart}} 249 {{/cart}}
231 250
232 - {{!--{{#cart.salesPromotion}}  
233 - <div class="salesPromotion">  
234 - <p>  
235 - {{#if salesTitle}}  
236 - <b>{{salesTitle}}</b>  
237 - {{/if}}  
238 - {{salesMessage}}</p>  
239 - <span><i></i>已参与</span>  
240 - </div>  
241 - {{/cart.salesPromotion}} --}} 251 + {{!--{{#cart.salesPromotion}}
  252 + <div class="salesPromotion">
  253 + <p>
  254 + {{#if salesTitle}}
  255 + <b>{{salesTitle}}</b>
  256 + {{/if}}
  257 + {{salesMessage}}</p>
  258 + <span><i></i>已参与</span>
  259 + </div>
  260 + {{/cart.salesPromotion}} --}}
242 {{/if}} 261 {{/if}}
243 </div> 262 </div>
244 </div> 263 </div>
245 264
246 {{#unless @root.pc.product.removeRecentView}} 265 {{#unless @root.pc.product.removeRecentView}}
247 - <div class="lazy-load-object"> 266 + <div class="lazy-load-object">
248 <textarea class="datalazyload" style="visibility: hidden;"> 267 <textarea class="datalazyload" style="visibility: hidden;">
249 <script> 268 <script>
250 fetchRecommend(); 269 fetchRecommend();
251 </script> 270 </script>
252 </textarea> 271 </textarea>
253 - </div> 272 + </div>
254 273
255 {{#if cart.isEmpty}} 274 {{#if cart.isEmpty}}
256 275
257 - <div class="bottom-tab bottom-tab-slide">  
258 - <span class="bottom-title cur {{#unless cart.deleteShop}}none{{/unless}}">凑单商品</span>  
259 - <span class="bottom-title {{#unless cart.deleteShop}}cur{{/unless}}">为您优选</span>  
260 - <span class="bottom-title">最近浏览</span>  
261 - <span class="change">换一批 276 + <div class="bottom-tab bottom-tab-slide">
  277 + <span class="bottom-title cur {{#unless cart.deleteShop}}none{{/unless}}">凑单商品</span>
  278 + <span class="bottom-title {{#unless cart.deleteShop}}cur{{/unless}}">为您优选</span>
  279 + <span class="bottom-title">最近浏览</span>
  280 + <span class="change">换一批
262 <span class="iconfont change-icon">&#xe639;</span> 281 <span class="iconfont change-icon">&#xe639;</span>
263 </span> 282 </span>
264 - </div>  
265 -  
266 - <div class="individual-slide">  
267 - <div class="individual-item individual-item-togetherGoods {{#unless cart.deleteShop}}none{{/unless}}">  
268 - <input id="" type="hidden" value="">  
269 - <div id="" class="goods clearfix">  
270 - {{>individual-slide}}  
271 - </div>  
272 </div> 283 </div>
273 - <div class="individual-item individual-item-recommendGoods {{#if cart.deleteShop}}none{{/if}}">  
274 - <input id="" type="hidden" value="{{latestWalk}}">  
275 - <div id="" class="goods clearfix">  
276 - {{>individual-slide}}  
277 - </div>  
278 - </div>  
279 - <div class="individual-item individual-item-latestWalk none">  
280 - <input id="latest-walk-count" type="hidden" value="">  
281 - <div id="latest-walk-goods" class="goods clearfix">  
282 - {{>individual-slide}}  
283 - </div> 284 +
  285 + <div class="individual-slide">
  286 + <div class="individual-item individual-item-togetherGoods {{#unless cart.deleteShop}}none{{/unless}}">
  287 + <input id="" type="hidden" value="">
  288 + <div id="" class="goods clearfix">
  289 + {{>individual-slide}}
  290 + </div>
  291 + </div>
  292 + <div class="individual-item individual-item-recommendGoods {{#if cart.deleteShop}}none{{/if}}">
  293 + <input id="" type="hidden" value="{{latestWalk}}">
  294 + <div id="" class="goods clearfix">
  295 + {{>individual-slide}}
  296 + </div>
  297 + </div>
  298 + <div class="individual-item individual-item-latestWalk none">
  299 + <input id="latest-walk-count" type="hidden" value="">
  300 + <div id="latest-walk-goods" class="goods clearfix">
  301 + {{>individual-slide}}
  302 + </div>
  303 + </div>
284 </div> 304 </div>
285 - </div>  
286 - {{/if}} 305 + {{> cart-together-tpl }}
  306 + {{/if}}
287 {{/unless}} 307 {{/unless}}
288 308
289 <div class="loading"><span></span>请稍后...</div> 309 <div class="loading"><span></span>请稍后...</div>
@@ -293,36 +313,39 @@ @@ -293,36 +313,39 @@
293 <script type="text/javascript"> 313 <script type="text/javascript">
294 314
295 315
296 -  
297 /*<textarea data-role="gifts-cansel" class="hide" data-promotionid="{{promotionId}}">{{{giftGoodsListStr}}}</textarea>*/ 316 /*<textarea data-role="gifts-cansel" class="hide" data-promotionid="{{promotionId}}">{{{giftGoodsListStr}}}</textarea>*/
298 </script> 317 </script>
299 318
300 <!-- 商品详细信息窗口 --> 319 <!-- 商品详细信息窗口 -->
301 320
302 <script type="text/javascript"> 321 <script type="text/javascript">
303 -(function (d) {  
304 -window.bd_cpro_rtid="P1fsPWc";  
305 -var s = d.createElement("script");s.type = "text/javascript";s.async = true;s.src = location.protocol + "//cpro.baidu.com/cpro/ui/rt.js";  
306 -var s0 = d.getElementsByTagName("script")[0];s0.parentNode.insertBefore(s, s0);  
307 -})(document); 322 + (function (d) {
  323 + window.bd_cpro_rtid = "P1fsPWc";
  324 + var s = d.createElement("script");
  325 + s.type = "text/javascript";
  326 + s.async = true;
  327 + s.src = location.protocol + "//cpro.baidu.com/cpro/ui/rt.js";
  328 + var s0 = d.getElementsByTagName("script")[0];
  329 + s0.parentNode.insertBefore(s, s0);
  330 + })(document);
308 </script> 331 </script>
309 <script type="text/javascript" src="//static.criteo.net/js/ld/ld.js" async="true"></script> 332 <script type="text/javascript" src="//static.criteo.net/js/ld/ld.js" async="true"></script>
310 <script type="text/javascript"> 333 <script type="text/javascript">
311 -window.criteo_q = window.criteo_q || [];  
312 -window.criteo_q.push(  
313 -{event:"setAccount", account: 16184},  
314 -{event:"setCustomerId", id: "{{uid}}"},  
315 -{event:"setSiteType", type: "d"},  
316 -{event:"viewBasket", item: {{{cart.criteo}}} }  
317 -); 334 + window.criteo_q = window.criteo_q || [];
  335 + window.criteo_q.push(
  336 + {event: "setAccount", account: 16184},
  337 + {event: "setCustomerId", id: "{{uid}}"},
  338 + {event: "setSiteType", type: "d"},
  339 + {event: "viewBasket", item: {{{cart.criteo}}} }
  340 + );
318 </script> 341 </script>
319 <!-- 聚效 --> 342 <!-- 聚效 -->
320 <script type="text/javascript"> 343 <script type="text/javascript">
321 -var _mvq = window._mvq || [];  
322 -window._mvq = _mvq;  
323 -_mvq.push(['$setAccount', 'm-23428-1']);  
324 -_mvq.push(['$setGeneral', 'cartview', '', /*用户名*/ '', '{{uid}}']);  
325 -_mvq.push(['$logConversion']);  
326 -_mvq.push(['$addItem', '', /*商品id*/ '{{cart.ids}}', '', '']);  
327 -_mvq.push(['$logData']); 344 + var _mvq = window._mvq || [];
  345 + window._mvq = _mvq;
  346 + _mvq.push(['$setAccount', 'm-23428-1']);
  347 + _mvq.push(['$setGeneral', 'cartview', '', /*用户名*/ '', '{{uid}}']);
  348 + _mvq.push(['$logConversion']);
  349 + _mvq.push(['$addItem', '', /*商品id*/ '{{cart.ids}}', '', '']);
  350 + _mvq.push(['$logData']);
328 </script> 351 </script>
  1 +<div class="yoho-dialog cart-preSell-dialog"
  2 + data-role="cart-pre-sell"
  3 + style="margin-top:-200px;margin-left: -350px; display:none;">
  4 + <span class="close">
  5 + <i class="iconfont">&#xe60d;</i>
  6 + </span>
  7 + <div class="content">
  8 + <div class="detail-body">
  9 + <div class="slide-img">
  10 + <p class="sell-class-title">预售商品<strong>3</strong>&nbsp;&nbsp;&nbsp;总金额<strong>￥809.00</strong></p>
  11 + <div class="side-img-dd">
  12 + <div class="side-img-container">
  13 + <ul class="img-list">
  14 + <li class="img-item">
  15 + <span class="hide goods-id">{{goods_id}}</span>
  16 + <div class="good">
  17 + <a class="good-cont" href="{{url}}" target="_blank">
  18 + <img src="//img12.static.yhbimg.com/goodsimg/2016/11/04/16/0249e621f1ee8b0813d310a5232b05deb4.jpg?imageMogr2/thumbnail/60x60/extent/60x60/background/d2hpdGU=/position/center/quality/90">
  19 + <span class="incentive">预售</span>
  20 + </a>
  21 + </div>
  22 + </li>
  23 + <li class="img-item">
  24 + <span class="hide goods-id">{{goods_id}}</span>
  25 + <div class="good">
  26 + <a class="good-cont" href="{{url}}" target="_blank">
  27 + <img src="//img12.static.yhbimg.com/goodsimg/2016/11/04/16/0249e621f1ee8b0813d310a5232b05deb4.jpg?imageMogr2/thumbnail/60x60/extent/60x60/background/d2hpdGU=/position/center/quality/90">
  28 + <span class="incentive">预售</span>
  29 + </a>
  30 + </div>
  31 + </li>
  32 + <li class="img-item">
  33 + <span class="hide goods-id">{{goods_id}}</span>
  34 + <div class="good">
  35 + <a class="good-cont" href="{{url}}" target="_blank">
  36 + <img src="//img12.static.yhbimg.com/goodsimg/2016/11/04/16/0249e621f1ee8b0813d310a5232b05deb4.jpg?imageMogr2/thumbnail/60x60/extent/60x60/background/d2hpdGU=/position/center/quality/90">
  37 + <span class="incentive">预售</span>
  38 + </a>
  39 + </div>
  40 + </li>
  41 + </ul>
  42 + </div>
  43 + <div class="img-brand-switch">
  44 + <a class="prev iconfont" href="javascript:;">&#xe609;</a>
  45 + <a class="next iconfont" href="javascript:;">&#xe608;</a>
  46 + </div>
  47 + </div>
  48 + </div>
  49 + <a class="btn-account">去结算</a>
  50 + <div class="slide-img">
  51 + <p class="sell-class-title">普通商品<strong>7</strong>&nbsp;&nbsp;&nbsp;总金额<strong>￥809.00</strong></p>
  52 + <div class="side-img-dd">
  53 + <div class="side-img-container">
  54 + <ul class="img-list">
  55 + <li class="img-item">
  56 + <span class="hide goods-id">{{goods_id}}</span>
  57 + <div class="good">
  58 + <a class="good-cont" href="{{url}}" target="_blank">
  59 + <img class="lazy" src="{{pic_url}}"/>
  60 + </a>
  61 + </div>
  62 + <i class="iconfont checked">&#xe6cb;</i>
  63 + </li>
  64 + <li class="img-item">
  65 + <span class="hide goods-id">{{goods_id}}</span>
  66 + <div class="good">
  67 + <a class="good-cont" href="{{url}}" target="_blank">
  68 + <img class="lazy" src="{{pic_url}}"/>
  69 + </a>
  70 + </div>
  71 + </li>
  72 + <li class="img-item">
  73 + <span class="hide goods-id">{{goods_id}}</span>
  74 + <div class="good">
  75 + <a class="good-cont" href="{{url}}" target="_blank">
  76 + <img class="lazy" src="{{pic_url}}"/>
  77 + </a>
  78 + </div>
  79 + </li>
  80 + <li class="img-item">
  81 + <span class="hide goods-id">{{goods_id}}</span>
  82 + <div class="good">
  83 + <a class="good-cont" href="{{url}}" target="_blank">
  84 + <img class="lazy" src="{{pic_url}}"/>
  85 + </a>
  86 + </div>
  87 + </li>
  88 + <li class="img-item">
  89 + <span class="hide goods-id">{{goods_id}}</span>
  90 + <div class="good">
  91 + <a class="good-cont" href="{{url}}" target="_blank">
  92 + <img class="lazy" src="{{pic_url}}"/>
  93 + </a>
  94 + </div>
  95 + </li>
  96 + <li class="img-item">
  97 + <span class="hide goods-id">{{goods_id}}</span>
  98 + <div class="good">
  99 + <a class="good-cont" href="{{url}}" target="_blank">
  100 + <img class="lazy" src="{{pic_url}}"/>
  101 + </a>
  102 + </div>
  103 + </li>
  104 + <li class="img-item">
  105 + <span class="hide goods-id">{{goods_id}}</span>
  106 + <div class="good">
  107 + <a class="good-cont" href="{{url}}" target="_blank">
  108 + <img class="lazy" src="{{pic_url}}"/>
  109 + </a>
  110 + </div>
  111 + </li>
  112 + <li class="img-item">
  113 + <span class="hide goods-id">{{goods_id}}</span>
  114 + <div class="good">
  115 + <a class="good-cont" href="{{url}}" target="_blank">
  116 + <img class="lazy" src="{{pic_url}}"/>
  117 + </a>
  118 + </div>
  119 + </li>
  120 + <li class="img-item">
  121 + <span class="hide goods-id">{{goods_id}}</span>
  122 + <div class="good">
  123 + <a class="good-cont" href="{{url}}" target="_blank">
  124 + <img class="lazy" src="{{pic_url}}"/>
  125 + </a>
  126 + </div>
  127 + </li>
  128 + <li class="img-item">
  129 + <span class="hide goods-id">{{goods_id}}</span>
  130 + <div class="good">
  131 + <a class="good-cont" href="{{url}}" target="_blank">
  132 + <img class="lazy" src="{{pic_url}}"/>
  133 + </a>
  134 + </div>
  135 + </li>
  136 + <li class="img-item">
  137 + <span class="hide goods-id">{{goods_id}}</span>
  138 + <div class="good">
  139 + <a class="good-cont" href="{{url}}" target="_blank">
  140 + <img class="lazy" src="{{pic_url}}"/>
  141 + </a>
  142 + </div>
  143 + </li>
  144 + </ul>
  145 + </div>
  146 + <div class="img-brand-switch">
  147 + <a class="prev iconfont" href="javascript:;">&#xe609;</a>
  148 + <a class="next iconfont" href="javascript:;">&#xe608;</a>
  149 + </div>
  150 + </div>
  151 + </div>
  152 + <a class="btn-account btn-account-black">去结算</a>
  153 + <p class="pre-sell-tip">温馨提示：您需要分开结算【预售商品】和【普通商品】</p>
  154 + </div>
  155 + </div>
  156 +</div>
  157 +
@@ -7,10 +7,13 @@ @@ -7,10 +7,13 @@
7 <div class="content"> 7 <div class="content">
8 <div class="detail-body"> 8 <div class="detail-body">
9 <div class="slide-img"> 9 <div class="slide-img">
10 - <p>选赠品:  
11 - <em><span class="active">1元加价购</span>  
12 - <code>|</code><span>59元加价购</span>  
13 - <code>|</code><span>99元加价购</span> 10 + <p class="sell-class-title">选赠品:
  11 + <em class="slide-img-title"><span
  12 + class="active">1元加价购</span>
  13 + <code class="spacing">|</code>
  14 + <span>59元加价购</span>
  15 + <code class="spacing">|</code>
  16 + <span>99元加价购</span>
14 </em> 17 </em>
15 </p> 18 </p>
16 <div class="side-img-dd"> 19 <div class="side-img-dd">
@@ -26,6 +29,10 @@ @@ -26,6 +29,10 @@
26 </li> 29 </li>
27 {{/each}} 30 {{/each}}
28 </ul> 31 </ul>
  32 + <div class="img-brand-switch">
  33 + <a class="prev iconfont" href="javascript:;">&#xe609;</a>
  34 + <a class="next iconfont" href="javascript:;">&#xe608;</a>
  35 + </div>
29 </div> 36 </div>
30 </div> 37 </div>
31 <div class="detail-goods"> 38 <div class="detail-goods">
@@ -132,7 +139,7 @@ @@ -132,7 +139,7 @@
132 <span data-sku="{{sku}}" data-num="{{num}}">40码{{name}}</span> 139 <span data-sku="{{sku}}" data-num="{{num}}">40码{{name}}</span>
133 <span data-sku="{{sku}}" data-num="{{num}}">40码{{name}}</span> 140 <span data-sku="{{sku}}" data-num="{{num}}">40码{{name}}</span>
134 </div> 141 </div>
135 - <p>内长&nbsp;25.5com</p> 142 + <p class="size-p">内长&nbsp;25.5com</p>
136 </dt> 143 </dt>
137 </dl> 144 </dl>
138 <dl> 145 <dl>
  1 +<div class="yoho-dialog cart-togetherGoods togethor"
  2 + data-role=""
  3 + style="margin-top: -374.5px; margin-left: -350px; display:none;">
  4 + <span class="close">
  5 + <i class="iconfont">&#xe60d;</i>
  6 + </span>
  7 + <div class="content">
  8 + <div class="detail-body">
  9 + <div class="detail-goods">
  10 + <div class="detail-bigpic">
  11 + <div class="bigpic">
  12 + <img src="">
  13 + </div>
  14 + <div class="bigpic none">
  15 + <img src="">
  16 + </div>
  17 + <div class="bigpic none">
  18 + <img src="">
  19 + </div>
  20 + <div class="bigpic none">
  21 + <img src="">
  22 + </div>
  23 + <div class="bigpic none">
  24 + <img src="">
  25 + </div>
  26 + <div class="bigpic none">
  27 + <img src="">
  28 + </div>
  29 + <div class="piclist">
  30 + <span class="pre"></span>
  31 + <div class="con">
  32 + <ul>
  33 + <li class="active"><img src=""></li>
  34 + <li><img src=""></li>
  35 + <li><img src=""></li>
  36 + <li><img src=""></li>
  37 + <li><img src=""></li>
  38 + </ul>
  39 + </div>
  40 + <span class="next"></span>
  41 + </div>
  42 + </div>
  43 + <div class="detail-bigpic none">
  44 + <div class="bigpic">
  45 + <img src="">
  46 + </div>
  47 + <div class="bigpic none">
  48 + <img src="">
  49 + </div>
  50 + <div class="bigpic none">
  51 + <img src="">
  52 + </div>
  53 + <div class="bigpic none">
  54 + <img src="">
  55 + </div>
  56 + <div class="bigpic none">
  57 + <img src="">
  58 + </div>
  59 + <div class="bigpic none">
  60 + <img src="">
  61 + </div>
  62 + <div class="piclist">
  63 + <span class="pre"></span>
  64 + <div class="con">
  65 + <ul>
  66 + <li class="active"><img src=""></li>
  67 + <li><img src=""></li>
  68 + <li><img src=""></li>
  69 + <li><img src=""></li>
  70 + <li><img src=""></li>
  71 + </ul>
  72 + </div>
  73 + <span class="next"></span>
  74 + </div>
  75 + </div>
  76 + <div class="detail-info">
  77 + <div class="title">
  78 + <h2>哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈{{name}}</h2>
  79 + </div>
  80 + <div class="price">
  81 +
  82 + <span class="newprice">现价：<b class="promotion-price">¥7777{{salePrice}}</b></span>
  83 + <span class="activityprice">活动价：<b class="promotion-price">¥5555{{marketPrice}}</b></span>
  84 +
  85 + </div>
  86 + <div class="order">
  87 + <dl>
  88 + <dd class="colorBox">选颜色：</dd>
  89 + <dt>
  90 + <div class="colorBox">
  91 + <ul>
  92 + <li class="color active">
  93 + <p class="{{#if focus}}atcive{{/if}}"><span></span><img src=""></p>
  94 + <span>{{name}}</span>
  95 + </li>
  96 + <li class="color">
  97 + <p class="{{#if focus}}atcive{{/if}}"><span></span><img src=""></p>
  98 + <span>{{name}}</span>
  99 + </li>
  100 + </ul>
  101 + </div>
  102 + </dt>
  103 + </dl>
  104 + <dl>
  105 + <dd class="showSizeBox">选尺码：</dd>
  106 + <dt>
  107 + <div class="showSizeBox">
  108 + <span data-sku="{{sku}}" data-num="{{num}}" class="disabled">40码{{name}}</span>
  109 + <span data-sku="{{sku}}" data-num="{{num}}">40码{{name}}</span>
  110 + <span data-sku="{{sku}}" data-num="{{num}}">40码{{name}}</span>
  111 + <span data-sku="{{sku}}" data-num="{{num}}">40码{{name}}</span>
  112 + </div>
  113 + <p class="size-p">内长&nbsp;25.5com</p>
  114 + </dt>
  115 + </dl>
  116 + <dl>
  117 + <dd>选件数：</dd>
  118 + <dt>
  119 + <div class="amount_wrapper">
  120 + <input type="text" id="num" class="num" value="1" readonly="readonly">
  121 + <a class="amount cut"><i class="iconfont">&#xe6c0;</i></a>
  122 + <a class="amount add"><i class="iconfont">&#xe6c1;</i></a>
  123 + </div>
  124 + </dt>
  125 + </dl>
  126 + </div>
  127 + <div class="submit">
  128 + <button class="btn-red"><i class="addCart iconfont">&#xe600;</i>添加到购物车</button>
  129 + <button class="btn-favCount"><i class="favCount iconfont">&#xe68f;</i>收藏商品</button>
  130 + </div>
  131 + </div>
  132 + <div class="detail-size">
  133 + <h3>尺码信息（单位：厘米）</h3>
  134 + <table>
  135 + <thead>
  136 + <tr>
  137 + <th width="{{width}}">吊牌吃吗</th>
  138 + <th width="{{width}}">吊牌吃吗
  139 + </td>
  140 + <th width="{{width}}">吊牌吃吗
  141 + </td>
  142 + <th width="{{width}}">吊牌吃吗
  143 + </td>
  144 + <th width="{{width}}">吊牌吃吗
  145 + </td>
  146 + <th width="{{width}}">吊牌吃吗
  147 + </td>
  148 + </tr>
  149 + </thead>
  150 + <tbody>
  151 + <tr>
  152 + <td>6666{{.}}</td>
  153 + </tr>
  154 + <tr>
  155 + <td>4444{{.}}</td>
  156 + </tr>
  157 + </tbody>
  158 + </table>
  159 + <div class="size-info">
  160 + ※ 以上尺寸为实物实际测量，因测量方式不同会有略微误差，相关数据仅作参考，以收到实物为准。
  161 + </div>
  162 + </div>
  163 + </div>
  164 + </div>
  165 + </div>
  166 +</div>
  167 +
@@ -468,11 +468,32 @@ $paySum.on('click', '.btn-account', function() { @@ -468,11 +468,32 @@ $paySum.on('click', '.btn-account', function() {
468 // } 468 // }
469 // } else { 469 // } else {
470 470
471 - new Alert('请至少选择一件商品').show(); 471 + // new Alert('请至少选择一件商品').show();
472 472
473 // } 473 // }
474 // } 474 // }
475 // } 475 // }
  476 + $('.cart-preSell-dialog').show();
  477 + // $('.togethor').show();
  478 +
  479 + // $('.cart-togetherGoods').show();
  480 +
  481 +});
  482 +
  483 +
  484 +var giftBtn = '[data-role=gift-view-btn],[data-role=gift-resel-btn],[data-role=gift-sel-btn]';
  485 +
  486 +$('.shop-cart').on('click', giftBtn, function() {
  487 +
  488 + var $this = $(this);
  489 + var $win = $this.closest('[data-role=promotion-wrap]').find('[data-role=cart-gift-win]');
  490 +
  491 + console.log($win.length);
  492 + $win.show();
  493 +});
  494 +
  495 +$('.shop-cart').on('click', '[data-role="cart-gift-win"] .close', function(){
  496 + $(this).closest('[data-role="cart-gift-win"]').hide();
476 }); 497 });
477 498
478 require('./cart-action'); 499 require('./cart-action');
@@ -58,7 +58,7 @@ @@ -58,7 +58,7 @@
58 width: 100%; 58 width: 100%;
59 height: auto; 59 height: auto;
60 } 60 }
61 - &.none{ 61 + &.none {
62 display: none; 62 display: none;
63 } 63 }
64 } 64 }
@@ -161,6 +161,7 @@ @@ -161,6 +161,7 @@
161 font-size: 13px; 161 font-size: 13px;
162 *zoom: 1; 162 *zoom: 1;
163 min-height: 145px; 163 min-height: 145px;
  164 + background: none;
164 &:after { 165 &:after {
165 content: ''; 166 content: '';
166 display:block; 167 display:block;
@@ -204,13 +205,16 @@ @@ -204,13 +205,16 @@
204 height: auto; 205 height: auto;
205 overflow: hidden; 206 overflow: hidden;
206 } 207 }
207 - &+p{  
208 - margin-top: 5px;  
209 - margin-bottom: 10px;  
210 - }  
211 } 208 }
212 } 209 }
213 210
  211 + .size-p{
  212 + margin-top: 5px;
  213 + margin-bottom: 10px;
  214 + color: #999;
  215 + font-size: 13px
  216 + }
  217 +
214 .colorBox { 218 .colorBox {
215 &>ul { 219 &>ul {
216 zoom: 1; 220 zoom: 1;
@@ -224,7 +228,6 @@ @@ -224,7 +228,6 @@
224 li { 228 li {
225 width: 40px; 229 width: 40px;
226 height: 40px; 230 height: 40px;
227 - overflow: hidden;  
228 text-align: center; 231 text-align: center;
229 margin-right: 5px; 232 margin-right: 5px;
230 display: inline; 233 display: inline;
@@ -234,7 +237,6 @@ @@ -234,7 +237,6 @@
234 width: 40px; 237 width: 40px;
235 height: 40px; 238 height: 40px;
236 border: 2px #232323 solid; 239 border: 2px #232323 solid;
237 -  
238 } 240 }
239 p { 241 p {
240 width: 38px; 242 width: 38px;
@@ -323,9 +325,10 @@ @@ -323,9 +325,10 @@
323 } 325 }
324 326
325 .submit { 327 .submit {
326 - margin-top: 15px;  
327 text-align: left; 328 text-align: left;
328 button { 329 button {
  330 + float: none;
  331 + line-height:40px;
329 width: 140px; 332 width: 140px;
330 height: 40px; 333 height: 40px;
331 font-size: 15px; 334 font-size: 15px;
@@ -409,17 +412,19 @@ @@ -409,17 +412,19 @@
409 } 412 }
410 413
411 .side-img-dd { 414 .side-img-dd {
  415 + width: 415px;
412 height: 90px; 416 height: 90px;
413 overflow: hidden; 417 overflow: hidden;
  418 + margin: 0 auto;
414 .img-brand-switch{ 419 .img-brand-switch{
415 a { 420 a {
416 position: absolute; 421 position: absolute;
417 - top: 90px; 422 + top: 96px;
418 font-size: 22px; 423 font-size: 22px;
419 color: #000; 424 color: #000;
420 width: 20px; 425 width: 20px;
421 - height: 32px;  
422 - padding-top: 8px; 426 + height: 24px;
  427 + padding: 0;
423 text-align: center; 428 text-align: center;
424 background-color: #fff; 429 background-color: #fff;
425 &.prev { 430 &.prev {
@@ -436,18 +441,26 @@ @@ -436,18 +441,26 @@
436 } 441 }
437 } 442 }
438 443
  444 +.sell-class-title {
  445 + font-size: 14px;
  446 + color: #444;
  447 + text-align: left;
  448 + height: 20px;
  449 + line-height: 20px;
  450 + vertical-align: middle;
  451 + margin-bottom: 15px;
  452 + strong {
  453 + display: inline-block;
  454 + margin: 0 3px;
  455 + color: #d0021b;
  456 + font-weight: 300;
  457 + }
  458 +}
  459 +
439 .slide-img { 460 .slide-img {
440 margin-bottom: 25px; 461 margin-bottom: 25px;
441 - p {  
442 - font-size: 14px;  
443 - color: #444;  
444 - text-align: left;  
445 - height: 20px;  
446 - line-height: 20px;  
447 - vertical-align: middle;  
448 - margin-bottom: 15px;  
449 - }  
450 - em { 462 +
  463 + .slide-img-title {
451 float: right; 464 float: right;
452 display: inline-block; 465 display: inline-block;
453 466
@@ -461,7 +474,7 @@ @@ -461,7 +474,7 @@
461 .active { 474 .active {
462 color: #d0021b; 475 color: #d0021b;
463 } 476 }
464 - code { 477 + .spacing{
465 font-size: 18px; 478 font-size: 18px;
466 font-weight: 300; 479 font-weight: 300;
467 color: #000; 480 color: #000;
@@ -493,7 +506,7 @@ @@ -493,7 +506,7 @@
493 } 506 }
494 .checked { 507 .checked {
495 position: absolute; 508 position: absolute;
496 - top: 4px; 509 + top: 0;
497 right: 4px; 510 right: 4px;
498 font-size: 15px; 511 font-size: 15px;
499 color: #3a3a3a; 512 color: #3a3a3a;
@@ -501,17 +514,98 @@ @@ -501,17 +514,98 @@
501 .good { 514 .good {
502 float: left; 515 float: left;
503 width: 63px; 516 width: 63px;
504 - a {  
505 - cursor: pointer;  
506 - border: none;  
507 - display: block;  
508 - }  
509 img { 517 img {
510 display: block; 518 display: block;
511 width: 65px; 519 width: 65px;
512 height: 90px; 520 height: 90px;
513 } 521 }
514 } 522 }
  523 + .good-cont{
  524 + cursor: pointer;
  525 + border: none;
  526 + display: block;
  527 + color: transparent;
  528 + margin: 0;
  529 + }
  530 + }
  531 + .incentive {
  532 + position: absolute;
  533 + left: 0px;
  534 + bottom: 0px;
  535 + width: 100%;
  536 + display: block;
  537 + height: 20px;
  538 + line-height: 20px;
  539 + font-size: 12px;
  540 + text-align: center;
  541 + color: #fff;
  542 + cursor: pointer;
  543 + background: #3a3a3a;
  544 + color: #fff;
  545 + }
  546 +}
  547 +.cart-preSell-dialog {
  548 + background-color: #fff;
  549 + .detail-body{
  550 + padding: 10px 10px 20px;
  551 + .sell-class-title {
  552 + padding-top: 10px;
  553 + }
  554 + }
  555 + .slide-img {
  556 + width: 434px;
  557 + .sell-class-title {
  558 + border-top: 1px solid #e0e0e0;
  559 + padding-left: 13px;
  560 + }
  561 + &:nth-child(1) {
  562 + .sell-class-title {
  563 + border-top: none;
  564 + }
  565 + }
  566 + }
  567 + .btn-account {
  568 + display: inline-block;
  569 + color: #000;
  570 + width: 130px;
  571 + height: 30px;
  572 + line-height: 30px;
  573 + margin-bottom: 25px;
  574 + font-size: 15px;
  575 + border: 1px solid #000;
  576 + box-sizing: border-box;
  577 + background-color: #fff;
  578 + cursor: pointer;
  579 + }
  580 + .btn-account-black {
  581 + background-color: #000;
  582 + color: #fff;
  583 + }
  584 + .pre-sell-tip{
  585 + font-size: 14px;
  586 + color: #444;
  587 + text-after-overflow: center;
  588 + }
  589 + .side-img-dd {
  590 + position: relative;
  591 + overflow: visible;
  592 + .img-brand-switch {
  593 + a {
  594 + top: 32px;
  595 + }
  596 + a.prev {
  597 + left: -20px;
  598 + }
  599 + a.next {
  600 + right: -20px;
  601 + }
  602 + }
  603 + }
  604 + .side-img-container {
  605 + width: 409px;
  606 + height: 90px;
  607 + overflow: hidden;
  608 + margin: 0 auto;
515 } 609 }
516 } 610 }
517 611
@@ -237,13 +237,13 @@ @@ -237,13 +237,13 @@
237 line-height: 32px; 237 line-height: 32px;
238 } 238 }
239 } 239 }
240 - .incentive {  
241 - background: #000100;  
242 - color: #fff;  
243 - &.red {  
244 - background: #ff575c;  
245 - }  
246 - } 240 + /*.incentive {*/
  241 + /*background: #000100;*/
  242 + /*color: #fff;*/
  243 + /*&.red {*/
  244 + /*background: #ff575c;*/
  245 + /*}*/
  246 + /*}*/
247 } 247 }
248 248
249 .cart-add-btn{ 249 .cart-add-btn{
@@ -494,7 +494,7 @@ @@ -494,7 +494,7 @@
494 .gift-sell { 494 .gift-sell {
495 border: 1px solid #e0e0e0; 495 border: 1px solid #e0e0e0;
496 padding:20px 30px 20px 55px; 496 padding:20px 30px 20px 55px;
497 - code { 497 + .order-pay-mark{
498 width: 70px; 498 width: 70px;
499 height: 20px; 499 height: 20px;
500 line-height: 20px; 500 line-height: 20px;
@@ -511,22 +511,19 @@ @@ -511,22 +511,19 @@
511 box-sizing: border-box; 511 box-sizing: border-box;
512 } 512 }
513 } 513 }
514 - p{ 514 + .gift-sell-info{
515 font-size: 14px; 515 font-size: 14px;
516 color: #444; 516 color: #444;
517 line-height: 1; 517 line-height: 1;
518 margin-bottom: 8px; 518 margin-bottom: 8px;
519 - &:last-child{  
520 - margin-bottom: 0;  
521 - }  
522 } 519 }
523 - a { 520 + .order-pay-link{
524 display: inline-block; 521 display: inline-block;
525 color: #ff575c; 522 color: #ff575c;
526 margin-left: 20px; 523 margin-left: 20px;
527 cursor: pointer; 524 cursor: pointer;
528 } 525 }
529 - button { 526 + .btn-clear {
530 float: right; 527 float: right;
531 height: 20px; 528 height: 20px;
532 line-height: 20px; 529 line-height: 20px;
@@ -761,33 +758,6 @@ @@ -761,33 +758,6 @@
761 cursor: pointer; 758 cursor: pointer;
762 } 759 }
763 760
764 - .pay-pro-icon {  
765 - float: left;  
766 - width: 70px;  
767 - height: 90px;  
768 - overflow: hidden;  
769 - display: block;  
770 - position: relative;  
771 - img {  
772 - max-width: 70px;  
773 - }  
774 - span {  
775 - position: absolute;  
776 - left: 0px;  
777 - bottom: 0px;  
778 - width: 100%;  
779 - display: block;  
780 - height: 16px;  
781 - line-height: 16px;  
782 - font-size:12px;  
783 - text-align: center;  
784 - color: #fff;  
785 - cursor: pointer;  
786 - background: #000100;  
787 - color: #fff;  
788 - }  
789 - }  
790 -  
791 .pay-pro-info { 761 .pay-pro-info {
792 float: left; 762 float: left;
793 text-align: left; 763 text-align: left;
@@ -945,7 +915,9 @@ @@ -945,7 +915,9 @@
945 margin-bottom: 10px; 915 margin-bottom: 10px;
946 } 916 }
947 .active { 917 .active {
948 - border-color: #000; 918 + border-color: #444;
  919 + background-color: #444;
  920 + color: #fff;
949 } 921 }
950 .disabled { 922 .disabled {
951 color: #e8e8e8; 923 color: #e8e8e8;
@@ -1163,6 +1135,37 @@ @@ -1163,6 +1135,37 @@
1163 } 1135 }
1164 } 1136 }
1165 1137
  1138 + .pay-pro-icon {
  1139 + float: left;
  1140 + width: 70px;
  1141 + height: 90px;
  1142 + overflow: hidden;
  1143 + display: block;
  1144 + position: relative;
  1145 + img {
  1146 + max-width: 70px;
  1147 + }
  1148 + .incentive {
  1149 + position: absolute;
  1150 + left: 0px;
  1151 + bottom: 0px;
  1152 + width: 100%;
  1153 + display: block;
  1154 + height: 16px;
  1155 + line-height: 16px;
  1156 + font-size:12px;
  1157 + text-align: center;
  1158 + color: #fff;
  1159 + cursor: pointer;
  1160 + background: #000100;
  1161 + color: #fff;
  1162 + &.red {
  1163 + background-color: #ff575c;
  1164 + }
  1165 + }
  1166 + }
  1167 +
  1168 +
1166 .yoho-coin { 1169 .yoho-coin {
1167 width: 14px; 1170 width: 14px;
1168 height: 14px; 1171 height: 14px;
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 border-radius: 5px; 11 border-radius: 5px;
12 background: #fff; 12 background: #fff;
13 display: none; 13 display: none;
14 - .magnify{ 14 + .magnify {
15 position: absolute; 15 position: absolute;
16 width: 12px; 16 width: 12px;
17 height: 12px; 17 height: 12px;
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 right: 2px; 20 right: 2px;
21 21
22 } 22 }
23 - .detail-header{ 23 + .detail-header {
24 display: block; 24 display: block;
25 font-size: 12px; 25 font-size: 12px;
26 line-height: 16px; 26 line-height: 16px;