Authored by ccbikai

Merge branch 'develop' into release/1.0

... ... @@ -45,10 +45,10 @@
},
"devDependencies": {
"autoprefixer": "^6.4.0",
"babel-core": "^6.13.0",
"babel-core": "^6.13.2",
"babel-loader": "^6.2.4",
"babel-plugin-transform-runtime": "^6.12.0",
"babel-preset-es2015": "^6.13.0",
"babel-preset-es2015": "^6.13.2",
"babel-runtime": "^6.11.6",
"eslint": "^3.2.2",
"eslint-config-yoho": "^1.0.1",
... ... @@ -79,7 +79,7 @@
"shelljs": "^0.7.3",
"style-loader": "^0.13.1",
"stylelint": "^7.1.0",
"stylelint-config-yoho": "^1.2.6",
"stylelint-config-yoho": "^1.2.7",
"stylelint-processor-html": "^1.0.0",
"vue": "1.0.26",
"vue-infinite-scroll": "0.2.3",
... ...
... ... @@ -273,9 +273,6 @@ const intercept = (url) => {
// 首页
if (/\/$/.test(path)) {
yoho.goSetChannel({
channel: qs.channel || 'men'
});
return yoho.goTab({
index: 0
});
... ...