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

@@ -225,7 +225,8 @@ class BindController extends AbstractAction
             $areaCode = $this->post('areaCode', '86');
             $sourceType = $this->post('sourceType');
 //            $nickname = $this->post('nickname');//nickname不同步信息
-            $password = !empty($this->post('password')) ? $this->post('password') : '';
+            $password = $this->post('password');
+            $password = empty($password) ? '' : $password;
 
             if (!is_numeric($phoneNum) || !$openId || !$sourceType || !$areaCode) {
                 break;