Merge branch 'feature/十月迭代' of http://git.gicdev.com/office/haoban-3 into feature/十月迭代

.eslintrc.js

@@ -31,9 +31,9 @@ module.exports = {
     ],
     // allow async-await
     "generator-star-spacing": "off",
-    "no-console": process.env.NODE_ENV === "production" ? 2 : 0,
-    "no-alert": process.env.NODE_ENV === "production" ? 2 : 0, //禁止使用alert confirm prompt
-    "no-debugger": process.env.NODE_ENV === "production" ? 2 : 0,
+    // "no-console": process.env.NODE_ENV === "production" ? 2 : 0,
+    // "no-alert": process.env.NODE_ENV === "production" ? 2 : 0, //禁止使用alert confirm prompt
+    // "no-debugger": process.env.NODE_ENV === "production" ? 2 : 0,
     // --------------------静态检测-----------------------------
     /**
      * 静态检测：

build/webpack.dev.conf.js

@@ -55,8 +55,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     new HtmlWebpackPlugin({
       filename: 'index.html',
       template: 'index.html',
-      inject: true,
-      favicon: './favicon.ico'
+      inject: true
     }),
     // copy custom static assets
     new CopyWebpackPlugin([

build/webpack.prod.conf.js

@@ -63,6 +63,7 @@ const webpackConfig = merge(baseWebpackConfig, {
     new HtmlWebpackPlugin({
       filename: config.build.index,
       template: 'index.html',
+      favicon: './favicon.ico',
       inject: true,
       minify: {
         removeComments: true,