Authored by 毕凯

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

@@ -159,7 +159,6 @@ $yohoPage.on('touchstart', '.chose-panel', function(e) { @@ -159,7 +159,6 @@ $yohoPage.on('touchstart', '.chose-panel', function(e) {
159 $yohoPage.on('touchstart', '.color-list .block', function() { 159 $yohoPage.on('touchstart', '.color-list .block', function() {
160 var $this = $(this), 160 var $this = $(this),
161 index, 161 index,
162 - curSizeBlock,  
163 $preSiblingBlock, 162 $preSiblingBlock,
164 $curSizeRow, 163 $curSizeRow,
165 numArray, 164 numArray,
@@ -203,13 +202,13 @@ $yohoPage.on('touchstart', '.color-list .block', function() { @@ -203,13 +202,13 @@ $yohoPage.on('touchstart', '.color-list .block', function() {
203 // 之前选中的尺码去掉勾选样式 202 // 之前选中的尺码去掉勾选样式
204 if ($preSiblingBlock.length > 0) { 203 if ($preSiblingBlock.length > 0) {
205 $preSiblingBlock.removeClass('chosed'); 204 $preSiblingBlock.removeClass('chosed');
206 - curSizeBlock = $curSizeRow.children().get(curSizeIndex); 205 + $curSizeBlock = $curSizeRow.children().get(curSizeIndex);
207 } 206 }
208 207
209 // 当前选中颜色对应的尺码行,其对应的尺码加上勾选样式 (前提是要判断下这个尺码是否存在) 208 // 当前选中颜色对应的尺码行,其对应的尺码加上勾选样式 (前提是要判断下这个尺码是否存在)
210 - if (curSizeBlock) {  
211 - curGoodNum = $(curSizeBlock).data('num');  
212 - $(curSizeBlock).addClass('chosed'); 209 + if ($curSizeBlock) {
  210 + curGoodNum = $curSizeBlock.data('num');
  211 + $curSizeBlock.addClass('chosed');
213 212
214 //如果当前有尺码被选中,且数量等于0,则颜色块添加数量为0的样式 213 //如果当前有尺码被选中,且数量等于0,则颜色块添加数量为0的样式
215 if (curGoodNum > 0) { 214 if (curGoodNum > 0) {