Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

@@ -32,12 +32,12 @@ class DetailModel
         if (is_numeric($productId) && is_numeric($goodsId)) {
         if (is_numeric($productId) && is_numeric($goodsId)) {
             // 调用服务
             // 调用服务
             $baseInfo = DetailData::baseInfo($productId, $uid);
             $baseInfo = DetailData::baseInfo($productId, $uid);
-                        var_dump($baseInfo);
 
 
-            // 判断商品是否在架
-            if (empty($baseInfo['status'])) {
-                return $result;
-            }
+//            // 因ＰＣ目前是不判断的，先保持一致，以后有需要，可以去掉
+//            // 判断商品是否在架
+//            if (empty($baseInfo['status'])) {
+//                return $result;
+//            }
 
 
             // 商品名称
             // 商品名称
             if (isset($baseInfo['productName'])) {
             if (isset($baseInfo['productName'])) {
@@ -347,7 +347,7 @@ class DetailModel
 
 
                 $referenceList = array();
                 $referenceList = array();
                 // 判断是否显示参考尺码
                 // 判断是否显示参考尺码
-                $showReference = !empty($sizeInfo['sizeInfoBo']['sizeBoList'][0]['referenceSize']);
+                $showReference = $boyReference || $girlReference;
                 if ($showReference) {
                 if ($showReference) {
                     $referenceList[0] = array('param' => $referenceName);
                     $referenceList[0] = array('param' => $referenceName);
                 }
                 }
@@ -362,11 +362,11 @@ class DetailModel
                     foreach ($sizeInfo['sizeInfoBo']['sizeBoList'] as $value) {
                     foreach ($sizeInfo['sizeInfoBo']['sizeBoList'] as $value) {
                         $item = array();
                         $item = array();
                         $sizeNameList[] = array('param' => $value['sizeName']);
                         $sizeNameList[] = array('param' => $value['sizeName']);
-                        if (!empty($value['referenceSize']['gender']) && $boyReference && ($value['referenceSize']['gender'] == 1 || $value['referenceSize']['gender'] == 3)) {
-                            $referenceList[] = array('param' => empty($value['referenceSize']['referenceName']) ? ' ' : $value['referenceSize']['referenceName']);
+                        if ($boyReference && ($gender == 1 || $gender == 3) ) {
+                            $referenceList[] = array('param' => empty($value['boyReferSize']['referenceName']) ? ' ' : $value['boyReferSize']['referenceName']);
                         }
                         }
-                        elseif (!empty($value['referenceSize']['gender']) && $girlReference && ($value['referenceSize']['gender'] == 2 || $value['referenceSize']['gender'] == 3)) {
-                            $referenceList[] = array('param' => empty($value['referenceSize']['referenceName']) ? ' ' : $value['referenceSize']['referenceName']);
+                        elseif ($girlReference && ($gender == 2 || $gender == 3) ) {
+                            $referenceList[] = array('param' => empty($value['girlReferSize']['referenceName']) ? ' ' : $value['girlReferSize']['referenceName']);
                         }
                         }
                         foreach ($value['sortAttributes'] as $attr) {
                         foreach ($value['sortAttributes'] as $attr) {
                             $sizeBoGroup[$attr['id']][] = array('param' => empty($attr['sizeValue']) ? ' ' : $attr['sizeValue']);
                             $sizeBoGroup[$attr['id']][] = array('param' => empty($attr['sizeValue']) ? ' ' : $attr['sizeValue']);