Merge branch 'feature/sale' into release/4.8

@@ -9,7 +9,7 @@
         <ul id="list-nav" class="list-nav clearfix">
         <ul id="list-nav" class="list-nav clearfix">
 
 
             {{# sortData}}
             {{# sortData}}
-                <li {{#if @first}} class="active" {{/if}} data-id="{{sortId}}" data-allSub="{{allSub}}">
+                <li data-id="{{sortId}}" data-allSub="{{allSub}}">
                     <a href="javascript:void(0);">
                     <a href="javascript:void(0);">
                         <span class="span-test">{{sortName}}</span>
                         <span class="span-test">{{sortName}}</span>
                     </a>
                     </a>
@@ -35,7 +35,7 @@
                 </div>
                 </div>
             </div>
             </div>
             {{/ sub}}
             {{/ sub}}
-        </div>        
+        </div>
     {{/ nav}}
     {{/ nav}}
 
 
     <div id="goods-container" class="goods-container">
     <div id="goods-container" class="goods-container">

@@ -16,7 +16,7 @@ module.exports = {
     siteUrl: '//m.yohobuy.com',
     siteUrl: '//m.yohobuy.com',
     domains: {
     domains: {
         api: 'http://devapi.yoho.cn:58078/',
         api: 'http://devapi.yoho.cn:58078/',
-        service: 'http://devservice.yoho.cn:28077/'
+        service: 'http://devservice.yoho.cn:58077/'
     },
     },
     useOneapm: false,
     useOneapm: false,
     useCache: false,
     useCache: false,

@@ -30,6 +30,7 @@
 </header>
 </header>
 {{#if saleNav.list}}
 {{#if saleNav.list}}
 <div class="sale-nav-select">
 <div class="sale-nav-select">
+    <span class="arrow"></span>
     {{#each saleNav.list}}
     {{#each saleNav.list}}
     <a href="{{url}}">{{title}}</a>
     <a href="{{url}}">{{title}}</a>
     {{/each}}
     {{/each}}

@@ -515,13 +515,25 @@ $(window).scroll(function() {
 });
 });
 
 
 // 初始请求最新第一页数据
 // 初始请求最新第一页数据
-search([{
-    type: 'breakSort',
-    id: $('.coat').data('id')
-}, {
-    type: 'breakSize',
-    id: $('.coat').data('allsub')
-}]);
+$(function() {
+    var type = window.queryString.type;
+    var selector;
+
+    // type 1: 上装， 3:下装, 6: 鞋装
+    if (type && type !== '1') {
+        selector = type === '3' ? '.trouser' : '.shoes';
+    } else {
+        selector = '.coat';
+    }
+    $('#list-nav').find(selector).addClass('active').siblings().removeClass('active');
+    search([{
+        type: 'breakSort',
+        id: $(selector).data('id')
+    }, {
+        type: 'breakSize',
+        id: $(selector).data('allsub')
+    }]);
+});
 
 
 $listNav.on('touchstart', 'li', function() {
 $listNav.on('touchstart', 'li', function() {
     $(this).addClass('bytouch');
     $(this).addClass('bytouch');

@@ -20,11 +20,9 @@
         text-align: center;
         text-align: center;
         font-size: 28px;
         font-size: 28px;
         line-height: 80px;
         line-height: 80px;
-        transform: scale(1, 0);
-        transform-origin: top;
-        transition: all 300ms;
+        display: none;
 
 
-        &:before {
+        .arrow {
             position: absolute;
             position: absolute;
             top: -10px;
             top: -10px;
             right: 30px;
             right: 30px;
@@ -36,7 +34,7 @@
         }
         }
 
 
         &.show {
         &.show {
-            transform: scale(1, 1);
+            display: block;
         }
         }
 
 
         a {
         a {
@@ -56,8 +54,12 @@
     background-color: #f0f0f0;
     background-color: #f0f0f0;
 
 
     .thumb-row {
     .thumb-row {
-        padding-top: 10px;
+        padding-top: 25px;
         padding-bottom: 0;
         padding-bottom: 0;
+
+        .thumb-row-box {
+            margin-top: 10px;
+        }
     }
     }
 
 
     .list-nav,
     .list-nav,
@@ -71,14 +73,11 @@
 
 
     .vip-floor {
     .vip-floor {
         padding-bottom: 30px;
         padding-bottom: 30px;
+        border-bottom: 1px solid #e0e0e0;
 
 
         .good-info {
         .good-info {
             margin-bottom: 20px;
             margin-bottom: 20px;
         }
         }
-
-        .tag-container {
-            display: none;
-        }
     }
     }
 
 
     .list-nav {
     .list-nav {