Merge remote-tracking branch 'origin/hotfix/apichange-bug' into develop

@@ -46,9 +46,9 @@ class HomeModel
     const COOKIE_NAME_LIFESTYLE = 'lifestyle';
 
     /* COOKIE标识访问的是男生频道底部Banner */
-    const CODE_NAME_BOYS_BOTTOM_BANNER = '8c48745a39373d621bf5fd80edf59b5e';
+    const CODE_NAME_BOYS_BOTTOM_BANNER = 'a2ec977c027d0cd9cdccb356ddf16b08';
     /* COOKIE标识访问的是女生频道频道底部Banner */
-    const CODE_NAME_GIRLS_BOTTOM_BANNER = 'c63939b2ad458e9cb51147940c1da2e5';
+    const CODE_NAME_GIRLS_BOTTOM_BANNER = '8c8bd1b89a22e5895f05882e0825b493';
 
     /**
      * 选择频道

@@ -31,7 +31,7 @@ class DetailModel
 
         if (is_numeric($productId) && is_numeric($goodsId)) {
             // 调用服务
-            $baseInfo = DetailData::baseInfo($productId, $uid); 
+            $baseInfo = DetailData::baseInfo($productId, $uid);
             
             // 判断商品是否在架
             if (empty($baseInfo['status'])) {
@@ -69,16 +69,6 @@ class DetailModel
                 }
             }
 
-	        // 新品标签
-	        if (isset($baseInfo['isNew']) && $baseInfo['isNew'] === 'Y') {
-		        $result['tags']['is_new'] = true;
-	        }
-
-	        // NEW和SALE只显示一个
-	        if (isset($result['tags']['is_new']) && isset($result['tags']['is_discount'])) {
-		        unset($result['tags']['is_discount']);
-	        }
-
             // 商品价格
             if (isset($baseInfo['productPriceBo'])) {
                 $result['goodsPrice'] = array();
@@ -141,7 +131,7 @@ class DetailModel
                 $build = array();
                 foreach ($baseInfo['commentBoWrapper']['commentBoList'] as $value) {
                     $build['userName'] = $value['nickName'];
-                    $build['desc'] = $value['colorName'] . $value['sizeName'];
+                    $build['desc'] = $value['colorName'] . '/' . $value['sizeName'];
                     $build['content'] = $value['content'];
                     $build['time'] = $value['createTime'];
                     $result['feedbacks']['comments'][] = $build;