fe / YOHOBUYWAP · Commits

Go to a project

Authored by 梁志锋
Commit fdb114032bf14f9816a41fcc1651f52ddc1c54bb 2 parents 609034a7 4fd21c8d

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

Inline Side-by-side
Showing 2 changed files with 3 additions and 5 deletions
@@ -16,7 +16,7 @@ var $cartContent = $('.cart-content'); @@ -16,7 +16,7 @@ var $cartContent = $('.cart-content');
16 var navHammer, 16 var navHammer,
17 cartType = $('#cartType').val(); 17 cartType = $('#cartType').val();
18 18
19 -var hasChecked = $('.cart-goods .icon-cb-checked').length > 0 ? true : false; //是否有选中商品 19 +var hasChecked = $('.cart-content:not(.hide) .icon-cb-checked').length > 0 ? true : false; //是否有选中商品
20 20
21 require('./good'); 21 require('./good');
22 22
@@ -227,8 +227,7 @@ class LoginController extends AbstractAction @@ -227,8 +227,7 @@ class LoginController extends AbstractAction
227 } 227 }
228 228
229 //判定是否需要绑定手机号 229 //判定是否需要绑定手机号
230 - $isBind = $result['data']['is_bind'];  
231 - if ($isBind == 'N') { 230 + if (isset($result['data']['is_bind']) && $result['data']['is_bind'] == 'N') {
232 $this->go(Helpers::url('/passport/bind/index', array('openId' => $access['openid'], 'sourceType' => 'qq', 'nickname' => $partnerInfo['nickname']))); 231 $this->go(Helpers::url('/passport/bind/index', array('openId' => $access['openid'], 'sourceType' => 'qq', 'nickname' => $partnerInfo['nickname'])));
233 } 232 }
234 233
@@ -264,8 +263,7 @@ class LoginController extends AbstractAction @@ -264,8 +263,7 @@ class LoginController extends AbstractAction
264 $result = LoginData::signinByOpenID($partnerInfo['screen_name'], $access['uid'], 'sina'); 263 $result = LoginData::signinByOpenID($partnerInfo['screen_name'], $access['uid'], 'sina');
265 } 264 }
266 //判定是否需要绑定手机号 265 //判定是否需要绑定手机号
267 - $isBind = $result['data']['is_bind'];  
268 - if ($isBind == 'N') { 266 + if (isset($result['data']['is_bind']) && $result['data']['is_bind'] == 'N') {
269 $this->go(Helpers::url('/passport/bind/index', array('openId' => $access['uid'], 'sourceType' => 'sina', 'nickname' => $partnerInfo['screen_name']))); 267 $this->go(Helpers::url('/passport/bind/index', array('openId' => $access['uid'], 'sourceType' => 'sina', 'nickname' => $partnerInfo['screen_name'])));
270 } 268 }
271 269