Authored by 郭成尧

Merge branch 'release/5.3' into gray

@@ -40,6 +40,9 @@ class RecomData @@ -40,6 +40,9 @@ class RecomData
40 $param['page'] = $page; 40 $param['page'] = $page;
41 $param['limit'] = $limit; 41 $param['limit'] = $limit;
42 $param['yh_channel'] = $channel; 42 $param['yh_channel'] = $channel;
  43 + if (isset($_COOKIE['_yasvd'])) {
  44 + $param['client_id'] = $_COOKIE['_yasvd'];
  45 + }
43 $param['client_secret'] = Sign::getSign($param); 46 $param['client_secret'] = Sign::getSign($param);
44 47
45 return Yohobuy::get(API_URL, $param, 300); 48 return Yohobuy::get(API_URL, $param, 300);
@@ -199,7 +199,10 @@ $('.btn-balance').on('touchend', function() { @@ -199,7 +199,10 @@ $('.btn-balance').on('touchend', function() {
199 var productId = []; 199 var productId = [];
200 200
201 $('.shopping-cart-good').each(function() { 201 $('.shopping-cart-good').each(function() {
202 - productId.push($(this).data('id')); 202 +
  203 + if($(this).find('.checkbox').hasClass('icon-cb-checked')) {
  204 + productId.push($(this).data('id'));
  205 + }
203 }); 206 });
204 207
205 setTimeout(function() { 208 setTimeout(function() {