Merge branch 'release/5.4.1' into gray

@@ -5,20 +5,24 @@
     <a href="/product/new">随便逛逛</a>
     <a href="/product/new">随便逛逛</a>
 </div>
 </div>
 {{^}}
 {{^}}
-    {{#if cartNav}}
-    <ul class="cart-nav clearfix">
-        <li class="{{#if ordinaryCart}}active{{/if}}" id="common-cart-nav" data-type="ordinary">
+    <div class="cart-nav clearfix{{#if cartNav}} more{{/if}}">
+        {{#if commonGoodsCount}}
+        <div class="nav-item{{#if ordinaryCart}} active{{/if}}" id="common-cart-nav" data-type="ordinary">
             <span>普通商品({{commonGoodsCount}})</span>
             <span>普通商品({{commonGoodsCount}})</span>
-        </li>
-        <li class="{{#if advanceCart}}active{{/if}}" id="presell-cart-nav" data-type="advance">
+        </div>
+        {{/if}}
+        {{#if presellGoodsCount}}
+        <div class="nav-item{{#if advanceCart}} active{{/if}}" id="presell-cart-nav" data-type="advance">
             <span >预售商品({{presellGoodsCount}})</span>
             <span >预售商品({{presellGoodsCount}})</span>
             <div id="presell-tip" class="presell-tip hide">
             <div id="presell-tip" class="presell-tip hide">
                 <div class="triangle"></div>
                 <div class="triangle"></div>
                 <p class="pt-content">预售商品点这里结算哦~</p>
                 <p class="pt-content">预售商品点这里结算哦~</p>
             </div>
             </div>
-        </li>
-    </ul>
-    {{/if}}
+        </div>
+        {{/if}}
+        <button class="btn-edit">编辑</button>
+    </div>
+   
     {{#if ordinaryCart}}
     {{#if ordinaryCart}}
     <div class="cart-content normal-good active">
     <div class="cart-content normal-good active">
         {{#commonCart}}
         {{#commonCart}}

@@ -61,7 +61,11 @@ let indexObj = {
 
 
         if (referrer && referrer !== window.location.href) {
         if (referrer && referrer !== window.location.href) {
             cookie.remove('_cartReferrer');
             cookie.remove('_cartReferrer');
-            window.location.href = referrer;
+            if (referrer === document.referrer || referrer === window.queryString.referrer) {
+                window.history.go(-1);
+            } else {
+                window.location.href = referrer;
+            }
         } else {
         } else {
             window.location.href = '/?go=1';
             window.location.href = '/?go=1';
         }
         }
@@ -89,8 +93,7 @@ let indexObj = {
         let self = this;
         let self = this;
 
 
         if ((!data || (!data.commonCart && !data.preSellCart)) && no_try !== true) {
         if ((!data || (!data.commonCart && !data.preSellCart)) && no_try !== true) {
-            self.refreshPage();
-            return;
+            return self.refreshPage();
         }
         }
         let cartType = cookie.get('_cartType') || 'ordinary';
         let cartType = cookie.get('_cartType') || 'ordinary';
 
 
@@ -120,6 +123,9 @@ let indexObj = {
         $('.cart-box').html(hbsTemplate(data));
         $('.cart-box').html(hbsTemplate(data));
         require('./index/cart').init(self);
         require('./index/cart').init(self);
         require('./index/good').init(self);
         require('./index/good').init(self);
+        $('.btn-edit').on('click', () => {
+            self.navBtnClick();
+        });
         lazyLoad($('img.lazy'));
         lazyLoad($('img.lazy'));
         return Promise.resolve();
         return Promise.resolve();
     }
     }

@@ -17,7 +17,7 @@ let cartObj = {
 
 
         self.handle = handle;
         self.handle = handle;
 
 
-        $('.cart-nav').on('click', 'li', function(e) {
+        $('.cart-nav').on('click', '.nav-item', function(e) {
             self.cartNavClick(e);
             self.cartNavClick(e);
         });
         });
         $('.more-box>.down-arrow').on('click', function(e) {
         $('.more-box>.down-arrow').on('click', function(e) {

@@ -8,7 +8,6 @@ var $ = require('yoho-jquery');
 var FastClick = require('yoho-fastclick');
 var FastClick = require('yoho-fastclick');
 
 
 var $nav = $('.category-nav'),
 var $nav = $('.category-nav'),
-    $search = $('#search-input'),
     $categoryContainer = $('.category-container'),
     $categoryContainer = $('.category-container'),
     $contents = $categoryContainer.children('.content'),
     $contents = $categoryContainer.children('.content'),
     $subLevelItem = $categoryContainer.find('.sub-level li');
     $subLevelItem = $categoryContainer.find('.sub-level li');
@@ -19,15 +18,12 @@ $(function() {
 });
 });
 
 
 function resetHeight() {
 function resetHeight() {
-    var h = document.body.scrollHeight - $search.outerHeight() - $nav.outerHeight();
+    var h = document.body.scrollHeight - $nav.outerHeight();
 
 
     $contents.height(h);
     $contents.height(h);
 }
 }
 resetHeight();
 resetHeight();
 
 
-$search.focus(function() {
-    $(this).blur();
-});
 $nav.on('contextmenu', function() {
 $nav.on('contextmenu', function() {
     return false;
     return false;
 });
 });

@@ -4,9 +4,7 @@ var $ = require('yoho-jquery'),
 var categoryHeight = $('.tab-box').height(),
 var categoryHeight = $('.tab-box').height(),
     gender;
     gender;
 
 
-var $intercept = $('.no-intercept'),
-    $list = $('.brand-list-box'),
-    $listBox = $('.list-box'),
+var $listBox = $('.list-box'),
     $brandContent = $('.brand-content'),
     $brandContent = $('.brand-content'),
     $tabBox = $('.tab-box'),
     $tabBox = $('.tab-box'),
     $contentIndex = $('.content-index'),
     $contentIndex = $('.content-index'),
@@ -28,6 +26,19 @@ function channels(key) {
     return channel[key];
     return channel[key];
 }
 }
 
 
+// 点击字母，页面滚动到相关区域
+function reference() {
+    $('.no-intercept').click(function() {
+        var name = $(this).attr('href').split('#')[1] === '0_9' ? '0~9' : $(this).attr('href').split('#')[1],
+            targetTop = $('.brand-list-box').find('[name="' + name + '"]').offset().top - categoryHeight;
+
+        $('html,body').animate({
+            scrollTop: targetTop
+        }, 200);
+        return false;
+    });
+}
+
 function initialize() {
 function initialize() {
     $('.banner-swiper').each(function() {
     $('.banner-swiper').each(function() {
         if (!$(this).parents('.content').hasClass('hide') && $(this).hasClass('swiper-container-horizontal') === false && $(this).find('li').length > 1) {
         if (!$(this).parents('.content').hasClass('hide') && $(this).hasClass('swiper-container-horizontal') === false && $(this).find('li').length > 1) {
@@ -65,6 +76,8 @@ function loadData(channel) {
                 $tabBox.removeClass('fastening');
                 $tabBox.removeClass('fastening');
                 $contentIndex.removeClass('distance');
                 $contentIndex.removeClass('distance');
             });
             });
+
+            reference();
         }
         }
     });
     });
 }
 }
@@ -77,16 +90,7 @@ $brandCha.find('li').click(function() {
     loadData(channels(gender));
     loadData(channels(gender));
 });
 });
 
 
-// 点击字母，页面滚动到相关区域
-$intercept.click(function() {
-    var name = $(this).attr('href').split('#')[1] === '0_9' ? '0~9' : $(this).attr('href').split('#')[1],
-        targetTop = $list.find('[name="' + name + '"]').offset().top - categoryHeight;
-
-    $('html,body').animate({
-        scrollTop: targetTop
-    }, 200);
-    return false;
-});
+reference();
 
 
 $('.brand-tab').find('li').click(function() {
 $('.brand-tab').find('li').click(function() {
 
 

@@ -48,19 +48,46 @@
         color: #c6c6c6;
         color: #c6c6c6;
         border-bottom: 1PX solid #e0e0e0;
         border-bottom: 1PX solid #e0e0e0;
         background: #fff;
         background: #fff;
+        display: none;
+
+        &.more {
+            display: flex;
+        }
 
 
-        li {
-            float: left;
-            width: 50%;
+        .nav-item {
             padding: 35px 0;
             padding: 35px 0;
             height: 35px;
             height: 35px;
             box-sizing: content-box;
             box-sizing: content-box;
+            flex: 1;
         }
         }
 
 
-        li.active {
+        .nav-item.active {
             color: #000;
             color: #000;
         }
         }
 
 
+        &.more {
+            .btn-edit {
+                position: relative;
+                margin-top: 24px;
+                margin-right: 30px;
+                top: initial;
+                right: initial;
+            }
+        }
+
+        .btn-edit {
+            display: none;
+            width: 100px;
+            height: 60px;
+            border-radius: 5PX;
+            background-color: #efefef;
+            color: #808080;
+            position: absolute;
+            top: 24px;
+            right: 30px;
+            font-size: 30px;
+        }
+
         span {
         span {
             display: block;
             display: block;
             box-sizing: border-box;
             box-sizing: border-box;
@@ -69,13 +96,14 @@
             line-height: 35px;
             line-height: 35px;
             font-size: 35px;
             font-size: 35px;
             text-align: center;
             text-align: center;
+            border-left: 1PX solid #e0e0e0;
         }
         }
 
 
-        li:first-child span {
-            border-right: 1PX solid #e0e0e0;
+        .nav-item:first-child span {
+            border: none;
         }
         }
 
 
-        li:last-child {
+        .nav-item:last-child {
             position: relative;
             position: relative;
         }
         }
 
 
@@ -130,6 +158,16 @@
     }
     }
 }
 }
 
 
+.wechat-body {
+    .cart-nav {
+        display: flex;
+
+        .btn-edit {
+            display: block;
+        }
+    }
+}
+
 .more-box {
 .more-box {
     transition: all 0.2s;
     transition: all 0.2s;
 }
 }

@@ -20,7 +20,7 @@
         text-align: center;
         text-align: center;
         z-index: 10;
         z-index: 10;
         background-color: #fff;
         background-color: #fff;
-        padding: 0 200px 84px;
+        padding: 0 222px 84px;
         border-bottom: 5px solid #e0e0e0;
         border-bottom: 5px solid #e0e0e0;
         width: 100%;
         width: 100%;
 
 

@@ -55,7 +55,6 @@ $border_color_light: #eee;
         height: 112px;
         height: 112px;
         line-height: 112px;
         line-height: 112px;
         background-color: #fff;
         background-color: #fff;
-        padding-left: 40px;
         font-size: 40px;
         font-size: 40px;
     }
     }
 
 

@@ -42,7 +42,7 @@
 
 
 .address-select-component {
 .address-select-component {
     position: fixed;
     position: fixed;
-    top: 0;
+    bottom: 0;
     left: 0;
     left: 0;
     width: 100%;
     width: 100%;
     background: rgba(0, 0, 0, 0.5);
     background: rgba(0, 0, 0, 0.5);