Authored by Rock Zhang

Merge branch 'develop/wap' of git.dev.yoho.cn:web/yohobuy into develop

@@ -93,6 +93,7 @@ $invoice.on('touchend', '.checkbox', function() { @@ -93,6 +93,7 @@ $invoice.on('touchend', '.checkbox', function() {
93 function orderCompute() { 93 function orderCompute() {
94 var yohoCoin = orderInfo('yohoCoin'); 94 var yohoCoin = orderInfo('yohoCoin');
95 95
  96 + loading.showLoadingMask();
96 $.ajax({ 97 $.ajax({
97 method: 'POST', 98 method: 'POST',
98 url: '/cart/index/orderCompute', 99 url: '/cart/index/orderCompute',
@@ -127,6 +128,8 @@ function orderCompute() { @@ -127,6 +128,8 @@ function orderCompute() {
127 } 128 }
128 }).fail(function() { 129 }).fail(function() {
129 window.location.reload(); 130 window.location.reload();
  131 + }).always(function() {
  132 + loading.hideLoadingMask();
130 }); 133 });
131 } 134 }
132 135
@@ -217,7 +217,7 @@ @@ -217,7 +217,7 @@
217 217
218 em { 218 em {
219 font-weight: normal; 219 font-weight: normal;
220 - font-size: 36rem / $pxConvertRem; 220 + font-size: 30rem / $pxConvertRem;
221 } 221 }
222 } 222 }
223 223