diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 070ae22..9a6e3e4 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -1,3 +1,10 @@ +/* + * @Author: zwq + * @Date: 2021-10-11 16:38:28 + * @LastEditors: zwq + * @LastEditTime: 2021-10-29 09:11:29 + * @Description: + */ 'use strict' const utils = require('./utils') const webpack = require('webpack') @@ -54,6 +61,7 @@ const devWebpackConfig = merge(baseWebpackConfig, { // https://github.com/ampedandwired/html-webpack-plugin new HtmlWebpackPlugin({ filename: 'index.html', + favicon: path.resolve('./src/assets/logo.png'), template: 'index.html', inject: true }), diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index d9f99f6..af58907 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -46,7 +46,7 @@ const webpackConfig = merge(baseWebpackConfig, { filename: utils.assetsPath('css/[name].[contenthash].css'), // Setting the following option to `false` will not extract CSS from codesplit chunks. // Their CSS will instead be inserted dynamically with style-loader when the codesplit chunk has been loaded by webpack. - // It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`, + // It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`, // increasing file size: https://github.com/vuejs-templates/webpack/issues/1110 allChunks: true, }), @@ -63,6 +63,7 @@ const webpackConfig = merge(baseWebpackConfig, { new HtmlWebpackPlugin({ filename: config.build.index, template: 'index.html', + favicon: path.resolve('./src/assets/logo.png'), inject: true, minify: { removeComments: true, diff --git a/index.html b/index.html index 80c6c92..bfd2f9f 100644 --- a/index.html +++ b/index.html @@ -1,9 +1,17 @@ + - mt-yj-wms-ui + 云洁科技 +
diff --git a/src/assets/logo.png b/src/assets/logo.png index f3d2503..afe8b61 100644 Binary files a/src/assets/logo.png and b/src/assets/logo.png differ diff --git a/src/assets/yj.svg b/src/assets/yj.svg new file mode 100644 index 0000000..27d5739 --- /dev/null +++ b/src/assets/yj.svg @@ -0,0 +1 @@ +资源 15 \ No newline at end of file diff --git a/src/components/main.vue b/src/components/main.vue index 6461514..80f9a04 100644 --- a/src/components/main.vue +++ b/src/components/main.vue @@ -2,14 +2,14 @@ * @Author: zwq * @Date: 2021-10-12 13:49:08 * @LastEditors: zwq - * @LastEditTime: 2021-10-26 14:38:01 + * @LastEditTime: 2021-10-29 09:41:21 * @Description: -->