Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
Showing
1 changed file
with
3 additions
and
3 deletions
@@ -187,7 +187,7 @@ class LoginController extends AbstractAction | @@ -187,7 +187,7 @@ class LoginController extends AbstractAction | ||
187 | $isBind = $result['data']['is_bind']; | 187 | $isBind = $result['data']['is_bind']; |
188 | if ($isBind == 'N') | 188 | if ($isBind == 'N') |
189 | { | 189 | { |
190 | - $this->go(Helpers::url('/passport/bind/index',array('openId'=>$userId,'sourceType'=>'alipay','nickName'=>$realName))); | 190 | + $this->go(Helpers::url('/passport/bind/index',array('openId'=>$userId,'sourceType'=>'alipay','nickname'=>$realName))); |
191 | } | 191 | } |
192 | 192 | ||
193 | $refer = $this->getCookie('refer'); | 193 | $refer = $this->getCookie('refer'); |
@@ -226,7 +226,7 @@ class LoginController extends AbstractAction | @@ -226,7 +226,7 @@ class LoginController extends AbstractAction | ||
226 | $isBind = $result['data']['is_bind']; | 226 | $isBind = $result['data']['is_bind']; |
227 | if ($isBind == 'N') | 227 | if ($isBind == 'N') |
228 | { | 228 | { |
229 | - $this->go(Helpers::url('/passport/bind/index',array('openId'=>$access['openid'],'sourceType'=>'qq','nickName'=>$partnerInfo['nickname']))); | 229 | + $this->go(Helpers::url('/passport/bind/index',array('openId'=>$access['openid'],'sourceType'=>'qq','nickname'=>$partnerInfo['nickname']))); |
230 | } | 230 | } |
231 | 231 | ||
232 | $refer = $this->getCookie('refer'); | 232 | $refer = $this->getCookie('refer'); |
@@ -270,7 +270,7 @@ class LoginController extends AbstractAction | @@ -270,7 +270,7 @@ class LoginController extends AbstractAction | ||
270 | $isBind = $result['data']['is_bind']; | 270 | $isBind = $result['data']['is_bind']; |
271 | if ($isBind == 'N') | 271 | if ($isBind == 'N') |
272 | { | 272 | { |
273 | - $this->go(Helpers::url('/passport/bind/index',array('openId'=>$access['uid'],'sourceType'=>'sina','nickName'=>$partnerInfo['screen_name']))); | 273 | + $this->go(Helpers::url('/passport/bind/index',array('openId'=>$access['uid'],'sourceType'=>'sina','nickname'=>$partnerInfo['screen_name']))); |
274 | } | 274 | } |
275 | 275 | ||
276 | $refer = $this->getCookie('refer'); | 276 | $refer = $this->getCookie('refer'); |
-
Please register or login to post a comment