Merge remote-tracking branch 'origin/develop'

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

@@ -80,6 +80,9 @@
         input.disabled{
         input.disabled{
             background-color:#fff;
             background-color:#fff;
             color: #000;
             color: #000;
+            opacity: 1;
+            @include border-radius(0);
+            -webkit-appearance: none;
         }
         }
         > span {
         > span {
             position: absolute;
             position: absolute;

@@ -154,7 +154,7 @@
     .vip {
     .vip {
         display: inline-block;
         display: inline-block;
         color: #fff;
         color: #fff;
-        background: #d1021c;
+        background: #e01;
         @include border-radius(16rem / $pxConvertRem);
         @include border-radius(16rem / $pxConvertRem);
         padding: 0rem / $pxConvertRem 12rem / $pxConvertRem;
         padding: 0rem / $pxConvertRem 12rem / $pxConvertRem;
         margin-left: 8rem / $pxConvertRem;
         margin-left: 8rem / $pxConvertRem;