Authored by 毕凯

Merge branch 'release/coupon-summer-2' into develop

... ... @@ -22,7 +22,7 @@ From: [eslint-config-yoho](https://www.npmjs.com/package/eslint-config-yoho)
# 项目启动方法
- 拉取代码
- 安装全局包:`npm i -g eslint eslint-config-yoho yo generator-yohos nodemon`
- 安装全局包:`npm i -g yo generator-yohos`
- 安装本地依赖
- 启动 Web Server 服务进程:当前目录下运行`npm start`
- 进入模块的静态资源目录,运行`gulp`
... ...
... ... @@ -4,10 +4,10 @@
"private": true,
"scripts": {
"start": "node ./bin/www",
"dev": "nodemon -e js,hbs -i public/ ./bin/www",
"dev": "node_modules/.bin/nodemon -e js,hbs -i public/ ./bin/www",
"online": "NODE_ENV=\"production\" node bin/www",
"lint-js": "eslint -c .eslintrc --cache --fix `git diff --cached --name-only --diff-filter=ACM | grep .js$` app.js",
"lint-css": "stylelint --config .stylelintrc `git diff --cached --name-only --diff-filter=ACM | grep .css$`",
"lint-js": "node_modules/.bin/eslint -c .eslintrc --cache --fix `git diff --cached --name-only --diff-filter=ACM | grep .js$` app.js",
"lint-css": "node_modules/.bin/stylelint --config .stylelintrc `git diff --cached --name-only --diff-filter=ACM | grep .css$`",
"precommit": "npm run lint-js && npm run lint-css"
},
"dependencies": {
... ... @@ -33,7 +33,8 @@
"babel-plugin-transform-runtime": "^6.1.18",
"babel-preset-es2015": "^6.1.18",
"babel-runtime": "^6.1.18",
"eslint-config-yoho": "^0.1.2",
"eslint": "^2.8.0",
"eslint-config-yoho": "^0.1.6",
"gulp": "^3.9.1",
"gulp-cssnano": "^2.1.1",
"gulp-postcss": "^6.1.0",
... ... @@ -41,6 +42,7 @@
"gulp-util": "^3.0.7",
"husky": "^0.11.4",
"jquery": "^2.2.3",
"nodemon": "^1.9.1",
"postcss-assets": "^4.0.1",
"postcss-calc": "^5.2.0",
"postcss-center": "^1.0.0",
... ...