Authored by biao

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

@@ -45,14 +45,6 @@ class DetailModel @@ -45,14 +45,6 @@ class DetailModel
45 return $result; 45 return $result;
46 } 46 }
47 47
48 - // 是否为限购商品  
49 - $isLimited = ($baseInfo['isLimitBuy'] === 'Y');  
50 - // 如果未登录并且为限购商品,就跳转到登录页  
51 - if (empty($uid) && $isLimited) {  
52 - $result['needLogin'] = true;  
53 - return $result;  
54 - }  
55 -  
56 $result['goodsName'] = $baseInfo['productName']; 48 $result['goodsName'] = $baseInfo['productName'];
57 49
58 // 商品促销短语 50 // 商品促销短语
@@ -313,7 +305,7 @@ class DetailModel @@ -313,7 +305,7 @@ class DetailModel
313 $result['cartInfo']['sizes'] = $sizeGroup; 305 $result['cartInfo']['sizes'] = $sizeGroup;
314 306
315 // 限购商品 307 // 限购商品
316 - if ($isLimited) { 308 + if ($baseInfo['isLimitBuy'] === 'Y') {
317 // 是否开售 309 // 是否开售
318 $isBeginSale = (isset($baseInfo['saleStatus']) && $baseInfo['saleStatus'] == 1); 310 $isBeginSale = (isset($baseInfo['saleStatus']) && $baseInfo['saleStatus'] == 1);
319 // 限购商品有关的展示状态 311 // 限购商品有关的展示状态
@@ -39,11 +39,6 @@ class DetailController extends AbstractAction @@ -39,11 +39,6 @@ class DetailController extends AbstractAction
39 $this->error(); 39 $this->error();
40 } 40 }
41 41
42 - // 如果为限购商品且没有登录就跳转到登陆页  
43 - if (isset($data['needLogin'])) {  
44 - $this->go(Helpers::url('/signin.html', array('refer' => Helpers::url($this->server('REQUEST_URI')))));  
45 - }  
46 -  
47 $data['goodsDetailPage'] = true; 42 $data['goodsDetailPage'] = true;
48 $data['pageFooter'] = true; 43 $data['pageFooter'] = true;
49 44