Merge branch 'develop/wap' into beta/wap

@@ -45,14 +45,6 @@ class DetailModel
             return $result;
             return $result;
         }
         }
 
 
-        // 是否为限购商品
-        $isLimited = ($baseInfo['isLimitBuy'] === 'Y');
-        // 如果未登录并且为限购商品，就跳转到登录页
-        if (empty($uid) && $isLimited) {
-            $result['needLogin'] = true;
-            return $result;
-        }
-
         $result['goodsName'] = $baseInfo['productName'];
         $result['goodsName'] = $baseInfo['productName'];
 
 
         // 商品促销短语
         // 商品促销短语
@@ -313,7 +305,7 @@ class DetailModel
             $result['cartInfo']['sizes'] = $sizeGroup;
             $result['cartInfo']['sizes'] = $sizeGroup;
 
 
             // 限购商品
             // 限购商品
-            if ($isLimited) {
+            if ($baseInfo['isLimitBuy'] === 'Y') {
                 // 是否开售
                 // 是否开售
                 $isBeginSale = (isset($baseInfo['saleStatus']) && $baseInfo['saleStatus'] == 1);
                 $isBeginSale = (isset($baseInfo['saleStatus']) && $baseInfo['saleStatus'] == 1);
                 // 限购商品有关的展示状态
                 // 限购商品有关的展示状态

@@ -39,11 +39,6 @@ class DetailController extends AbstractAction
             $this->error();
             $this->error();
         }
         }
 
 
-        // 如果为限购商品且没有登录就跳转到登陆页
-        if (isset($data['needLogin'])) {
-            $this->go(Helpers::url('/signin.html', array('refer' => Helpers::url($this->server('REQUEST_URI')))));
-        }
-
         $data['goodsDetailPage'] = true;
         $data['goodsDetailPage'] = true;
         $data['pageFooter'] = true;
         $data['pageFooter'] = true;