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 @@ - + 房屋征收 @@ -17,7 +16,7 @@ @@ -55,12 +67,32 @@ export default { b { color: #5d8cbc; } + // 退出老年模式 + .logout { + padding: 30px 0 10px; + span { + height: 19px; + font-size: 20px; + color: #fefefe; + background: red; + padding: 0 10px; + } + } } } -.display { - display: none; + +// 老年化 +.old_bottomContent { + font-size: 18px !important; + p { + line-height: 25px !important; + margin: 10px 0 0 !important; + } } -.padding { - padding-bottom: 0 !important; +.old_app { + padding-bottom: 100px !important; +} +.old_app2 { + padding-bottom: 190px !important; } diff --git a/FrontCode2/sunshine_levy/src/assets/rem.js b/FrontCode2/sunshine_levy/src/assets/rem.js index b72ffc9..1afc8c9 100644 --- a/FrontCode2/sunshine_levy/src/assets/rem.js +++ b/FrontCode2/sunshine_levy/src/assets/rem.js @@ -1,28 +1,26 @@ /** - * 设置根元素font-size - * 当设备宽度为375(iPhone6)时,根元素font-size=16px; - */ -(function (doc, win) { + * 设置根元素font-size + * 当设备宽度为375(iPhone6)时,根元素font-size=16px; + */ +(function(doc, win) { var docEl = win.document.documentElement; - var resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize'; - - var refreshRem = function () { - var clientWidth = win.innerWidth - || doc.documentElement.clientWidth - || doc.body.clientWidth; + var resizeEvt = + "orientationchange" in window ? "orientationchange" : "resize"; + console.log("执行了"); + var refreshRem = function() { + var clientWidth = + win.innerWidth || doc.documentElement.clientWidth || doc.body.clientWidth; // console.log(clientWidth) if (!clientWidth) return; var fz; var width = clientWidth; - fz = 16 * width / 375; // 可以根据项目需要,自行修改 - docEl.style.fontSize = fz + 'px'; //这样每一份也是16px,即1rem=16px + fz = (16 * width) / 375; // 可以根据项目需要,自行修改 + docEl.style.fontSize = fz + "px"; //这样每一份也是16px,即1rem=16px }; if (!doc.addEventListener) return; win.addEventListener(resizeEvt, refreshRem, false); - doc.addEventListener('DOMContentLoaded', refreshRem, false); + doc.addEventListener("DOMContentLoaded", refreshRem, false); refreshRem(); - -})(document, window); - +})(document, window); \ No newline at end of file diff --git a/FrontCode2/sunshine_levy/src/main.js b/FrontCode2/sunshine_levy/src/main.js index 3a27527..e289b25 100644 --- a/FrontCode2/sunshine_levy/src/main.js +++ b/FrontCode2/sunshine_levy/src/main.js @@ -2,6 +2,7 @@ // (runtime-only or standalone) has been set in webpack.base.conf with an alias. // import "./assets/reset.css"; import "lib-flexible/flexible"; +// import "@/assets/rem.js"; import "@/elementui"; import ElementUI from "element-ui"; diff --git a/FrontCode2/sunshine_levy/src/olderMode/1.js b/FrontCode2/sunshine_levy/src/olderMode/1.js new file mode 100644 index 0000000..b85175b --- /dev/null +++ b/FrontCode2/sunshine_levy/src/olderMode/1.js @@ -0,0 +1,15 @@ +import $ from "jquery"; + +export const changeStyle = function() { + $(".bottomContent").addClass("old_bottomContent"); + $("#app").addClass("old_app"); +}; + +export const changeBottomStyle = function() { + $(".bottomContent").addClass("old_bottomContent"); + $("#app").addClass("old_app2"); +}; + +export const projectSelectChangeStyle = function() { + changeBottomStyle(); +}; \ No newline at end of file diff --git a/FrontCode2/sunshine_levy/src/views/index.vue b/FrontCode2/sunshine_levy/src/views/index.vue index 3f1341f..3ac2e5c 100644 --- a/FrontCode2/sunshine_levy/src/views/index.vue +++ b/FrontCode2/sunshine_levy/src/views/index.vue @@ -1,16 +1,11 @@ diff --git a/FrontCode2/sunshine_levy/src/views/pdf/pdf.vue b/FrontCode2/sunshine_levy/src/views/pdf/pdf.vue index dcb8bb3..3e1cfd1 100644 --- a/FrontCode2/sunshine_levy/src/views/pdf/pdf.vue +++ b/FrontCode2/sunshine_levy/src/views/pdf/pdf.vue @@ -20,6 +20,8 @@ + + diff --git a/FrontCode2/sunshine_levy/src/views/report/agreement.vue b/FrontCode2/sunshine_levy/src/views/report/agreement.vue index c861530..4a2c31d 100644 --- a/FrontCode2/sunshine_levy/src/views/report/agreement.vue +++ b/FrontCode2/sunshine_levy/src/views/report/agreement.vue @@ -53,6 +53,8 @@