Merge remote-tracking branch 'origin/hotfix/imgQu'

@@ -65,7 +65,8 @@ class Helpers
      */
      */
     public static function getImageUrl($url, $width, $height, $mode = 2)
     public static function getImageUrl($url, $width, $height, $mode = 2)
     {
     {
-        return strtr($url, array('{width}' => $width, '{height}' => $height, '{mode}' => $mode, 'http://' => '//')) . '/q/70';
+//        return strtr($url, array('{width}' => $width, '{height}' => $height, '{mode}' => $mode, 'http://' => '//')) . '/q/70';
+        return strtr($url, array('{width}' => $width, '{height}' => $height, '{mode}' => $mode, 'http://' => '//'));
     }
     }
 
 
     /**
     /**

@@ -71,7 +71,8 @@ class Images
         if (stripos($fileName, 'http://') !== 0) {
         if (stripos($fileName, 'http://') !== 0) {
             $fileName = self::template($fileName, $bucket, $mode);
             $fileName = self::template($fileName, $bucket, $mode);
         }
         }
-        return strtr($fileName, array('{width}' => $width, '{height}' => $height, '{mode}' => $mode, 'http://' => '//')) . '/q/70';
+//        return strtr($fileName, array('{width}' => $width, '{height}' => $height, '{mode}' => $mode, 'http://' => '//')) . '/q/70';
+        return strtr($fileName, array('{width}' => $width, '{height}' => $height, '{mode}' => $mode, 'http://' => '//'));
     }
     }
 
 
     /**
     /**

@@ -72,7 +72,7 @@ class Bootstrap extends Bootstrap_Abstract
         $controller = 'Index';
         $controller = 'Index';
         $action = 'Index';
         $action = 'Index';
         // 三级域名
         // 三级域名
-        if (4 === $level) {
+        if (3 === $level) {
             $subDomain = strval($hostParts[0]);
             $subDomain = strval($hostParts[0]);
             switch (strtolower($subDomain)) {
             switch (strtolower($subDomain)) {
                 case 'm':  // 老版(到频道选择)
                 case 'm':  // 老版(到频道选择)

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