From 1bd5e162f5e9b7deba14eb91ed9178a70cbf3eca Mon Sep 17 00:00:00 2001
From: liuqimichale <123456lq>
Date: Tue, 4 Dec 2018 10:05:55 +0800
Subject: [PATCH] rem
---
build/utils.js | 8 +++++++-
index.html | 4 +++-
package-lock.json | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------
package.json | 2 ++
src/components/inout.vue | 3 ++-
src/main.js | 1 +
6 files changed, 153 insertions(+), 47 deletions(-)
diff --git a/build/utils.js b/build/utils.js
index e534fb0..a9d5791 100644
--- a/build/utils.js
+++ b/build/utils.js
@@ -29,9 +29,15 @@ exports.cssLoaders = function (options) {
}
}
+ const px2remLoader = {
+ loader: 'px2rem-loader',
+ options: {
+ remUnit: 37.5
+ }
+ }
// generate loader string to be used with extract text plugin
function generateLoaders (loader, loaderOptions) {
- const loaders = options.usePostCSS ? [cssLoader, postcssLoader] : [cssLoader]
+ const loaders = options.usePostCSS ? [cssLoader, px2remLoader, postcssLoader] : [cssLoader, px2remLoader]
if (loader) {
loaders.push({
diff --git a/index.html b/index.html
index c3cb3fc..62f7b1f 100644
--- a/index.html
+++ b/index.html
@@ -2,8 +2,10 @@
+
+
- parkpay
+ 停车场进出场
diff --git a/package-lock.json b/package-lock.json
index 411bda6..947a0fb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -492,8 +492,7 @@
"atob": {
"version": "2.1.2",
"resolved": "http://registry.npm.taobao.org/atob/download/atob-2.1.2.tgz",
- "integrity": "sha1-bZUX654DDSQ2ZmZR6GvZ9vE1M8k=",
- "dev": true
+ "integrity": "sha1-bZUX654DDSQ2ZmZR6GvZ9vE1M8k="
},
"autoprefixer": {
"version": "7.2.6",
@@ -1388,8 +1387,7 @@
"balanced-match": {
"version": "1.0.0",
"resolved": "http://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.0.tgz",
- "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
- "dev": true
+ "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
},
"base": {
"version": "0.11.2",
@@ -1487,8 +1485,7 @@
"big.js": {
"version": "3.2.0",
"resolved": "http://registry.npm.taobao.org/big.js/download/big.js-3.2.0.tgz",
- "integrity": "sha1-pfwpi4G54Nyi5FiCR4S2XFK6WI4=",
- "dev": true
+ "integrity": "sha1-pfwpi4G54Nyi5FiCR4S2XFK6WI4="
},
"binary-extensions": {
"version": "1.12.0",
@@ -1584,7 +1581,6 @@
"version": "1.1.11",
"resolved": "http://registry.npm.taobao.org/brace-expansion/download/brace-expansion-1.1.11.tgz",
"integrity": "sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0=",
- "dev": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -2244,8 +2240,7 @@
"concat-map": {
"version": "0.0.1",
"resolved": "http://registry.npm.taobao.org/concat-map/download/concat-map-0.0.1.tgz",
- "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
- "dev": true
+ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
},
"concat-stream": {
"version": "1.6.2",
@@ -2489,6 +2484,17 @@
"randomfill": "^1.0.3"
}
},
+ "css": {
+ "version": "2.2.4",
+ "resolved": "http://registry.npm.taobao.org/css/download/css-2.2.4.tgz",
+ "integrity": "sha1-xkZ1XHOXHyu6amAeLPL9cbEpiSk=",
+ "requires": {
+ "inherits": "^2.0.3",
+ "source-map": "^0.6.1",
+ "source-map-resolve": "^0.5.2",
+ "urix": "^0.1.0"
+ }
+ },
"css-color-names": {
"version": "0.0.4",
"resolved": "http://registry.npm.taobao.org/css-color-names/download/css-color-names-0.0.4.tgz",
@@ -2840,8 +2846,7 @@
"decode-uri-component": {
"version": "0.2.0",
"resolved": "http://registry.npm.taobao.org/decode-uri-component/download/decode-uri-component-0.2.0.tgz",
- "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
- "dev": true
+ "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
},
"deep-equal": {
"version": "1.0.1",
@@ -3180,8 +3185,7 @@
"emojis-list": {
"version": "2.1.0",
"resolved": "http://registry.npm.taobao.org/emojis-list/download/emojis-list-2.1.0.tgz",
- "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
- "dev": true
+ "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
},
"encodeurl": {
"version": "1.0.2",
@@ -3347,8 +3351,7 @@
"escape-string-regexp": {
"version": "1.0.5",
"resolved": "http://registry.npm.taobao.org/escape-string-regexp/download/escape-string-regexp-1.0.5.tgz",
- "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
- "dev": true
+ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ="
},
"escope": {
"version": "3.6.0",
@@ -3898,8 +3901,7 @@
"extend": {
"version": "3.0.2",
"resolved": "http://registry.npm.taobao.org/extend/download/extend-3.0.2.tgz",
- "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=",
- "dev": true
+ "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo="
},
"extend-shallow": {
"version": "3.0.2",
@@ -4343,6 +4345,26 @@
"readable-stream": "^2.0.0"
}
},
+ "fs-extra": {
+ "version": "0.16.5",
+ "resolved": "http://registry.npm.taobao.org/fs-extra/download/fs-extra-0.16.5.tgz",
+ "integrity": "sha1-GtZh+myGyWCM0bSe/G/Og0k5p1A=",
+ "requires": {
+ "graceful-fs": "^3.0.5",
+ "jsonfile": "^2.0.0",
+ "rimraf": "^2.2.8"
+ },
+ "dependencies": {
+ "graceful-fs": {
+ "version": "3.0.11",
+ "resolved": "http://registry.npm.taobao.org/graceful-fs/download/graceful-fs-3.0.11.tgz",
+ "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=",
+ "requires": {
+ "natives": "^1.1.0"
+ }
+ }
+ }
+ },
"fs-write-stream-atomic": {
"version": "1.0.10",
"resolved": "http://registry.npm.taobao.org/fs-write-stream-atomic/download/fs-write-stream-atomic-1.0.10.tgz",
@@ -4358,8 +4380,7 @@
"fs.realpath": {
"version": "1.0.0",
"resolved": "http://registry.npm.taobao.org/fs.realpath/download/fs.realpath-1.0.0.tgz",
- "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
- "dev": true
+ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8="
},
"fsevents": {
"version": "1.2.4",
@@ -4998,7 +5019,6 @@
"version": "7.1.3",
"resolved": "http://registry.npm.taobao.org/glob/download/glob-7.1.3.tgz",
"integrity": "sha1-OWCDLT8VdBCDQtr9OmezMsCWnfE=",
- "dev": true,
"requires": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
@@ -5099,8 +5119,7 @@
"graceful-fs": {
"version": "4.1.15",
"resolved": "http://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.1.15.tgz",
- "integrity": "sha1-/7cD4QZuig7qpMi4C6klPu77+wA=",
- "dev": true
+ "integrity": "sha1-/7cD4QZuig7qpMi4C6klPu77+wA="
},
"growly": {
"version": "1.3.0",
@@ -5687,7 +5706,6 @@
"version": "1.0.6",
"resolved": "http://registry.npm.taobao.org/inflight/download/inflight-1.0.6.tgz",
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
- "dev": true,
"requires": {
"once": "^1.3.0",
"wrappy": "1"
@@ -5696,8 +5714,7 @@
"inherits": {
"version": "2.0.3",
"resolved": "http://registry.npm.taobao.org/inherits/download/inherits-2.0.3.tgz",
- "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
- "dev": true
+ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
},
"inquirer": {
"version": "3.3.0",
@@ -6153,8 +6170,15 @@
"json5": {
"version": "0.5.1",
"resolved": "http://registry.npm.taobao.org/json5/download/json5-0.5.1.tgz",
- "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
- "dev": true
+ "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
+ },
+ "jsonfile": {
+ "version": "2.4.0",
+ "resolved": "http://registry.npm.taobao.org/jsonfile/download/jsonfile-2.4.0.tgz",
+ "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+ "requires": {
+ "graceful-fs": "^4.1.6"
+ }
},
"jsprim": {
"version": "1.4.1",
@@ -6218,6 +6242,11 @@
"type-check": "~0.3.2"
}
},
+ "lib-flexible": {
+ "version": "0.3.2",
+ "resolved": "http://registry.npm.taobao.org/lib-flexible/download/lib-flexible-0.3.2.tgz",
+ "integrity": "sha1-BvWnSDIxSi01wSA5vJw8otrqpCY="
+ },
"load-json-file": {
"version": "2.0.0",
"resolved": "http://registry.npm.taobao.org/load-json-file/download/load-json-file-2.0.0.tgz",
@@ -6299,7 +6328,6 @@
"version": "1.1.0",
"resolved": "http://registry.npm.taobao.org/loader-utils/download/loader-utils-1.1.0.tgz",
"integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
- "dev": true,
"requires": {
"big.js": "^3.1.3",
"emojis-list": "^2.0.0",
@@ -6703,7 +6731,6 @@
"version": "3.0.4",
"resolved": "http://registry.npm.taobao.org/minimatch/download/minimatch-3.0.4.tgz",
"integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
- "dev": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -6854,6 +6881,11 @@
}
}
},
+ "natives": {
+ "version": "1.1.6",
+ "resolved": "http://registry.npm.taobao.org/natives/download/natives-1.1.6.tgz",
+ "integrity": "sha1-pgO0pJirdxc2ErnqGs3sTZgPALs="
+ },
"natural-compare": {
"version": "1.4.0",
"resolved": "http://registry.npm.taobao.org/natural-compare/download/natural-compare-1.4.0.tgz",
@@ -7225,7 +7257,6 @@
"version": "1.4.0",
"resolved": "http://registry.npm.taobao.org/once/download/once-1.4.0.tgz",
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
- "dev": true,
"requires": {
"wrappy": "1"
}
@@ -7484,8 +7515,7 @@
"path-is-absolute": {
"version": "1.0.1",
"resolved": "http://registry.npm.taobao.org/path-is-absolute/download/path-is-absolute-1.0.1.tgz",
- "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
- "dev": true
+ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
},
"path-is-inside": {
"version": "1.0.2",
@@ -9793,6 +9823,77 @@
"integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew=",
"dev": true
},
+ "px2rem": {
+ "version": "0.5.0",
+ "resolved": "http://registry.npm.taobao.org/px2rem/download/px2rem-0.5.0.tgz",
+ "integrity": "sha1-JLOmz3TRSttO13byB4cdmJPkEOI=",
+ "requires": {
+ "chalk": "~0.5.1",
+ "commander": "~2.6.0",
+ "css": "~2.2.0",
+ "extend": "~3.0.0",
+ "fs-extra": "~0.16.3"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "0.2.1",
+ "resolved": "http://registry.npm.taobao.org/ansi-regex/download/ansi-regex-0.2.1.tgz",
+ "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk="
+ },
+ "ansi-styles": {
+ "version": "1.1.0",
+ "resolved": "http://registry.npm.taobao.org/ansi-styles/download/ansi-styles-1.1.0.tgz",
+ "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94="
+ },
+ "chalk": {
+ "version": "0.5.1",
+ "resolved": "http://registry.npm.taobao.org/chalk/download/chalk-0.5.1.tgz",
+ "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=",
+ "requires": {
+ "ansi-styles": "^1.1.0",
+ "escape-string-regexp": "^1.0.0",
+ "has-ansi": "^0.1.0",
+ "strip-ansi": "^0.3.0",
+ "supports-color": "^0.2.0"
+ }
+ },
+ "commander": {
+ "version": "2.6.0",
+ "resolved": "http://registry.npm.taobao.org/commander/download/commander-2.6.0.tgz",
+ "integrity": "sha1-nfflL7Kgyw+4kFjugMMQQiXzfh0="
+ },
+ "has-ansi": {
+ "version": "0.1.0",
+ "resolved": "http://registry.npm.taobao.org/has-ansi/download/has-ansi-0.1.0.tgz",
+ "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=",
+ "requires": {
+ "ansi-regex": "^0.2.0"
+ }
+ },
+ "strip-ansi": {
+ "version": "0.3.0",
+ "resolved": "http://registry.npm.taobao.org/strip-ansi/download/strip-ansi-0.3.0.tgz",
+ "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=",
+ "requires": {
+ "ansi-regex": "^0.2.1"
+ }
+ },
+ "supports-color": {
+ "version": "0.2.0",
+ "resolved": "http://registry.npm.taobao.org/supports-color/download/supports-color-0.2.0.tgz",
+ "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo="
+ }
+ }
+ },
+ "px2rem-loader": {
+ "version": "0.1.9",
+ "resolved": "http://registry.npm.taobao.org/px2rem-loader/download/px2rem-loader-0.1.9.tgz",
+ "integrity": "sha1-yPK/i+i5prQ6X2fRSy/r4RYOVqA=",
+ "requires": {
+ "loader-utils": "^1.1.0",
+ "px2rem": "^0.5.0"
+ }
+ },
"q": {
"version": "1.5.1",
"resolved": "http://registry.npm.taobao.org/q/download/q-1.5.1.tgz",
@@ -10274,8 +10375,7 @@
"resolve-url": {
"version": "0.2.1",
"resolved": "http://registry.npm.taobao.org/resolve-url/download/resolve-url-0.2.1.tgz",
- "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
- "dev": true
+ "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo="
},
"restore-cursor": {
"version": "2.0.0",
@@ -10306,7 +10406,6 @@
"version": "2.6.2",
"resolved": "http://registry.npm.taobao.org/rimraf/download/rimraf-2.6.2.tgz",
"integrity": "sha1-LtgVDSShbqhlHm1u8PR8QVjOejY=",
- "dev": true,
"requires": {
"glob": "^7.0.5"
}
@@ -10973,14 +11072,12 @@
"source-map": {
"version": "0.6.1",
"resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz",
- "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
- "dev": true
+ "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM="
},
"source-map-resolve": {
"version": "0.5.2",
"resolved": "http://registry.npm.taobao.org/source-map-resolve/download/source-map-resolve-0.5.2.tgz",
"integrity": "sha1-cuLMNAlVQ+Q7LGKyxMENSpBU8lk=",
- "dev": true,
"requires": {
"atob": "^2.1.1",
"decode-uri-component": "^0.2.0",
@@ -11009,8 +11106,7 @@
"source-map-url": {
"version": "0.4.0",
"resolved": "http://registry.npm.taobao.org/source-map-url/download/source-map-url-0.4.0.tgz",
- "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
- "dev": true
+ "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
},
"spdx-correct": {
"version": "3.0.2",
@@ -11799,8 +11895,7 @@
"urix": {
"version": "0.1.0",
"resolved": "http://registry.npm.taobao.org/urix/download/urix-0.1.0.tgz",
- "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
- "dev": true
+ "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI="
},
"url": {
"version": "0.11.0",
@@ -12586,8 +12681,7 @@
"wrappy": {
"version": "1.0.2",
"resolved": "http://registry.npm.taobao.org/wrappy/download/wrappy-1.0.2.tgz",
- "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
- "dev": true
+ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
},
"write": {
"version": "0.2.1",
diff --git a/package.json b/package.json
index 7d4a8db..82338a0 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,8 @@
},
"dependencies": {
"axios": "^0.18.0",
+ "lib-flexible": "^0.3.2",
+ "px2rem-loader": "^0.1.9",
"qs": "^6.6.0",
"vue": "^2.5.2",
"vue-axios": "^2.1.4",
diff --git a/src/components/inout.vue b/src/components/inout.vue
index e7b9ead..9da3e08 100644
--- a/src/components/inout.vue
+++ b/src/components/inout.vue
@@ -132,7 +132,7 @@ export default {
.inout-wrap {
width: 100%;
height: 100%;
- background: url("../assets/inout-bg.png") repeat-x;
+ background: url("../assets/inout-bg.png") repeat;
position: relative;
text-align: center;
.title {
@@ -176,6 +176,7 @@ export default {
text-align: center;
cursor: pointer;
color: $corlorwhit;
+ font-size: 17px;
img {
width: 16px;
height: 16px;
diff --git a/src/main.js b/src/main.js
index 57af2c5..a5716a8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -4,6 +4,7 @@ import Vue from 'vue'
import App from './App'
import router from './router'
import store from './store/store'
+import 'lib-flexible/flexible.js'
import './styles/reset.css'
Vue.config.productionTip = false
--
libgit2 0.21.4