Showing
1 changed file
with
9 additions
and
4 deletions
@@ -55,11 +55,11 @@ GoodsWinAction = { | @@ -55,11 +55,11 @@ GoodsWinAction = { | ||
55 | if (role === 'pg-resel-btn') { | 55 | if (role === 'pg-resel-btn') { |
56 | $selectedItem = $promotionPool.find('[data-role=pitem]') | 56 | $selectedItem = $promotionPool.find('[data-role=pitem]') |
57 | .filter('[data-ispricegift]') | 57 | .filter('[data-ispricegift]') |
58 | - .filter('[data-promotionid=' + promotionid + ']'); | 58 | + .filter('[data-promotionid="' + promotionid + '"]'); |
59 | } else if (role === 'gift-resel-btn') { | 59 | } else if (role === 'gift-resel-btn') { |
60 | $selectedItem = $promotionPool.find('[data-role=pitem]') | 60 | $selectedItem = $promotionPool.find('[data-role=pitem]') |
61 | .filter('[data-isgift]') | 61 | .filter('[data-isgift]') |
62 | - .filter('[data-promotionid=' + promotionid + ']'); | 62 | + .filter('[data-promotionid="' + promotionid + '"]'); |
63 | } | 63 | } |
64 | 64 | ||
65 | if ($selectedItem && $selectedItem.length > 0) { | 65 | if ($selectedItem && $selectedItem.length > 0) { |
@@ -263,7 +263,7 @@ GoodsWinAction = { | @@ -263,7 +263,7 @@ GoodsWinAction = { | ||
263 | }, | 263 | }, |
264 | 264 | ||
265 | // 收藏 | 265 | // 收藏 |
266 | - btnFav: function() { | 266 | + btnFav: function(event) { |
267 | 267 | ||
268 | var favBtn = $('[data-role="fav-count"]'); | 268 | var favBtn = $('[data-role="fav-count"]'); |
269 | var $this = $(this); | 269 | var $this = $(this); |
@@ -324,7 +324,8 @@ GoodsWinAction = { | @@ -324,7 +324,8 @@ GoodsWinAction = { | ||
324 | }).mouseleave(function() { | 324 | }).mouseleave(function() { |
325 | favBtn.find('em').text(colTxt.coled); | 325 | favBtn.find('em').text(colTxt.coled); |
326 | }); | 326 | }); |
327 | - obj.stopPropagation(); | 327 | + |
328 | + event.stopPropagation(); | ||
328 | 329 | ||
329 | }).fail(function() { | 330 | }).fail(function() { |
330 | 331 | ||
@@ -346,6 +347,10 @@ GoodsWinAction = { | @@ -346,6 +347,10 @@ GoodsWinAction = { | ||
346 | var promotionId = $this.closest('.product-detail-info').data('promotionid') || 0; | 347 | var promotionId = $this.closest('.product-detail-info').data('promotionid') || 0; |
347 | var isSwap = $this.closest('.product-detail-info').data('isswap'); | 348 | var isSwap = $this.closest('.product-detail-info').data('isswap'); |
348 | 349 | ||
350 | + if ($this.hasClass('btn-grey')) { | ||
351 | + return capi.hideMDialog('#Y_goodsSelectWinDialog'); | ||
352 | + } | ||
353 | + | ||
349 | if ($curSize.length <= 0) { | 354 | if ($curSize.length <= 0) { |
350 | $this.closest('.detail-info').find('.size-p-tip').show(); | 355 | $this.closest('.detail-info').find('.size-p-tip').show(); |
351 | $this.closest('.detail-info').find('.submit').css('marginTop', '0'); | 356 | $this.closest('.detail-info').find('.submit').css('marginTop', '0'); |
-
Please register or login to post a comment