Merge branch 'feature/sale' into release/4.8

@@ -2,7 +2,9 @@
 
 
     {{#content}}
     {{#content}}
         {{! 头部banner}}
         {{! 头部banner}}
-        {{> resources/banner-top}}
+        {{#if focus}}
+            {{> resources/banner-top}}
+        {{/if}}
     {{/content}}
     {{/content}}
 
 
     {{# nav}}
     {{# nav}}

@@ -18,6 +18,16 @@ module.exports = {
         api: 'http://devapi.yoho.cn:58078/',
         api: 'http://devapi.yoho.cn:58078/',
         service: 'http://devservice.yoho.cn:58077/'
         service: 'http://devservice.yoho.cn:58077/'
     },
     },
+    subDomains: {
+        host: '.m.yohobuy.com',
+        default: '//m.yohobuy.com',
+        guang: '//guang.m.yohobuy.com',
+        list: '//list.m.yohobuy.com',
+        search: '//search.m.yohobuy.com',
+        huodong: '//huodong.m.yohobuy.com',
+        activity: '//activity.yohobuy.com',
+        index: '//m.yohobuy.com'
+    },
     useOneapm: false,
     useOneapm: false,
     useCache: false,
     useCache: false,
     memcache: {
     memcache: {

-<div class="left-right-thumb-row">
+<div class="left-right-thumb-row clearfix">
 {{# data}}
 {{# data}}
-    {{# left}}
-        <a href="{{url}}">
-            <div class="thumb-row-box left-thumb-row-box" style="background-image:url({{image src 275 160}})"></div>
-        </a>
-    {{/ left}}
+    <div class="left-container">
+        {{# left}}
+            <a href="{{url}}">
+                <div class="thumb-row-box left-thumb-row-box" style="background-image:url({{image src 275 160}})"></div>
+            </a>
+        {{/ left}}
+    </div>
     <div class="right-container">
     <div class="right-container">
         {{# right}}
         {{# right}}
             <a href="{{url}}">
             <a href="{{url}}">

@@ -31,18 +31,18 @@
   },
   },
   "license": "MIT",
   "license": "MIT",
   "dependencies": {
   "dependencies": {
-    "bluebird": "^3.4.0",
-    "body-parser": "^1.15.0",
+    "bluebird": "^3.4.1",
+    "body-parser": "^1.15.2",
     "connect-memcached": "^0.2.0",
     "connect-memcached": "^0.2.0",
     "cookie-parser": "^1.4.3",
     "cookie-parser": "^1.4.3",
-    "express": "^4.13.1",
+    "express": "^4.14.0",
     "express-handlebars": "^3.0.0",
     "express-handlebars": "^3.0.0",
-    "express-session": "^1.13.0",
+    "express-session": "^1.14.0",
     "influxdb-winston": "^1.0.1",
     "influxdb-winston": "^1.0.1",
     "lodash": "^4.13.1",
     "lodash": "^4.13.1",
     "md5": "^2.1.0",
     "md5": "^2.1.0",
     "memcached": "^2.2.1",
     "memcached": "^2.2.1",
-    "moment": "^2.13.0",
+    "moment": "^2.14.1",
     "morgan": "^1.7.0",
     "morgan": "^1.7.0",
     "oneapm": "^1.2.20",
     "oneapm": "^1.2.20",
     "passport": "^0.3.2",
     "passport": "^0.3.2",
@@ -56,14 +56,14 @@
     "uuid": "^2.0.2",
     "uuid": "^2.0.2",
     "winston": "^2.2.0",
     "winston": "^2.2.0",
     "winston-daily-rotate-file": "^1.1.4",
     "winston-daily-rotate-file": "^1.1.4",
-    "yoho-node-lib": "0.0.11"
+    "yoho-node-lib": "0.0.17"
   },
   },
   "devDependencies": {
   "devDependencies": {
-    "autoprefixer": "^6.3.6",
+    "autoprefixer": "^6.3.7",
     "ava": "^0.15.2",
     "ava": "^0.15.2",
     "babel-preset-es2015": "^6.9.0",
     "babel-preset-es2015": "^6.9.0",
     "babel-register": "^6.9.0",
     "babel-register": "^6.9.0",
-    "eslint": "^2.12.0",
+    "eslint": "^3.0.1",
     "eslint-config-yoho": "^1.0.1",
     "eslint-config-yoho": "^1.0.1",
     "gulp": "^3.9.1",
     "gulp": "^3.9.1",
     "gulp-cssnano": "^2.1.2",
     "gulp-cssnano": "^2.1.2",
@@ -84,11 +84,11 @@
     "postcss-pxtorem": "^3.3.1",
     "postcss-pxtorem": "^3.3.1",
     "postcss-short": "^1.4.0",
     "postcss-short": "^1.4.0",
     "postcss-sprites": "^3.1.2",
     "postcss-sprites": "^3.1.2",
-    "postcss-use": "^2.0.2",
+    "postcss-use": "^2.2.0",
     "precss": "^1.4.0",
     "precss": "^1.4.0",
-    "rewire": "^2.5.1",
+    "rewire": "^2.5.2",
     "shelljs": "^0.7.0",
     "shelljs": "^0.7.0",
-    "stylelint": "^6.6.0",
+    "stylelint": "^6.9.0",
     "stylelint-config-yoho": "^1.2.3",
     "stylelint-config-yoho": "^1.2.3",
     "webpack": "^1.13.1",
     "webpack": "^1.13.1",
     "webpack-dev-server": "^1.14.1",
     "webpack-dev-server": "^1.14.1",
@@ -99,7 +99,6 @@
     "yoho-iscroll": "^5.2.0",
     "yoho-iscroll": "^5.2.0",
     "yoho-jquery": "^2.2.4",
     "yoho-jquery": "^2.2.4",
     "yoho-jquery-lazyload": "^1.9.7",
     "yoho-jquery-lazyload": "^1.9.7",
-    "yoho-jquery-placeholder": "^0.0.3",
     "yoho-mlellipsis": "0.0.3",
     "yoho-mlellipsis": "0.0.3",
     "yoho-swiper": "^3.3.1"
     "yoho-swiper": "^3.3.1"
   }
   }

@@ -53,7 +53,6 @@ $(function() {
             yh_channel: window.queryString.channel || 'boys',
             yh_channel: window.queryString.channel || 'boys',
             saleType: '2',
             saleType: '2',
             productPool: $vipFloor.data('id'),
             productPool: $vipFloor.data('id'),
-            order: '0',
             limit: '4'
             limit: '4'
         }
         }
     }).then(function(res) {
     }).then(function(res) {
@@ -67,6 +66,8 @@ $(function() {
 
 
                 $title[0].mlellipsis(2);
                 $title[0].mlellipsis(2);
             });
             });
+
+            $vipFloor.css('padding-bottom', '0.75rem');
         }
         }
     });
     });
 
 

@@ -2,8 +2,9 @@
     background-color: #fff;
     background-color: #fff;
     text-align: center;
     text-align: center;
     margin-bottom: 30px;
     margin-bottom: 30px;
-    padding: 30px 0;
+    padding: 30px 28px;
     border-bottom: 1px solid #e0e0e0;
     border-bottom: 1px solid #e0e0e0;
+    font-size: 0;
 
 
     .thumb-row-box {
     .thumb-row-box {
         display: inline-block;
         display: inline-block;
@@ -13,7 +14,7 @@
         background-size: 100% 100%;
         background-size: 100% 100%;
         background-repeat: no-repeat;
         background-repeat: no-repeat;
         background-position: center;
         background-position: center;
-        margin: 0 14.4px;
+        margin: 0;
 
 
         &.first {
         &.first {
             margin: 0 !important;
             margin: 0 !important;
@@ -24,15 +25,19 @@
         height: 308px;
         height: 308px;
     }
     }
 
 
+    .left-container {
+        float: left;
+    }
+
     .right-container {
     .right-container {
-        display: inline-block;
+        float: right;
         width: 275px;
         width: 275px;
         height: 280px;
         height: 280px;
         border-radius: 4px;
         border-radius: 4px;
-        margin: 0 14.4px;
+        margin: 0;
 
 
         .right-thumb-row-box {
         .right-thumb-row-box {
-            margin: 32px 0 0;
+            margin: 44px 0 0;
         }
         }
     }
     }
 }
 }

@@ -128,6 +128,7 @@
     .price {
     .price {
         font-size: 22px;
         font-size: 22px;
         line-height: 22px;
         line-height: 22px;
+        white-space: nowrap;
 
 
         .sale-price {
         .sale-price {
             color: #d62927;
             color: #d62927;

@@ -5,12 +5,11 @@
 @import "layout/swiper";
 @import "layout/swiper";
 @import "layout/header";
 @import "layout/header";
 @import "layout/footer";
 @import "layout/footer";
+@import "common/index";
 @import "channel/index";
 @import "channel/index";
 @import "product/index";
 @import "product/index";
-@import "common/index";
-@import "outlet/index";
 @import "activity/index";
 @import "activity/index";
+
 /* @import "passport/index"; */
 /* @import "passport/index"; */
 @import "guang/index";
 @import "guang/index";
-
 @import "cart/chose-panel";
 @import "cart/chose-panel";

 @import "sale/index";
 @import "sale/index";
 @import "detail/index";
 @import "detail/index";
+@import "outlet/index";

@@ -88,6 +88,6 @@
         position: relative;
         position: relative;
         padding-top: 8px;
         padding-top: 8px;
         padding-left: 15px;
         padding-left: 15px;
-        min-height: 880px;
+        min-height: 640px;
     }
     }
 }
 }

@@ -24,13 +24,13 @@
 
 
         .arrow {
         .arrow {
             position: absolute;
             position: absolute;
-            top: -10px;
+            top: -16px;
             right: 30px;
             right: 30px;
-            width: 20px;
-            height: 20px;
-            background: #000;
-            content: "";
-            transform: rotate(45deg);
+            width: 0;
+            height: 0;
+            border-style: solid;
+            border-width: 0 10px 16px;
+            border-color: transparent transparent #000;
         }
         }
 
 
         &.show {
         &.show {
@@ -69,14 +69,16 @@
 
 
     .category-swiper {
     .category-swiper {
         height: auto;
         height: auto;
+        max-height: 320px;
     }
     }
 
 
     .vip-floor {
     .vip-floor {
-        padding-bottom: 30px;
         border-bottom: 1px solid #e0e0e0;
         border-bottom: 1px solid #e0e0e0;
 
 
         .good-info {
         .good-info {
             margin-bottom: 20px;
             margin-bottom: 20px;
+            height: auto;
+            min-height: 506px;
         }
         }
     }
     }