Authored by biao

Merge branch 'hotfix/limit'

@@ -204,7 +204,7 @@ class DetailModel @@ -204,7 +204,7 @@ class DetailModel
204 $totalStorageNum = 0; // 总库存数 204 $totalStorageNum = 0; // 总库存数
205 foreach ($baseInfo['goodsList'] as $value) { 205 foreach ($baseInfo['goodsList'] as $value) {
206 // 如果status为0,即skc下架时就跳过该商品 206 // 如果status为0,即skc下架时就跳过该商品
207 - if ($value['status'] === 0) { 207 + if ($value['status'] === 0 && $baseInfo['isLimitBuy'] !== 'Y') {
208 continue; 208 continue;
209 } 209 }
210 210
@@ -314,9 +314,10 @@ class DetailModel @@ -314,9 +314,10 @@ class DetailModel
314 ); 314 );
315 $soldOut = ($baseInfo['status'] == 0 || $totalStorageNum === 0); 315 $soldOut = ($baseInfo['status'] == 0 || $totalStorageNum === 0);
316 $notForSale = $baseInfo['attribute'] == 2; 316 $notForSale = $baseInfo['attribute'] == 2;
  317 + $willSale = ($baseInfo['showStatus'] === 1 && $baseInfo['saleStatus'] === 0);
317 318
318 // 显示加入购物车链接 319 // 显示加入购物车链接
319 - if (!$soldOut && !$notForSale) { 320 + if ($willSale || (!$soldOut && !$notForSale)) {
320 ksort($colorGroup, SORT_NUMERIC); 321 ksort($colorGroup, SORT_NUMERIC);
321 322
322 $result['cartInfo']['productId'] = $productId; 323 $result['cartInfo']['productId'] = $productId;