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

@@ -61,6 +61,10 @@ function checkColorSizeNum() {
 function show(html, cb) {
 function show(html, cb) {
     if (html) {
     if (html) {
         $chosePanel.html(html);
         $chosePanel.html(html);
+        if ($('#promotionId').val() !== '') {
+            $yohoPage.off('touchstart', '.btn-minus');
+            $yohoPage.off('touchstart', '.btn-plus');
+        }
         init();
         init();
     }
     }
     $('.chose-panel').show();
     $('.chose-panel').show();
@@ -288,6 +292,10 @@ $yohoPage.on('touchstart', '.btn-minus', function() {
     }
     }
 
 
     //TODO:库存数验证
     //TODO:库存数验证
+    if (num > leftNum) {
+        $num.val(leftNum);
+        return;
+    }
     $num.val(num + 1);
     $num.val(num + 1);
 }).on('touchstart', '#chose-btn-sure', function() {
 }).on('touchstart', '#chose-btn-sure', function() {
 
 
@@ -303,6 +311,10 @@ $yohoPage.on('touchstart', '.btn-minus', function() {
     if (!checkColorSizeNum()) {
     if (!checkColorSizeNum()) {
         return;
         return;
     }
     }
+    if (isNaN(num)) {
+        tip.show('您选择的数量不是一个数字~');
+        return;
+    }
 
 
     //TODO status change
     //TODO status change
     if ($('#chose-btn-sure').html() === '已售罄') {
     if ($('#chose-btn-sure').html() === '已售罄') {

@@ -188,7 +188,7 @@ if (!orderInfo('addressId')) {
     orderInfo('addressId', $addressWrap.data('id'));
     orderInfo('addressId', $addressWrap.data('id'));
 }
 }
 
 
-$('.dispatch-mode').on('touchstart', 'li', function() {
+$('.dispatch-mode').on('touchend', 'li', function() {
     var $defaultMode = $('.dispatch-mode [data-id="1"]');
     var $defaultMode = $('.dispatch-mode [data-id="1"]');
 
 
     if (!$addressWrap.data('support') && $(this).data('id') === 2) {
     if (!$addressWrap.data('support') && $(this).data('id') === 2) {

@@ -73,7 +73,10 @@
         position: relative;
         position: relative;
         font-size: 28rem / $pxConvertRem;
         font-size: 28rem / $pxConvertRem;
         padding-left: 80rem / $pxConvertRem;
         padding-left: 80rem / $pxConvertRem;
-
+        input.disabled{
+            background-color:#fff;
+            color: #000;
+        }
         > span {
         > span {
             position: absolute;
             position: absolute;
             left: 0;
             left: 0;
@@ -84,6 +87,9 @@
             left: pxToRem(380px);
             left: pxToRem(380px);
             top: 20rem / $pxConvertRem;
             top: 20rem / $pxConvertRem;
         }
         }
+        span.disabled{
+            color: #e6e6e6;
+        }
     }
     }
 
 
     .size-list li.hide {
     .size-list li.hide {

@@ -13,9 +13,9 @@
     <ul class="freebie-and-advance-buy">
     <ul class="freebie-and-advance-buy">
         {{# freebie}}
         {{# freebie}}
             <li class="freebie">
             <li class="freebie">
+                <a href="/cart/index/gift?cartType=">
                 <span class="iconfont">&#xe620;</span>
                 <span class="iconfont">&#xe620;</span>
                 赠品
                 赠品
-                <a href=":;">
                     <span class="count">{{count}}</span>
                     <span class="count">{{count}}</span>
                     <span class="iconfont icon-right-arrow">&#xe614;</span>
                     <span class="iconfont icon-right-arrow">&#xe614;</span>
                 </a>
                 </a>
@@ -23,9 +23,9 @@
         {{/ freebie}}
         {{/ freebie}}
         {{#if advanceBuy}}
         {{#if advanceBuy}}
             <li class="advance-buy">
             <li class="advance-buy">
+                <a href="/cart/index/advanceBuy?cartType=">
                 <span class="iconfont">&#xe61b;</span>
                 <span class="iconfont">&#xe61b;</span>
                 加价购
                 加价购
-                <a href=":;">
                     <span class="count">{{advanceBuyCount}}</span>
                     <span class="count">{{advanceBuyCount}}</span>
                     <span class="iconfont icon-right-arrow">&#xe614;</span>
                     <span class="iconfont icon-right-arrow">&#xe614;</span>
                 </a>
                 </a>
@@ -66,13 +66,13 @@
     {{^}}
     {{^}}
     <span class="checkbox icon-checkbox iconfont"></span>
     <span class="checkbox icon-checkbox iconfont"></span>
     {{/if}}
     {{/if}}
+    <a class="btn-balance">
+        结算
+    </a>
     <p>
     <p>
         <span id="good-total">
         <span id="good-total">
             总计:¥{{sumPrice}} ({{count}}件)
             总计:¥{{sumPrice}} ({{count}}件)
         </span>
         </span>
         <span class="tip">(不含运费)</span>
         <span class="tip">(不含运费)</span>
     </p>
     </p>
-    <a class="btn-balance">
-        结算
-    </a>
 </div>
 </div>

@@ -50,11 +50,11 @@
                     <span>数量</span>
                     <span>数量</span>
                     <div class="clearfix">
                     <div class="clearfix">
                         <a class="btn btn-minus" href="javascript:void(0);">
                         <a class="btn btn-minus" href="javascript:void(0);">
-                            <span class="iconfont">&#xe625;</span>
+                            <span class="iconfont {{#if promotionId}}disabled{{/if}}">&#xe625;</span>
                         </a>
                         </a>
-                        <input id="good-num" class="good-num" type="text" value="1">
+                        <input id="good-num" class="good-num {{#if promotionId}}disabled{{/if}}" type="text" value="1" {{#if promotionId}}disabled="true"{{/if}}>
                         <a class="btn btn-plus" href="javascript:void(0);">
                         <a class="btn btn-plus" href="javascript:void(0);">
-                            <span class="iconfont">&#xe624;</span>
+                            <span class="iconfont {{#if promotionId}}disabled{{/if}}">&#xe624;</span>
                         </a>
                         </a>
                     </div>
                     </div>
                     <span class="left-num"></span>
                     <span class="left-num"></span>