diff --git a/FrontCode2/sunshine_levy/build/utils.js b/FrontCode2/sunshine_levy/build/utils.js index 540c5ec..c99fe8d 100644 --- a/FrontCode2/sunshine_levy/build/utils.js +++ b/FrontCode2/sunshine_levy/build/utils.js @@ -1,53 +1,56 @@ -'use strict' -const path = require('path') -const config = require('../config') -const ExtractTextPlugin = require('extract-text-webpack-plugin') -const packageConfig = require('../package.json') +"use strict"; +const path = require("path"); +const config = require("../config"); +const ExtractTextPlugin = require("extract-text-webpack-plugin"); +const packageConfig = require("../package.json"); -exports.assetsPath = function (_path) { - const assetsSubDirectory = process.env.NODE_ENV === 'production' - ? config.build.assetsSubDirectory - : config.dev.assetsSubDirectory +exports.assetsPath = function(_path) { + const assetsSubDirectory = + process.env.NODE_ENV === "production" ? + config.build.assetsSubDirectory : + config.dev.assetsSubDirectory; - return path.posix.join(assetsSubDirectory, _path) -} + return path.posix.join(assetsSubDirectory, _path); +}; -exports.cssLoaders = function (options) { - options = options || {} +exports.cssLoaders = function(options) { + options = options || {}; const cssLoader = { - loader: 'css-loader', + loader: "css-loader", options: { - minimize: process.env.NODE_ENV === 'production', + minimize: process.env.NODE_ENV === "production", sourceMap: options.sourceMap } - } + }; const px2remLoader = { - loader: 'px2rem-loader', + loader: "px2rem-loader", options: { - //一般设置75 - remUnit: 35 + //设计稿的宽度的1/10 + remUnit: 37 } - } + }; const postcssLoader = { - loader: 'postcss-loader', + loader: "postcss-loader", options: { sourceMap: options.sourceMap } - } + }; // generate loader string to be used with extract text plugin function generateLoaders(loader, loaderOptions) { - const loaders = options.usePostCSS ? [cssLoader, postcssLoader, px2remLoader] : [cssLoader, px2remLoader] + const loaders = options.usePostCSS ? + [cssLoader, postcssLoader, px2remLoader] : + [cssLoader, px2remLoader]; if (loader) { loaders.push({ - loader: loader + '-loader', + loader: loader + "-loader", options: Object.assign({}, loaderOptions, { sourceMap: options.sourceMap }) - }) + }); } // Extract CSS when that option is specified @@ -55,11 +58,11 @@ exports.cssLoaders = function (options) { if (options.extract) { return ExtractTextPlugin.extract({ use: loaders, - fallback: 'vue-style-loader', - publicPath:'../../', - }) + fallback: "vue-style-loader", + publicPath: "../../" + }); } else { - return ['vue-style-loader'].concat(loaders) + return ["vue-style-loader"].concat(loaders); } } @@ -67,44 +70,44 @@ exports.cssLoaders = function (options) { return { css: generateLoaders(), postcss: generateLoaders(), - less: generateLoaders('less'), - sass: generateLoaders('sass', { indentedSyntax: true }), - scss: generateLoaders('sass'), - stylus: generateLoaders('stylus'), - styl: generateLoaders('stylus') - } -} + less: generateLoaders("less"), + sass: generateLoaders("sass", { indentedSyntax: true }), + scss: generateLoaders("sass"), + stylus: generateLoaders("stylus"), + styl: generateLoaders("stylus") + }; +}; // Generate loaders for standalone style files (outside of .vue) -exports.styleLoaders = function (options) { - const output = [] - const loaders = exports.cssLoaders(options) +exports.styleLoaders = function(options) { + const output = []; + const loaders = exports.cssLoaders(options); for (const extension in loaders) { - const loader = loaders[extension] + const loader = loaders[extension]; output.push({ - test: new RegExp('\\.' + extension + '$'), + test: new RegExp("\\." + extension + "$"), use: loader - }) + }); } - return output -} + return output; +}; exports.createNotifierCallback = () => { - const notifier = require('node-notifier') + const notifier = require("node-notifier"); return (severity, errors) => { - if (severity !== 'error') return + if (severity !== "error") return; - const error = errors[0] - const filename = error.file && error.file.split('!').pop() + const error = errors[0]; + const filename = error.file && error.file.split("!").pop(); notifier.notify({ title: packageConfig.name, - message: severity + ': ' + error.name, - subtitle: filename || '', - icon: path.join(__dirname, 'logo.png') - }) - } -} + message: severity + ": " + error.name, + subtitle: filename || "", + icon: path.join(__dirname, "logo.png") + }); + }; +}; \ No newline at end of file diff --git a/FrontCode2/sunshine_levy/index.html b/FrontCode2/sunshine_levy/index.html index ea7ea3b..7a41c59 100644 --- a/FrontCode2/sunshine_levy/index.html +++ b/FrontCode2/sunshine_levy/index.html @@ -3,8 +3,7 @@
- +
@@ -55,7 +50,9 @@
+