fe / yohobuywap-node · Commits

Go to a project

Authored by ccbikai
Commit 4ef3dd878d12e0598cdafba10870b156f6aadbf6 2 parents 8c3897ff 32d22f52

Merge branch 'feature/sale' into release/1.0

Inline Side-by-side
Showing 5 changed files with 31 additions and 20 deletions
@@ -18,6 +18,16 @@ module.exports = { @@ -18,6 +18,16 @@ module.exports = {
18 api: 'http://devapi.yoho.cn:58078/', 18 api: 'http://devapi.yoho.cn:58078/',
19 service: 'http://devservice.yoho.cn:58077/' 19 service: 'http://devservice.yoho.cn:58077/'
20 }, 20 },
  21 + subDomains: {
  22 + host: '.m.yohobuy.com',
  23 + default: '//m.yohobuy.com',
  24 + guang: '//guang.m.yohobuy.com',
  25 + list: '//list.m.yohobuy.com',
  26 + search: '//search.m.yohobuy.com',
  27 + huodong: '//huodong.m.yohobuy.com',
  28 + activity: '//activity.yohobuy.com',
  29 + index: '//m.yohobuy.com'
  30 + },
21 useOneapm: false, 31 useOneapm: false,
22 useCache: false, 32 useCache: false,
23 memcache: { 33 memcache: {
@@ -31,18 +31,18 @@ @@ -31,18 +31,18 @@
31 }, 31 },
32 "license": "MIT", 32 "license": "MIT",
33 "dependencies": { 33 "dependencies": {
34 - "bluebird": "^3.4.0",  
35 - "body-parser": "^1.15.0", 34 + "bluebird": "^3.4.1",
  35 + "body-parser": "^1.15.2",
36 "connect-memcached": "^0.2.0", 36 "connect-memcached": "^0.2.0",
37 "cookie-parser": "^1.4.3", 37 "cookie-parser": "^1.4.3",
38 - "express": "^4.13.1", 38 + "express": "^4.14.0",
39 "express-handlebars": "^3.0.0", 39 "express-handlebars": "^3.0.0",
40 - "express-session": "^1.13.0", 40 + "express-session": "^1.14.0",
41 "influxdb-winston": "^1.0.1", 41 "influxdb-winston": "^1.0.1",
42 "lodash": "^4.13.1", 42 "lodash": "^4.13.1",
43 "md5": "^2.1.0", 43 "md5": "^2.1.0",
44 "memcached": "^2.2.1", 44 "memcached": "^2.2.1",
45 - "moment": "^2.13.0", 45 + "moment": "^2.14.1",
46 "morgan": "^1.7.0", 46 "morgan": "^1.7.0",
47 "oneapm": "^1.2.20", 47 "oneapm": "^1.2.20",
48 "passport": "^0.3.2", 48 "passport": "^0.3.2",
@@ -55,15 +55,15 @@ @@ -55,15 +55,15 @@
55 "serve-favicon": "^2.3.0", 55 "serve-favicon": "^2.3.0",
56 "uuid": "^2.0.2", 56 "uuid": "^2.0.2",
57 "winston": "^2.2.0", 57 "winston": "^2.2.0",
58 - "yoho-node-lib": "0.0.11",  
59 - "winston-daily-rotate-file": "^1.1.4" 58 + "winston-daily-rotate-file": "^1.1.4",
  59 + "yoho-node-lib": "0.0.17"
60 }, 60 },
61 "devDependencies": { 61 "devDependencies": {
62 - "autoprefixer": "^6.3.6", 62 + "autoprefixer": "^6.3.7",
63 "ava": "^0.15.2", 63 "ava": "^0.15.2",
64 "babel-preset-es2015": "^6.9.0", 64 "babel-preset-es2015": "^6.9.0",
65 "babel-register": "^6.9.0", 65 "babel-register": "^6.9.0",
66 - "eslint": "^2.12.0", 66 + "eslint": "^3.0.1",
67 "eslint-config-yoho": "^1.0.1", 67 "eslint-config-yoho": "^1.0.1",
68 "gulp": "^3.9.1", 68 "gulp": "^3.9.1",
69 "gulp-cssnano": "^2.1.2", 69 "gulp-cssnano": "^2.1.2",
@@ -84,11 +84,11 @@ @@ -84,11 +84,11 @@
84 "postcss-pxtorem": "^3.3.1", 84 "postcss-pxtorem": "^3.3.1",
85 "postcss-short": "^1.4.0", 85 "postcss-short": "^1.4.0",
86 "postcss-sprites": "^3.1.2", 86 "postcss-sprites": "^3.1.2",
87 - "postcss-use": "^2.0.2", 87 + "postcss-use": "^2.2.0",
88 "precss": "^1.4.0", 88 "precss": "^1.4.0",
89 - "rewire": "^2.5.1", 89 + "rewire": "^2.5.2",
90 "shelljs": "^0.7.0", 90 "shelljs": "^0.7.0",
91 - "stylelint": "^6.6.0", 91 + "stylelint": "^6.9.0",
92 "stylelint-config-yoho": "^1.2.3", 92 "stylelint-config-yoho": "^1.2.3",
93 "webpack": "^1.13.1", 93 "webpack": "^1.13.1",
94 "webpack-dev-server": "^1.14.1", 94 "webpack-dev-server": "^1.14.1",
@@ -99,8 +99,8 @@ @@ -99,8 +99,8 @@
99 "yoho-iscroll": "^5.2.0", 99 "yoho-iscroll": "^5.2.0",
100 "yoho-jquery": "^2.2.4", 100 "yoho-jquery": "^2.2.4",
101 "yoho-jquery-lazyload": "^1.9.7", 101 "yoho-jquery-lazyload": "^1.9.7",
102 - "yoho-jquery-placeholder": "^0.0.3",  
103 "yoho-mlellipsis": "0.0.3", 102 "yoho-mlellipsis": "0.0.3",
  103 + "yoho-node-lib": "0.0.17",
104 "yoho-swiper": "^3.3.1" 104 "yoho-swiper": "^3.3.1"
105 } 105 }
106 } 106 }
@@ -50,7 +50,6 @@ $(function() { @@ -50,7 +50,6 @@ $(function() {
50 yh_channel: window.queryString.channel || 'boys', 50 yh_channel: window.queryString.channel || 'boys',
51 saleType: '2', 51 saleType: '2',
52 productPool: $vipFloor.data('id'), 52 productPool: $vipFloor.data('id'),
53 - order: '0',  
54 limit: '4' 53 limit: '4'
55 } 54 }
56 }).then(function(res) { 55 }).then(function(res) {
@@ -128,6 +128,7 @@ @@ -128,6 +128,7 @@
128 .price { 128 .price {
129 font-size: 22px; 129 font-size: 22px;
130 line-height: 22px; 130 line-height: 22px;
  131 + white-space: nowrap;
131 132
132 .sale-price { 133 .sale-price {
133 color: #d62927; 134 color: #d62927;
@@ -24,13 +24,13 @@ @@ -24,13 +24,13 @@
24 24
25 .arrow { 25 .arrow {
26 position: absolute; 26 position: absolute;
27 - top: -10px; 27 + top: -16px;
28 right: 30px; 28 right: 30px;
29 - width: 20px;  
30 - height: 20px;  
31 - background: #000;  
32 - content: "";  
33 - transform: rotate(45deg); 29 + width: 0;
  30 + height: 0;
  31 + border-style: solid;
  32 + border-width: 0 10px 16px;
  33 + border-color: transparent transparent #000;
34 } 34 }
35 35
36 &.show { 36 &.show {
@@ -69,6 +69,7 @@ @@ -69,6 +69,7 @@
69 69
70 .category-swiper { 70 .category-swiper {
71 height: auto; 71 height: auto;
  72 + max-height: 320px;
72 } 73 }
73 74
74 .vip-floor { 75 .vip-floor {