Authored by ccbikai

Merge branch 'feature/sale' into release/1.0

... ... @@ -18,6 +18,16 @@ module.exports = {
api: 'http://devapi.yoho.cn:58078/',
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,
useCache: false,
memcache: {
... ...
... ... @@ -31,18 +31,18 @@
},
"license": "MIT",
"dependencies": {
"bluebird": "^3.4.0",
"body-parser": "^1.15.0",
"bluebird": "^3.4.1",
"body-parser": "^1.15.2",
"connect-memcached": "^0.2.0",
"cookie-parser": "^1.4.3",
"express": "^4.13.1",
"express": "^4.14.0",
"express-handlebars": "^3.0.0",
"express-session": "^1.13.0",
"express-session": "^1.14.0",
"influxdb-winston": "^1.0.1",
"lodash": "^4.13.1",
"md5": "^2.1.0",
"memcached": "^2.2.1",
"moment": "^2.13.0",
"moment": "^2.14.1",
"morgan": "^1.7.0",
"oneapm": "^1.2.20",
"passport": "^0.3.2",
... ... @@ -55,15 +55,15 @@
"serve-favicon": "^2.3.0",
"uuid": "^2.0.2",
"winston": "^2.2.0",
"yoho-node-lib": "0.0.11",
"winston-daily-rotate-file": "^1.1.4"
"winston-daily-rotate-file": "^1.1.4",
"yoho-node-lib": "0.0.17"
},
"devDependencies": {
"autoprefixer": "^6.3.6",
"autoprefixer": "^6.3.7",
"ava": "^0.15.2",
"babel-preset-es2015": "^6.9.0",
"babel-register": "^6.9.0",
"eslint": "^2.12.0",
"eslint": "^3.0.1",
"eslint-config-yoho": "^1.0.1",
"gulp": "^3.9.1",
"gulp-cssnano": "^2.1.2",
... ... @@ -84,11 +84,11 @@
"postcss-pxtorem": "^3.3.1",
"postcss-short": "^1.4.0",
"postcss-sprites": "^3.1.2",
"postcss-use": "^2.0.2",
"postcss-use": "^2.2.0",
"precss": "^1.4.0",
"rewire": "^2.5.1",
"rewire": "^2.5.2",
"shelljs": "^0.7.0",
"stylelint": "^6.6.0",
"stylelint": "^6.9.0",
"stylelint-config-yoho": "^1.2.3",
"webpack": "^1.13.1",
"webpack-dev-server": "^1.14.1",
... ... @@ -99,8 +99,8 @@
"yoho-iscroll": "^5.2.0",
"yoho-jquery": "^2.2.4",
"yoho-jquery-lazyload": "^1.9.7",
"yoho-jquery-placeholder": "^0.0.3",
"yoho-mlellipsis": "0.0.3",
"yoho-node-lib": "0.0.17",
"yoho-swiper": "^3.3.1"
}
}
... ...
... ... @@ -50,7 +50,6 @@ $(function() {
yh_channel: window.queryString.channel || 'boys',
saleType: '2',
productPool: $vipFloor.data('id'),
order: '0',
limit: '4'
}
}).then(function(res) {
... ...
... ... @@ -128,6 +128,7 @@
.price {
font-size: 22px;
line-height: 22px;
white-space: nowrap;
.sale-price {
color: #d62927;
... ...
... ... @@ -24,13 +24,13 @@
.arrow {
position: absolute;
top: -10px;
top: -16px;
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 {
... ... @@ -69,6 +69,7 @@
.category-swiper {
height: auto;
max-height: 320px;
}
.vip-floor {
... ...