Merge branch 'develop' into test

@@ -77,8 +77,8 @@ if (typeof window.cookie === 'function' && 'y' === window.cookie('_hasShowCartPr
 
 
 if ('advance' === cartType) {
 if ('advance' === cartType) {
     $cartContent.toggleClass('hide');
     $cartContent.toggleClass('hide');
-    $('presell-cart-nav').addClass('active');
-    $('common-cart-nav').removeClass('active');
+    $('#common-cart-nav').removeClass('active');
+    $('#presell-cart-nav').addClass('active');
 }
 }
 
 
 if ($('.cart-nav').length > 0) {
 if ($('.cart-nav').length > 0) {

@@ -101,7 +101,7 @@ a {
     color: #fff;
     color: #fff;
     font-size: 18px;
     font-size: 18px;
     border: none;
     border: none;
-    z-index:2;
+    z-index:4;
     @include border-radius(10px);
     @include border-radius(10px);
 }
 }
 
 

@@ -19,13 +19,13 @@
         {{^}}
         {{^}}
             {{#if cartNav}}
             {{#if cartNav}}
                 <ul class="cart-nav clearfix">
                 <ul class="cart-nav clearfix">
-                    <li class="active">
-                        <span id="common-cart-nav">
+                    <li class="active" id="common-cart-nav">
+                        <span >
                             普通商品({{commonGoodsCount}})
                             普通商品({{commonGoodsCount}})
                         </span>
                         </span>
                     </li>
                     </li>
-                    <li>
-                        <span id="presell-cart-nav">
+                    <li id="presell-cart-nav">
+                        <span >
                             预售商品({{presellGoodsCount}})
                             预售商品({{presellGoodsCount}})
                         </span>
                         </span>
                         <div id="presell-tip" class="presell-tip hide">
                         <div id="presell-tip" class="presell-tip hide">