fe / yoho-blk · Commits

Go to a project

Authored by zhangxiaoru
Commit 162f1283a9f0276f5eda4fe883f6063f849c81ba 1 parent 4a328f9e

editorial

Inline Side-by-side
Showing 1 changed file with 1 additions and 6 deletions
@@ -55,17 +55,12 @@ $(function() { @@ -55,17 +55,12 @@ $(function() {
55 Cart.editColorOrSize($(this).attr('data-productId')); 55 Cart.editColorOrSize($(this).attr('data-productId'));
56 }).delegate('#checkout_btn', 'click', function(e) { 56 }).delegate('#checkout_btn', 'click', function(e) {
57 e.preventDefault(); 57 e.preventDefault();
58 -<<<<<<< HEAD  
59 - if (!$(this).hasClass('disable')) {  
60 - window.location.href = '/shopping/order';  
61 - }  
62 -======= 58 +
63 Cart.checkStorage(function() { 59 Cart.checkStorage(function() {
64 if (!$(this).hasClass('disable')) { 60 if (!$(this).hasClass('disable')) {
65 window.location.href = '/shopping/order'; 61 window.location.href = '/shopping/order';
66 } 62 }
67 }); 63 });
68 ->>>>>>> 92a3e5fe2e5a326f2120ac907df26187a3213a37  
69 }); 64 });
70 65
71 // // 全选和单选 66 // // 全选和单选