Merge branch 'develop' into 'develop'

Develop

1:商品库存验证
2:商品文字超长修改
3:购物车数字不能点击

See merge request !53

@@ -277,6 +277,10 @@ $yohoPage.on('touchstart', '.btn-minus', function() {
     if (num === 1 || 0 === leftNum - 0) {
     if (num === 1 || 0 === leftNum - 0) {
         return;
         return;
     }
     }
+    if (num < 1) {
+        $num.val(1);
+        return;
+    }
 
 
     $num.val(num - 1);
     $num.val(num - 1);
 }).on('touchstart', '.btn-plus', function() {
 }).on('touchstart', '.btn-plus', function() {
@@ -294,7 +298,7 @@ $yohoPage.on('touchstart', '.btn-minus', function() {
     }
     }
 
 
     //TODO:库存数验证
     //TODO:库存数验证
-    if (num > leftNum) {
+    if (num > leftNum - 1) {
         $num.val(leftNum);
         $num.val(leftNum);
         return;
         return;
     }
     }
@@ -318,6 +322,7 @@ $yohoPage.on('touchstart', '.btn-minus', function() {
         return;
         return;
     }
     }
 
 
+
     //TODO status change
     //TODO status change
     if ($('#chose-btn-sure').html() === '已售罄') {
     if ($('#chose-btn-sure').html() === '已售罄') {
         return;
         return;
@@ -329,7 +334,10 @@ $yohoPage.on('touchstart', '.btn-minus', function() {
         tip.show('您选择的数量超过了最大库存量~');
         tip.show('您选择的数量超过了最大库存量~');
         return;
         return;
     }
     }
-
+    if (num < 0) {
+        tip.show('您选择的数量小于一件~');
+        return;
+    }
     $chosed = $('.block-list>ul>li.chosed');
     $chosed = $('.block-list>ul>li.chosed');
 
 
     if (2 === $chosed.length && 0 === $chosed.closest('.zero-stock').length) {
     if (2 === $chosed.length && 0 === $chosed.closest('.zero-stock').length) {

@@ -39,17 +39,18 @@
 
 
     .thumb {
     .thumb {
         float: left;
         float: left;
-        width: 80rem / $pxConvertRem;
+        width: 100rem / $pxConvertRem;
     }
     }
 
 
     .text-info {
     .text-info {
-        position: absolute;
         height: auto;
         height: auto;
-        left: pxToRem(95px);
-        top:50%;
-        transform: translateY(-50%);
         .name {
         .name {
             font-size: 28rem / $pxConvertRem;
             font-size: 28rem / $pxConvertRem;
+            height: 74rem / $pxConvertRem;
+            overflow: hidden;  
+            display: -webkit-box;
+            -webkit-line-clamp: 2;
+            -webkit-box-orient: vertical;
         }
         }
 
 
         .price{
         .price{

@@ -11,7 +11,7 @@
         {{/if}}
         {{/if}}
         {{#if isEmptyCart}}
         {{#if isEmptyCart}}
             <div class="cart-zero">
             <div class="cart-zero">
-                <i class="iconfont">&#xe62c</i>
+                <i class="iconfont">&#xe640;</i>
                 <p>您的购物车暂无商品</p>
                 <p>您的购物车暂无商品</p>
                 <a href="/product/new">随便逛逛</a>
                 <a href="/product/new">随便逛逛</a>
             </div>
             </div>

@@ -118,8 +118,7 @@
 
 
     {{#cartInfo}}
     {{#cartInfo}}
     <div class="cart-bar">
     <div class="cart-bar">
-        <span class="num-tag hide"></span>
-        <a href="{{cartUrl}}" class="num-incart iconfont">&#xe62c;</a>
+        <a href="{{cartUrl}}" class="num-incart iconfont"><span class="num-tag hide"></span>&#xe62c;</a>
 
 
         {{#if addToCartUrl}}
         {{#if addToCartUrl}}
            <!--  <a  id="addtoCart" href="{{addToCartUrl}}"  class="addto-cart">加入购物车</a> -->
            <!--  <a  id="addtoCart" href="{{addToCartUrl}}"  class="addto-cart">加入购物车</a> -->

@@ -16,8 +16,8 @@
                 <a href="/cart/index/gift?cartType={{cartType}}">
                 <a href="/cart/index/gift?cartType={{cartType}}">
                 <span class="iconfont">&#xe620;</span>
                 <span class="iconfont">&#xe620;</span>
                 赠品
                 赠品
-                    <span class="count">{{count}}</span>
                     <span class="iconfont icon-right-arrow">&#xe614;</span>
                     <span class="iconfont icon-right-arrow">&#xe614;</span>
+                    <span class="count">{{count}}</span>
                 </a>
                 </a>
             </li>
             </li>
         {{/ freebie}}
         {{/ freebie}}
@@ -26,8 +26,8 @@
                 <a href="/cart/index/advanceBuy?cartType={{cartType}}">
                 <a href="/cart/index/advanceBuy?cartType={{cartType}}">
                 <span class="iconfont">&#xe61b;</span>
                 <span class="iconfont">&#xe61b;</span>
                 加价购
                 加价购
-                    <span class="count">{{advanceBuyCount}}</span>
                     <span class="iconfont icon-right-arrow">&#xe614;</span>
                     <span class="iconfont icon-right-arrow">&#xe614;</span>
+                    <span class="count">{{advanceBuyCount}}</span>
                 </a>
                 </a>
             </li>
             </li>
         {{/if}}
         {{/if}}