Authored by 郭成尧

Merge branch 'master' into release/5.4.1

@@ -443,11 +443,11 @@ $(function() { @@ -443,11 +443,11 @@ $(function() {
443 } 443 }
444 recordResult = res; 444 recordResult = res;
445 } else { 445 } else {
446 - tip.show('网络断开了~~'); 446 + // tip.show('网络断开了~~');
447 } 447 }
448 }, 448 },
449 error: function(res) { 449 error: function(res) {
450 - tip.show('网络断开了~~'); 450 + // tip.show('网络断开了~~');
451 } 451 }
452 }); 452 });
453 return recordResult; 453 return recordResult;
@@ -821,18 +821,11 @@ $yohoPage.on('touchstart', '.btn-minus', function() { @@ -821,18 +821,11 @@ $yohoPage.on('touchstart', '.btn-minus', function() {
821 }); 821 });
822 822
823 } else { 823 } else {
824 -  
825 - $('#chose-btn-sure').click(  
826 - function() {  
827 var thisSkn = $('#productSkn').val(); 824 var thisSkn = $('#productSkn').val();
828 var thisSku = ''; 825 var thisSku = '';
829 -  
830 thisSku = $('.size-list').find('.chosed').attr('data-skuid'); 826 thisSku = $('.size-list').find('.chosed').attr('data-skuid');
831 -  
832 window.location.href = '/cart/index/seckill?skn=' + thisSkn + '&sku=' + thisSku; 827 window.location.href = '/cart/index/seckill?skn=' + thisSkn + '&sku=' + thisSku;
833 } 828 }
834 - );  
835 - }  
836 829
837 } 830 }
838 return false; // 阻止加入购物车按钮冒泡 831 return false; // 阻止加入购物车按钮冒泡