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

@@ -49,6 +49,8 @@ if ($('.cart-nav').length > 0) {
         //切换普通商品和预售商品购物车显示
         //切换普通商品和预售商品购物车显示
         $cartContent.toggleClass('hide');
         $cartContent.toggleClass('hide');
 
 
+        hasChecked = $('.cart-content:not(.hide) .icon-cb-checked').length > 0 ? true : false;
+
         //trigger lazyload
         //trigger lazyload
         $(window).trigger('scroll');
         $(window).trigger('scroll');
     });
     });

@@ -5,15 +5,6 @@
         margin-left: 34rem / $pxConvertRem;
         margin-left: 34rem / $pxConvertRem;
         height: 160rem / $pxConvertRem;
         height: 160rem / $pxConvertRem;
         border-bottom: 1px solid #e0e0e0;
         border-bottom: 1px solid #e0e0e0;
-
-        &:last-child {
-            border-bottom: none;
-        }
-    }
-
-
-    .advance-block .gift-advance-good:last-child {
-        border-bottom: none;
     }
     }
 
 
     .advance-block:last-child .gift-advance-good:last-child {
     .advance-block:last-child .gift-advance-good:last-child {

@@ -111,6 +111,11 @@
     .price {
     .price {
         font-size: 0.6rem;
         font-size: 0.6rem;
         color: $cartRed;
         color: $cartRed;
+        display: inline;
+        .sale-price{
+            color: #b0b0b0;
+            text-decoration: line-through;
+        }
     }
     }
 
 
     .count {
     .count {

@@ -140,10 +140,11 @@
 
 
         > li {
         > li {
             box-sizing: border-box;
             box-sizing: border-box;
-            height: 90rem / $pxConvertRem;
-            line-height: 90rem / $pxConvertRem;
+            height: 80rem / $pxConvertRem;
+            line-height: 80rem / $pxConvertRem;
             margin-bottom: 10rem / $pxConvertRem;
             margin-bottom: 10rem / $pxConvertRem;
             padding: 0 20rem / $pxConvertRem;
             padding: 0 20rem / $pxConvertRem;
+            background: #f1f1f1;
 
 
             &:last-child {
             &:last-child {
                 margin-bottom: 0;
                 margin-bottom: 0;

@@ -49,7 +49,7 @@
     .not-use {
     .not-use {
         display: block;
         display: block;
         width: pxToRem(560px);
         width: pxToRem(560px);
-        margin: pxToRem(30px) auto;
+        margin: pxToRem(30px) auto 0;
         text-align: center;
         text-align: center;
         font-size: pxToRem(32px);
         font-size: pxToRem(32px);
         line-height: 2.5;
         line-height: 2.5;

@@ -41,10 +41,12 @@
                 </p>
                 </p>
             </div>
             </div>
             <p class="row">
             <p class="row">
-                <span class="price">
-                    ¥{{price}}
-                </span>
-
+                    <p class="price">
+                        <span class="market-price">¥{{price}}</span>
+                        {{#if isAdvanceBuy}}
+                        <span class="sale-price">¥{{salesPrice}}</span>
+                        {{/if}}
+                    </p>
                 {{#if isVipPrice}}
                 {{#if isVipPrice}}
                     <span class="vip">
                     <span class="vip">
                         VIP
                         VIP

@@ -555,8 +555,8 @@ class CartModel
                     $notAvailableRes = self::searchCoupon($uid, $val['couponCode']);
                     $notAvailableRes = self::searchCoupon($uid, $val['couponCode']);
                     // 处理可用的优惠券
                     // 处理可用的优惠券
                     if ($val['isValidity'] === 'N' || (isset($notAvailableRes['code']) && $notAvailableRes['code'] !== 200)) {
                     if ($val['isValidity'] === 'N' || (isset($notAvailableRes['code']) && $notAvailableRes['code'] !== 200)) {
-//                        $val['notAvailable'] = true;
-                        continue;
+                        $val['notAvailable'] = true;
+                        // continue;
                     }
                     }
                     $result[] = $val;
                     $result[] = $val;
                 }
                 }