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

@@ -124,11 +124,6 @@ function changeGoodImgWhenClickColor() {
     }
     }
 }
 }
 
 
-//function resetHasSelectedNum() {
-//    $allChoseItems.find('.num .left-num').html('剩余' + 1 + '件');
-//    $leftNum.val(1);
-//}
-
 init();
 init();
 
 
 $yohoPage.on('touchstart', '.chose-panel', function(e) {
 $yohoPage.on('touchstart', '.chose-panel', function(e) {
@@ -211,15 +206,13 @@ $yohoPage.on('touchstart', '.color-list .block', function() {
     // 当前颜色块 切换勾选样式
     // 当前颜色块 切换勾选样式
     $this.toggleClass('chosed');
     $this.toggleClass('chosed');
     curColorIndex = index;
     curColorIndex = index;
+    $('#good-num').val(1);
 
 
     // 设置按钮的样式和文字
     // 设置按钮的样式和文字
     updateConformButtonClassAndText();
     updateConformButtonClassAndText();
 
 
     // 修改颜色时修改商品图片
     // 修改颜色时修改商品图片
     changeGoodImgWhenClickColor();
     changeGoodImgWhenClickColor();
-
-    // 颜色切换时, 重置已经选择的商品数量
-    //resetHasSelectedNum();
 }).on('touchstart', '.size-list .block', function() {
 }).on('touchstart', '.size-list .block', function() {
     var $this = $(this),
     var $this = $(this),
         index,
         index,
@@ -265,15 +258,13 @@ $yohoPage.on('touchstart', '.color-list .block', function() {
     $this.toggleClass('chosed');
     $this.toggleClass('chosed');
     curSizeIndex = index;
     curSizeIndex = index;
     $curSizeBlock = $this;
     $curSizeBlock = $this;
+    $('#good-num').val(1);
 
 
     // 设置按钮的样式和文字
     // 设置按钮的样式和文字
     updateConformButtonClassAndText();
     updateConformButtonClassAndText();
 
 
     // 重置颜色块的样式
     // 重置颜色块的样式
     resetColorZeroStock($siblingBlock);
     resetColorZeroStock($siblingBlock);
-
-    // 颜色尺码时, 重置已经选择的商品数量
-    //resetHasSelectedNum();
 });
 });
 
 
 $yohoPage.on('touchstart', '.btn-minus', function() {
 $yohoPage.on('touchstart', '.btn-minus', function() {

@@ -227,8 +227,7 @@ class LoginController extends AbstractAction
         }
         }
 
 
         //判定是否需要绑定手机号
         //判定是否需要绑定手机号
-        $isBind = $result['data']['is_bind'];
-        if ($isBind == 'N') {
+        if (isset($result['data']['is_bind']) && $result['data']['is_bind'] == 'N') {
             $this->go(Helpers::url('/passport/bind/index', array('openId' => $access['openid'], 'sourceType' => 'qq', 'nickname' => $partnerInfo['nickname'])));
             $this->go(Helpers::url('/passport/bind/index', array('openId' => $access['openid'], 'sourceType' => 'qq', 'nickname' => $partnerInfo['nickname'])));
         }
         }
 
 
@@ -264,8 +263,7 @@ class LoginController extends AbstractAction
             $result = LoginData::signinByOpenID($partnerInfo['screen_name'], $access['uid'], 'sina');
             $result = LoginData::signinByOpenID($partnerInfo['screen_name'], $access['uid'], 'sina');
         }
         }
         //判定是否需要绑定手机号
         //判定是否需要绑定手机号
-        $isBind = $result['data']['is_bind'];
-        if ($isBind == 'N') {
+        if (isset($result['data']['is_bind']) && $result['data']['is_bind'] == 'N') {
             $this->go(Helpers::url('/passport/bind/index', array('openId' => $access['uid'], 'sourceType' => 'sina', 'nickname' => $partnerInfo['screen_name'])));
             $this->go(Helpers::url('/passport/bind/index', array('openId' => $access['uid'], 'sourceType' => 'sina', 'nickname' => $partnerInfo['screen_name'])));
         }
         }