do modify domain m1.yohobuy.com mapi.yohobuy.com

@@ -225,14 +225,14 @@ class DetailModel
             if (!$soldOut && !$notForSale) {
             if (!$soldOut && !$notForSale) {
                 $result['cartInfo']['addToCartUrl'] = Helpers::url('/product/buy_' . $productId . '_' . $goodsId . '.html'); // 
                 $result['cartInfo']['addToCartUrl'] = Helpers::url('/product/buy_' . $productId . '_' . $goodsId . '.html'); // 
             }
             }
-            // 已售磬
-            elseif (!$notForSale && $soldOut) {
-                $result['cartInfo']['soldOut'] = true;
-            }
             // 非卖品
             // 非卖品
-            elseif (!$soldOut && $notForSale) {
+            elseif ($notForSale) {
                 $result['cartInfo']['notForSale'] = true;
                 $result['cartInfo']['notForSale'] = true;
             }
             }
+            // 已售磬
+            elseif ($soldOut) {
+                $result['cartInfo']['soldOut'] = true;
+            }
 
 
             // 是否收藏
             // 是否收藏
             $result['isCollect'] = false;
             $result['isCollect'] = false;
@@ -422,7 +422,11 @@ class DetailModel
 
 
             // 详情配图
             // 详情配图
             if (isset($sizeInfo['productIntroBo']['productIntro'])) {
             if (isset($sizeInfo['productIntroBo']['productIntro'])) {
-                $productIntro = $sizeInfo['productIntroBo']['productIntro'];
+                $productIntro = '';
+                if (!empty($sizeInfo['productDescBo']['phrase'])) {
+                    $productIntro .= $sizeInfo['productDescBo']['phrase'];
+                }
+                $productIntro .= $sizeInfo['productIntroBo']['productIntro'];
                 if ($productIntro) {
                 if ($productIntro) {
                     $result['productDetail'] = array(
                     $result['productDetail'] = array(
                         'title' => '商品详情',
                         'title' => '商品详情',