术习电报 / electron-vue-template

转到一个项目
切换导航栏
切换导航栏固定状态
张恒
ddcfb781 1 个父辈 7bb83ecd

修改登录页效果，提升electron版本

内嵌 并排
正在显示 5 个修改的文件 包含 272 行增加 和 224 行删除
...@@ -37,7 +37,7 @@ npm config edit ...@@ -37,7 +37,7 @@ npm config edit
37 37
38 --- 38 ---
39 39
40 -这个项目使用了 [electron-vue](https://github.com/SimulatedGREG/electron-vue)@[8fae476](https://github.com/SimulatedGREG/electron-vue/tree/8fae4763e9d225d3691b627e83b9e09b56f6c935) using [vue-cli](https://github.com/vuejs/vue-cli). 文档你们可以在这里看到: [here](https://simulatedgreg.gitbooks.io/electron-vue/content/index.html). 40 +这个项目使用了 [electron-vue](https://github.com/SimulatedGREG/electron-vue)@[8fae476](https://github.com/SimulatedGREG/electron-vue/tree/8fae4763e9d225d3691b627e83b9e09b56f6c935) using [vue-cli](https://github.com/vuejs/vue-cli). 文档你们可以在这里看到: [这里](https://simulatedgreg.gitbooks.io/electron-vue/content/index.html).
41 这是花裤衩大大原本的[地址](https://github.com/PanJiaChen/electron-vue-admin) 41 这是花裤衩大大原本的[地址](https://github.com/PanJiaChen/electron-vue-admin)
42 42
43 # 更新日志 43 # 更新日志
......
...@@ -5270,9 +5270,9 @@ ...@@ -5270,9 +5270,9 @@
5270 "dev": true 5270 "dev": true
5271 }, 5271 },
5272 "electron": { 5272 "electron": {
5273 - "version": "5.0.10", 5273 + "version": "5.0.11",
5274 - "resolved": "https://registry.npm.taobao.org/electron/download/electron-5.0.10.tgz", 5274 + "resolved": "https://registry.npm.taobao.org/electron/download/electron-5.0.11.tgz",
5275 - "integrity": "sha1-o4GcP/jQXuVzFb+r4tYdNSn1ZZw=", 5275 + "integrity": "sha1-dk60YKqE+/yz3DA4X1+VCctyR1E=",
5276 "dev": true, 5276 "dev": true,
5277 "requires": { 5277 "requires": {
5278 "@types/node": "^10.12.18", 5278 "@types/node": "^10.12.18",
...@@ -5281,9 +5281,9 @@ ...@@ -5281,9 +5281,9 @@
5281 }, 5281 },
5282 "dependencies": { 5282 "dependencies": {
5283 "@types/node": { 5283 "@types/node": {
5284 - "version": "10.14.16", 5284 + "version": "10.14.19",
5285 - "resolved": "https://registry.npm.taobao.org/@types/node/download/@types/node-10.14.16.tgz?cache=0&sync_timestamp=1566325318079&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-10.14.16.tgz", 5285 + "resolved": "https://registry.npm.taobao.org/@types/node/download/@types/node-10.14.19.tgz?cache=0&sync_timestamp=1569481053118&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40types%2Fnode%2Fdownload%2F%40types%2Fnode-10.14.19.tgz",
5286 - "integrity": "sha1-TWkMlsu3snKK/qDiYNaAUBs9pc8=", 5286 + "integrity": "sha1-9SdCx4NKgV3t9m7fyKUVR+Kmc0I=",
5287 "dev": true 5287 "dev": true
5288 } 5288 }
5289 } 5289 }
...@@ -6022,7 +6022,7 @@ ...@@ -6022,7 +6022,7 @@
6022 }, 6022 },
6023 "read-pkg": { 6023 "read-pkg": {
6024 "version": "2.0.0", 6024 "version": "2.0.0",
6025 - "resolved": "https://registry.npm.taobao.org/read-pkg/download/read-pkg-2.0.0.tgz", 6025 + "resolved": "https://registry.npm.taobao.org/read-pkg/download/read-pkg-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fread-pkg%2Fdownload%2Fread-pkg-2.0.0.tgz",
6026 "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", 6026 "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
6027 "dev": true, 6027 "dev": true,
6028 "requires": { 6028 "requires": {
...@@ -7098,6 +7098,15 @@ ...@@ -7098,6 +7098,15 @@
7098 "universalify": "^0.1.0" 7098 "universalify": "^0.1.0"
7099 } 7099 }
7100 }, 7100 },
7101 + "fs-minipass": {
7102 + "version": "1.2.7",
7103 + "resolved": "https://registry.npm.taobao.org/fs-minipass/download/fs-minipass-1.2.7.tgz",
7104 + "integrity": "sha1-zP+FcIQef+QmVpPaiJNsVa7X98c=",
7105 + "dev": true,
7106 + "requires": {
7107 + "minipass": "^2.6.0"
7108 + }
7109 + },
7101 "fs-write-stream-atomic": { 7110 "fs-write-stream-atomic": {
7102 "version": "1.0.10", 7111 "version": "1.0.10",
7103 "resolved": "https://registry.npm.taobao.org/fs-write-stream-atomic/download/fs-write-stream-atomic-1.0.10.tgz", 7112 "resolved": "https://registry.npm.taobao.org/fs-write-stream-atomic/download/fs-write-stream-atomic-1.0.10.tgz",
...@@ -7157,14 +7166,12 @@ ...@@ -7157,14 +7166,12 @@
7157 "balanced-match": { 7166 "balanced-match": {
7158 "version": "1.0.0", 7167 "version": "1.0.0",
7159 "bundled": true, 7168 "bundled": true,
7160 - "dev": true, 7169 + "dev": true
7161 - "optional": true
7162 }, 7170 },
7163 "brace-expansion": { 7171 "brace-expansion": {
7164 "version": "1.1.11", 7172 "version": "1.1.11",
7165 "bundled": true, 7173 "bundled": true,
7166 "dev": true, 7174 "dev": true,
7167 - "optional": true,
7168 "requires": { 7175 "requires": {
7169 "balanced-match": "^1.0.0", 7176 "balanced-match": "^1.0.0",
7170 "concat-map": "0.0.1" 7177 "concat-map": "0.0.1"
...@@ -7179,20 +7186,17 @@ ...@@ -7179,20 +7186,17 @@
7179 "code-point-at": { 7186 "code-point-at": {
7180 "version": "1.1.0", 7187 "version": "1.1.0",
7181 "bundled": true, 7188 "bundled": true,
7182 - "dev": true, 7189 + "dev": true
7183 - "optional": true
7184 }, 7190 },
7185 "concat-map": { 7191 "concat-map": {
7186 "version": "0.0.1", 7192 "version": "0.0.1",
7187 "bundled": true, 7193 "bundled": true,
7188 - "dev": true, 7194 + "dev": true
7189 - "optional": true
7190 }, 7195 },
7191 "console-control-strings": { 7196 "console-control-strings": {
7192 "version": "1.1.0", 7197 "version": "1.1.0",
7193 "bundled": true, 7198 "bundled": true,
7194 - "dev": true, 7199 + "dev": true
7195 - "optional": true
7196 }, 7200 },
7197 "core-util-is": { 7201 "core-util-is": {
7198 "version": "1.0.2", 7202 "version": "1.0.2",
...@@ -7309,8 +7313,7 @@ ...@@ -7309,8 +7313,7 @@
7309 "inherits": { 7313 "inherits": {
7310 "version": "2.0.3", 7314 "version": "2.0.3",
7311 "bundled": true, 7315 "bundled": true,
7312 - "dev": true, 7316 + "dev": true
7313 - "optional": true
7314 }, 7317 },
7315 "ini": { 7318 "ini": {
7316 "version": "1.3.5", 7319 "version": "1.3.5",
...@@ -7322,7 +7325,6 @@ ...@@ -7322,7 +7325,6 @@
7322 "version": "1.0.0", 7325 "version": "1.0.0",
7323 "bundled": true, 7326 "bundled": true,
7324 "dev": true, 7327 "dev": true,
7325 - "optional": true,
7326 "requires": { 7328 "requires": {
7327 "number-is-nan": "^1.0.0" 7329 "number-is-nan": "^1.0.0"
7328 } 7330 }
...@@ -7337,7 +7339,6 @@ ...@@ -7337,7 +7339,6 @@
7337 "version": "3.0.4", 7339 "version": "3.0.4",
7338 "bundled": true, 7340 "bundled": true,
7339 "dev": true, 7341 "dev": true,
7340 - "optional": true,
7341 "requires": { 7342 "requires": {
7342 "brace-expansion": "^1.1.7" 7343 "brace-expansion": "^1.1.7"
7343 } 7344 }
...@@ -7345,14 +7346,12 @@ ...@@ -7345,14 +7346,12 @@
7345 "minimist": { 7346 "minimist": {
7346 "version": "0.0.8", 7347 "version": "0.0.8",
7347 "bundled": true, 7348 "bundled": true,
7348 - "dev": true, 7349 + "dev": true
7349 - "optional": true
7350 }, 7350 },
7351 "minipass": { 7351 "minipass": {
7352 "version": "2.3.5", 7352 "version": "2.3.5",
7353 "bundled": true, 7353 "bundled": true,
7354 "dev": true, 7354 "dev": true,
7355 - "optional": true,
7356 "requires": { 7355 "requires": {
7357 "safe-buffer": "^5.1.2", 7356 "safe-buffer": "^5.1.2",
7358 "yallist": "^3.0.0" 7357 "yallist": "^3.0.0"
...@@ -7371,7 +7370,6 @@ ...@@ -7371,7 +7370,6 @@
7371 "version": "0.5.1", 7370 "version": "0.5.1",
7372 "bundled": true, 7371 "bundled": true,
7373 "dev": true, 7372 "dev": true,
7374 - "optional": true,
7375 "requires": { 7373 "requires": {
7376 "minimist": "0.0.8" 7374 "minimist": "0.0.8"
7377 } 7375 }
...@@ -7452,8 +7450,7 @@ ...@@ -7452,8 +7450,7 @@
7452 "number-is-nan": { 7450 "number-is-nan": {
7453 "version": "1.0.1", 7451 "version": "1.0.1",
7454 "bundled": true, 7452 "bundled": true,
7455 - "dev": true, 7453 + "dev": true
7456 - "optional": true
7457 }, 7454 },
7458 "object-assign": { 7455 "object-assign": {
7459 "version": "4.1.1", 7456 "version": "4.1.1",
...@@ -7465,7 +7462,6 @@ ...@@ -7465,7 +7462,6 @@
7465 "version": "1.4.0", 7462 "version": "1.4.0",
7466 "bundled": true, 7463 "bundled": true,
7467 "dev": true, 7464 "dev": true,
7468 - "optional": true,
7469 "requires": { 7465 "requires": {
7470 "wrappy": "1" 7466 "wrappy": "1"
7471 } 7467 }
...@@ -7587,7 +7583,6 @@ ...@@ -7587,7 +7583,6 @@
7587 "version": "1.0.2", 7583 "version": "1.0.2",
7588 "bundled": true, 7584 "bundled": true,
7589 "dev": true, 7585 "dev": true,
7590 - "optional": true,
7591 "requires": { 7586 "requires": {
7592 "code-point-at": "^1.0.0", 7587 "code-point-at": "^1.0.0",
7593 "is-fullwidth-code-point": "^1.0.0", 7588 "is-fullwidth-code-point": "^1.0.0",
...@@ -9685,7 +9680,7 @@ ...@@ -9685,7 +9680,7 @@
9685 "dependencies": { 9680 "dependencies": {
9686 "supports-color": { 9681 "supports-color": {
9687 "version": "6.1.0", 9682 "version": "6.1.0",
9688 - "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz", 9683 + "resolved": "https://registry.npm.taobao.org/supports-color/download/supports-color-6.1.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsupports-color%2Fdownload%2Fsupports-color-6.1.0.tgz",
9689 "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=", 9684 "integrity": "sha1-B2Srxpxj1ayELdSGfo0CXogN+PM=",
9690 "dev": true, 9685 "dev": true,
9691 "requires": { 9686 "requires": {
...@@ -11141,6 +11136,51 @@ ...@@ -11141,6 +11136,51 @@
11141 "resolved": "https://registry.npm.taobao.org/minimist/download/minimist-0.0.8.tgz", 11136 "resolved": "https://registry.npm.taobao.org/minimist/download/minimist-0.0.8.tgz",
11142 "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" 11137 "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
11143 }, 11138 },
11139 + "minipass": {
11140 + "version": "2.8.6",
11141 + "resolved": "https://registry.npm.taobao.org/minipass/download/minipass-2.8.6.tgz",
11142 + "integrity": "sha1-Yg2Ims4mNWOR0BDsuUWHSd+bbbU=",
11143 + "dev": true,
11144 + "requires": {
11145 + "safe-buffer": "^5.1.2",
11146 + "yallist": "^3.0.0"
11147 + },
11148 + "dependencies": {
11149 + "yallist": {
11150 + "version": "3.1.0",
11151 + "resolved": "https://registry.npm.taobao.org/yallist/download/yallist-3.1.0.tgz",
11152 + "integrity": "sha1-kGzCEAly3CYlrnj1ZqJXcjCh1vc=",
11153 + "dev": true
11154 + }
11155 + }
11156 + },
11157 + "minipass-collect": {
11158 + "version": "1.0.1",
11159 + "resolved": "https://registry.npm.taobao.org/minipass-collect/download/minipass-collect-1.0.1.tgz",
11160 + "integrity": "sha1-ThRTceADIzLTmLsOGL29VrcTFEM=",
11161 + "dev": true,
11162 + "requires": {
11163 + "minipass": "^2.5.1"
11164 + }
11165 + },
11166 + "minipass-flush": {
11167 + "version": "1.0.4",
11168 + "resolved": "https://registry.npm.taobao.org/minipass-flush/download/minipass-flush-1.0.4.tgz",
11169 + "integrity": "sha1-5DJhZJ2n/5udtSntxjW4+DVBF1k=",
11170 + "dev": true,
11171 + "requires": {
11172 + "minipass": "^2.6.2"
11173 + }
11174 + },
11175 + "minipass-pipeline": {
11176 + "version": "1.2.1",
11177 + "resolved": "https://registry.npm.taobao.org/minipass-pipeline/download/minipass-pipeline-1.2.1.tgz",
11178 + "integrity": "sha1-bhlTdvx3/C7re4R2q/f7rQPXbAo=",
11179 + "dev": true,
11180 + "requires": {
11181 + "minipass": "^2.8.1"
11182 + }
11183 + },
11144 "minstache": { 11184 "minstache": {
11145 "version": "1.2.0", 11185 "version": "1.2.0",
11146 "resolved": "https://registry.npm.taobao.org/minstache/download/minstache-1.2.0.tgz", 11186 "resolved": "https://registry.npm.taobao.org/minstache/download/minstache-1.2.0.tgz",
...@@ -11560,7 +11600,7 @@ ...@@ -11560,7 +11600,7 @@
11560 "dependencies": { 11600 "dependencies": {
11561 "buffer": { 11601 "buffer": {
11562 "version": "4.9.1", 11602 "version": "4.9.1",
11563 - "resolved": "https://registry.npm.taobao.org/buffer/download/buffer-4.9.1.tgz?cache=0&sync_timestamp=1566942806368&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fbuffer%2Fdownload%2Fbuffer-4.9.1.tgz", 11603 + "resolved": "https://registry.npm.taobao.org/buffer/download/buffer-4.9.1.tgz",
11564 "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", 11604 "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=",
11565 "dev": true, 11605 "dev": true,
11566 "requires": { 11606 "requires": {
...@@ -12293,9 +12333,9 @@ ...@@ -12293,9 +12333,9 @@
12293 } 12333 }
12294 }, 12334 },
12295 "parse-asn1": { 12335 "parse-asn1": {
12296 - "version": "5.1.4", 12336 + "version": "5.1.5",
12297 - "resolved": "https://registry.npm.taobao.org/parse-asn1/download/parse-asn1-5.1.4.tgz", 12337 + "resolved": "https://registry.npm.taobao.org/parse-asn1/download/parse-asn1-5.1.5.tgz?cache=0&sync_timestamp=1568806095714&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fparse-asn1%2Fdownload%2Fparse-asn1-5.1.5.tgz",
12298 - "integrity": "sha1-N/Zij4I/vesic7TVQENKIvPvH8w=", 12338 + "integrity": "sha1-ADJxND2ljclMrOSU+u89IUfs6g4=",
12299 "dev": true, 12339 "dev": true,
12300 "requires": { 12340 "requires": {
12301 "asn1.js": "^4.0.0", 12341 "asn1.js": "^4.0.0",
...@@ -15776,9 +15816,9 @@ ...@@ -15776,9 +15816,9 @@
15776 } 15816 }
15777 }, 15817 },
15778 "terser": { 15818 "terser": {
15779 - "version": "4.3.1", 15819 + "version": "4.3.4",
15780 - "resolved": "https://registry.npm.taobao.org/terser/download/terser-4.3.1.tgz", 15820 + "resolved": "https://registry.npm.taobao.org/terser/download/terser-4.3.4.tgz",
15781 - "integrity": "sha1-CYILyzOYKZxLSNmoau/GUSfQ7WU=", 15821 + "integrity": "sha1-rZG63pVhnjQ0aF1p76Yhpa9fh30=",
15782 "dev": true, 15822 "dev": true,
15783 "requires": { 15823 "requires": {
15784 "commander": "^2.20.0", 15824 "commander": "^2.20.0",
...@@ -15787,9 +15827,9 @@ ...@@ -15787,9 +15827,9 @@
15787 }, 15827 },
15788 "dependencies": { 15828 "dependencies": {
15789 "commander": { 15829 "commander": {
15790 - "version": "2.20.0", 15830 + "version": "2.20.1",
15791 - "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.20.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.20.0.tgz", 15831 + "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.20.1.tgz?cache=0&sync_timestamp=1569709401112&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.20.1.tgz",
15792 - "integrity": "sha1-1YuytcHuj4ew00ACfp6U4iLFpCI=", 15832 + "integrity": "sha1-OGPOPKktCDHc8qEC9ftLWSav0Pk=",
15793 "dev": true 15833 "dev": true
15794 }, 15834 },
15795 "source-map": { 15835 "source-map": {
...@@ -15811,42 +15851,45 @@ ...@@ -15811,42 +15851,45 @@
15811 } 15851 }
15812 }, 15852 },
15813 "terser-webpack-plugin": { 15853 "terser-webpack-plugin": {
15814 - "version": "2.1.0", 15854 + "version": "2.1.2",
15815 - "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.1.0.tgz", 15855 + "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-2.1.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-2.1.2.tgz",
15816 - "integrity": "sha1-uc7nmaLaK854hUDDc44IG22yjYo=", 15856 + "integrity": "sha1-K5uBR6bxiRg0ggCADPlWDFD3Abs=",
15817 "dev": true, 15857 "dev": true,
15818 "requires": { 15858 "requires": {
15819 - "cacache": "^12.0.3", 15859 + "cacache": "^13.0.0",
15820 "find-cache-dir": "^3.0.0", 15860 "find-cache-dir": "^3.0.0",
15821 "jest-worker": "^24.9.0", 15861 "jest-worker": "^24.9.0",
15822 - "schema-utils": "^2.2.0", 15862 + "schema-utils": "^2.4.1",
15823 "serialize-javascript": "^2.1.0", 15863 "serialize-javascript": "^2.1.0",
15824 "source-map": "^0.6.1", 15864 "source-map": "^0.6.1",
15825 - "terser": "^4.3.1", 15865 + "terser": "^4.3.4",
15826 "webpack-sources": "^1.4.3" 15866 "webpack-sources": "^1.4.3"
15827 }, 15867 },
15828 "dependencies": { 15868 "dependencies": {
15829 "cacache": { 15869 "cacache": {
15830 - "version": "12.0.3", 15870 + "version": "13.0.0",
15831 - "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-12.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-12.0.3.tgz", 15871 + "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-13.0.0.tgz",
15832 - "integrity": "sha1-vpmruk4b9d9GHNWiwQcfxDJXM5A=", 15872 + "integrity": "sha1-F5fJV7zd97xpdSCSDjooTmT8Icw=",
15833 "dev": true, 15873 "dev": true,
15834 "requires": { 15874 "requires": {
15835 - "bluebird": "^3.5.5", 15875 + "chownr": "^1.1.2",
15836 - "chownr": "^1.1.1",
15837 "figgy-pudding": "^3.5.1", 15876 "figgy-pudding": "^3.5.1",
15877 + "fs-minipass": "^1.2.7",
15838 "glob": "^7.1.4", 15878 "glob": "^7.1.4",
15839 - "graceful-fs": "^4.1.15", 15879 + "graceful-fs": "^4.2.2",
15840 - "infer-owner": "^1.0.3", 15880 + "infer-owner": "^1.0.4",
15841 "lru-cache": "^5.1.1", 15881 "lru-cache": "^5.1.1",
15842 - "mississippi": "^3.0.0", 15882 + "minipass": "^2.6.5",
15883 + "minipass-collect": "^1.0.1",
15884 + "minipass-flush": "^1.0.3",
15885 + "minipass-pipeline": "^1.1.2",
15843 "mkdirp": "^0.5.1", 15886 "mkdirp": "^0.5.1",
15844 "move-concurrently": "^1.0.1", 15887 "move-concurrently": "^1.0.1",
15888 + "p-map": "^3.0.0",
15845 "promise-inflight": "^1.0.1", 15889 "promise-inflight": "^1.0.1",
15846 - "rimraf": "^2.6.3", 15890 + "rimraf": "^2.7.1",
15847 - "ssri": "^6.0.1", 15891 + "ssri": "^7.0.0",
15848 - "unique-filename": "^1.1.1", 15892 + "unique-filename": "^1.1.1"
15849 - "y18n": "^4.0.0"
15850 } 15893 }
15851 }, 15894 },
15852 "find-cache-dir": { 15895 "find-cache-dir": {
...@@ -15897,24 +15940,6 @@ ...@@ -15897,24 +15940,6 @@
15897 "semver": "^6.0.0" 15940 "semver": "^6.0.0"
15898 } 15941 }
15899 }, 15942 },
15900 - "mississippi": {
15901 - "version": "3.0.0",
15902 - "resolved": "https://registry.npm.taobao.org/mississippi/download/mississippi-3.0.0.tgz",
15903 - "integrity": "sha1-6goykfl+C16HdrNj1fChLZTGcCI=",
15904 - "dev": true,
15905 - "requires": {
15906 - "concat-stream": "^1.5.0",
15907 - "duplexify": "^3.4.2",
15908 - "end-of-stream": "^1.1.0",
15909 - "flush-write-stream": "^1.0.0",
15910 - "from2": "^2.1.0",
15911 - "parallel-transform": "^1.1.0",
15912 - "pump": "^3.0.0",
15913 - "pumpify": "^1.3.3",
15914 - "stream-each": "^1.1.0",
15915 - "through2": "^2.0.0"
15916 - }
15917 - },
15918 "p-limit": { 15943 "p-limit": {
15919 "version": "2.2.1", 15944 "version": "2.2.1",
15920 "resolved": "https://registry.npm.taobao.org/p-limit/download/p-limit-2.2.1.tgz", 15945 "resolved": "https://registry.npm.taobao.org/p-limit/download/p-limit-2.2.1.tgz",
...@@ -15954,20 +15979,10 @@ ...@@ -15954,20 +15979,10 @@
15954 "find-up": "^4.0.0" 15979 "find-up": "^4.0.0"
15955 } 15980 }
15956 }, 15981 },
15957 - "pump": {
15958 - "version": "3.0.0",
15959 - "resolved": "https://registry.npm.taobao.org/pump/download/pump-3.0.0.tgz",
15960 - "integrity": "sha1-tKIRaBW94vTh6mAjVOjHVWUQemQ=",
15961 - "dev": true,
15962 - "requires": {
15963 - "end-of-stream": "^1.1.0",
15964 - "once": "^1.3.1"
15965 - }
15966 - },
15967 "schema-utils": { 15982 "schema-utils": {
15968 - "version": "2.2.0", 15983 + "version": "2.4.1",
15969 - "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-2.2.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-2.2.0.tgz", 15984 + "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-2.4.1.tgz?cache=0&sync_timestamp=1569583621807&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-2.4.1.tgz",
15970 - "integrity": "sha1-SKBlziGeDKz0YxRzFZA3ssGugto=", 15985 + "integrity": "sha1-6JreXQVtyLyso3dXS7SpxOG4vlY=",
15971 "dev": true, 15986 "dev": true,
15972 "requires": { 15987 "requires": {
15973 "ajv": "^6.10.2", 15988 "ajv": "^6.10.2",
...@@ -15993,18 +16008,19 @@ ...@@ -15993,18 +16008,19 @@
15993 "dev": true 16008 "dev": true
15994 }, 16009 },
15995 "ssri": { 16010 "ssri": {
15996 - "version": "6.0.1", 16011 + "version": "7.0.0",
15997 - "resolved": "https://registry.npm.taobao.org/ssri/download/ssri-6.0.1.tgz", 16012 + "resolved": "https://registry.npm.taobao.org/ssri/download/ssri-7.0.0.tgz",
15998 - "integrity": "sha1-KjxBso3UW2K2Nnbst0ABJlrp7dg=", 16013 + "integrity": "sha1-XCIpkQqRtsFhMSqNJgjT6D6CxDE=",
15999 "dev": true, 16014 "dev": true,
16000 "requires": { 16015 "requires": {
16001 - "figgy-pudding": "^3.5.1" 16016 + "figgy-pudding": "^3.5.1",
16017 + "minipass": "^2.5.1"
16002 } 16018 }
16003 }, 16019 },
16004 "yallist": { 16020 "yallist": {
16005 - "version": "3.0.3", 16021 + "version": "3.1.0",
16006 - "resolved": "https://registry.npm.taobao.org/yallist/download/yallist-3.0.3.tgz", 16022 + "resolved": "https://registry.npm.taobao.org/yallist/download/yallist-3.1.0.tgz",
16007 - "integrity": "sha1-tLBJ4xS+VF486AIjbWzSLNkcPek=", 16023 + "integrity": "sha1-kGzCEAly3CYlrnj1ZqJXcjCh1vc=",
16008 "dev": true 16024 "dev": true
16009 } 16025 }
16010 } 16026 }
...@@ -17063,9 +17079,9 @@ ...@@ -17063,9 +17079,9 @@
17063 } 17079 }
17064 }, 17080 },
17065 "webpack": { 17081 "webpack": {
17066 - "version": "4.40.2", 17082 + "version": "4.41.0",
17067 - "resolved": "https://registry.npm.taobao.org/webpack/download/webpack-4.40.2.tgz?cache=0&sync_timestamp=1568385142284&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack%2Fdownload%2Fwebpack-4.40.2.tgz", 17083 + "resolved": "https://registry.npm.taobao.org/webpack/download/webpack-4.41.0.tgz?cache=0&sync_timestamp=1569532173364&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack%2Fdownload%2Fwebpack-4.41.0.tgz",
17068 - "integrity": "sha1-0hQz0lD5AL8PrLq+j1DVhbLcMKc=", 17084 + "integrity": "sha1-22olS95nF2n3wU6QoaVec2Avxws=",
17069 "dev": true, 17085 "dev": true,
17070 "requires": { 17086 "requires": {
17071 "@webassemblyjs/ast": "1.8.5", 17087 "@webassemblyjs/ast": "1.8.5",
...@@ -17095,7 +17111,7 @@ ...@@ -17095,7 +17111,7 @@
17095 "dependencies": { 17111 "dependencies": {
17096 "acorn": { 17112 "acorn": {
17097 "version": "6.3.0", 17113 "version": "6.3.0",
17098 - "resolved": "https://registry.npm.taobao.org/acorn/download/acorn-6.3.0.tgz", 17114 + "resolved": "https://registry.npm.taobao.org/acorn/download/acorn-6.3.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Facorn%2Fdownload%2Facorn-6.3.0.tgz",
17099 "integrity": "sha1-AIdQkRn/pPwKAEHR6TpBfmjLhW4=", 17115 "integrity": "sha1-AIdQkRn/pPwKAEHR6TpBfmjLhW4=",
17100 "dev": true 17116 "dev": true
17101 }, 17117 },
...@@ -17142,7 +17158,7 @@ ...@@ -17142,7 +17158,7 @@
17142 }, 17158 },
17143 "cacache": { 17159 "cacache": {
17144 "version": "12.0.3", 17160 "version": "12.0.3",
17145 - "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-12.0.3.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcacache%2Fdownload%2Fcacache-12.0.3.tgz", 17161 + "resolved": "https://registry.npm.taobao.org/cacache/download/cacache-12.0.3.tgz",
17146 "integrity": "sha1-vpmruk4b9d9GHNWiwQcfxDJXM5A=", 17162 "integrity": "sha1-vpmruk4b9d9GHNWiwQcfxDJXM5A=",
17147 "dev": true, 17163 "dev": true,
17148 "requires": { 17164 "requires": {
...@@ -17520,7 +17536,7 @@ ...@@ -17520,7 +17536,7 @@
17520 }, 17536 },
17521 "schema-utils": { 17537 "schema-utils": {
17522 "version": "1.0.0", 17538 "version": "1.0.0",
17523 - "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-1.0.0.tgz", 17539 + "resolved": "https://registry.npm.taobao.org/schema-utils/download/schema-utils-1.0.0.tgz?cache=0&sync_timestamp=1569583621807&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-1.0.0.tgz",
17524 "integrity": "sha1-C3mpMgTXtgDUsoUNH2bCo0lRx3A=", 17540 "integrity": "sha1-C3mpMgTXtgDUsoUNH2bCo0lRx3A=",
17525 "dev": true, 17541 "dev": true,
17526 "requires": { 17542 "requires": {
...@@ -17546,7 +17562,7 @@ ...@@ -17546,7 +17562,7 @@
17546 }, 17562 },
17547 "terser-webpack-plugin": { 17563 "terser-webpack-plugin": {
17548 "version": "1.4.1", 17564 "version": "1.4.1",
17549 - "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-1.4.1.tgz", 17565 + "resolved": "https://registry.npm.taobao.org/terser-webpack-plugin/download/terser-webpack-plugin-1.4.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fterser-webpack-plugin%2Fdownload%2Fterser-webpack-plugin-1.4.1.tgz",
17550 "integrity": "sha1-YbGOQOruW+l+dxzbsQ7RKAiIwrQ=", 17566 "integrity": "sha1-YbGOQOruW+l+dxzbsQ7RKAiIwrQ=",
17551 "dev": true, 17567 "dev": true,
17552 "requires": { 17568 "requires": {
...@@ -17572,9 +17588,9 @@ ...@@ -17572,9 +17588,9 @@
17572 } 17588 }
17573 }, 17589 },
17574 "yallist": { 17590 "yallist": {
17575 - "version": "3.0.3", 17591 + "version": "3.1.0",
17576 - "resolved": "https://registry.npm.taobao.org/yallist/download/yallist-3.0.3.tgz", 17592 + "resolved": "https://registry.npm.taobao.org/yallist/download/yallist-3.1.0.tgz",
17577 - "integrity": "sha1-tLBJ4xS+VF486AIjbWzSLNkcPek=", 17593 + "integrity": "sha1-kGzCEAly3CYlrnj1ZqJXcjCh1vc=",
17578 "dev": true 17594 "dev": true
17579 } 17595 }
17580 } 17596 }
......
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
90 "css-loader": "^3.1.0", 90 "css-loader": "^3.1.0",
91 "del": "^5.0.0", 91 "del": "^5.0.0",
92 "devtron": "^1.4.0", 92 "devtron": "^1.4.0",
93 - "electron": "^5.0.10", 93 + "electron": "^5.0.11",
94 "electron-builder": "^21.1.1", 94 "electron-builder": "^21.1.1",
95 "electron-debug": "^3.0.1", 95 "electron-debug": "^3.0.1",
96 "electron-devtools-installer": "^2.2.4", 96 "electron-devtools-installer": "^2.2.4",
...@@ -124,13 +124,13 @@ ...@@ -124,13 +124,13 @@
124 "spectron": "^3.8.0", 124 "spectron": "^3.8.0",
125 "style-loader": "^0.21.0", 125 "style-loader": "^0.21.0",
126 "svg-sprite-loader": "^4.1.6", 126 "svg-sprite-loader": "^4.1.6",
127 - "terser-webpack-plugin": "^2.1.0", 127 + "terser-webpack-plugin": "^2.1.2",
128 "url-loader": "^2.1.0", 128 "url-loader": "^2.1.0",
129 "vue-html-loader": "^1.2.4", 129 "vue-html-loader": "^1.2.4",
130 "vue-loader": "^15.7.1", 130 "vue-loader": "^15.7.1",
131 "vue-style-loader": "^4.1.2", 131 "vue-style-loader": "^4.1.2",
132 "vue-template-compiler": "^2.6.10", 132 "vue-template-compiler": "^2.6.10",
133 - "webpack": "^4.40.2", 133 + "webpack": "^4.41.0",
134 "webpack-cli": "^3.3.9", 134 "webpack-cli": "^3.3.9",
135 "webpack-dev-server": "^3.8.1", 135 "webpack-dev-server": "^3.8.1",
136 "webpack-hot-middleware": "^2.25.0", 136 "webpack-hot-middleware": "^2.25.0",
......
...@@ -32,7 +32,9 @@ function createWindow () { ...@@ -32,7 +32,9 @@ function createWindow () {
32 backgroundColor: '#fffff', 32 backgroundColor: '#fffff',
33 titleBarStyle: 'hidden', 33 titleBarStyle: 'hidden',
34 webPreferences: { 34 webPreferences: {
35 - nodeIntegration: true 35 + nodeIntegration: true,
36 + webSecurity: false,
37 + experimentalFeatures: true
36 } 38 }
37 // 隐藏边框 39 // 隐藏边框
38 // frame: false, 40 // frame: false,
......
1 <template> 1 <template>
2 <div class="login-container"> 2 <div class="login-container">
3 - <el-form class="login-form" autoComplete="on" :model="loginForm" :rules="loginRules" ref="loginForm" label-position="left"> 3 + <div class="login-from-box">
4 - <h3 class="title">后台管理框架</h3> 4 + <el-form
5 - <el-form-item prop="username"> 5 + class="login-form"
6 - <span class="svg-container svg-container_login"> 6 + autocomplete="on"
7 - <svg-icon icon-class="user" /> 7 + :model="loginForm"
8 - </span> 8 + :rules="loginRules"
9 - <el-input name="username" type="text" v-model="loginForm.username" autoComplete="on" placeholder="用户名" /> 9 + ref="loginForm"
10 - </el-form-item> 10 + label-position="left"
11 - <el-form-item prop="password"> 11 + >
12 - <span class="svg-container"> 12 + <h3 class="title">后台管理框架</h3>
13 - <svg-icon icon-class="password"></svg-icon> 13 + <el-form-item prop="username">
14 - </span> 14 + <span class="svg-container svg-container_login">
15 - <el-input name="password" :type="pwdType" @keyup.enter.native="handleLogin" v-model="loginForm.password" autoComplete="on" 15 + <svg-icon icon-class="user" />
16 - placeholder="密码"></el-input> 16 + </span>
17 - <span class="show-pwd" @click="showPwd"><svg-icon icon-class="eye" /></span> 17 + <el-input
18 - </el-form-item> 18 + name="username"
19 - <el-form-item> 19 + type="text"
20 - <el-button type="primary" style="width:100%;" :loading="loading" @click.native.prevent="handleLogin"> 20 + v-model="loginForm.username"
21 - 登录 21 + autocomplete="on"
22 - </el-button> 22 + placeholder="用户名"
23 - </el-form-item> 23 + />
24 - <div class="tips"> 24 + </el-form-item>
25 - <span style="margin-right:20px;">用户名: admin</span> 25 + <el-form-item prop="password">
26 - <span> 密码：随便什么都行</span> 26 + <span class="svg-container">
27 - </div> 27 + <svg-icon icon-class="password"></svg-icon>
28 - </el-form> 28 + </span>
29 + <el-input
30 + name="password"
31 + :type="pwdType"
32 + @keyup.enter.native="handleLogin"
33 + v-model="loginForm.password"
34 + autocomplete="on"
35 + placeholder="密码"
36 + ></el-input>
37 + <span class="show-pwd" @click="showPwd">
38 + <svg-icon icon-class="eye" />
39 + </span>
40 + </el-form-item>
41 + <el-form-item>
42 + <el-button
43 + type="primary"
44 + style="width:100%;"
45 + :loading="loading"
46 + @click.native.prevent="handleLogin"
47 + >登录</el-button>
48 + </el-form-item>
49 + <div class="tips">
50 + <span style="margin-right:20px;">用户名: admin</span>
51 + <span>密码：随便什么都行</span>
52 + </div>
53 + </el-form>
54 + </div>
29 </div> 55 </div>
30 </template> 56 </template>
31 57
32 <script> 58 <script>
33 -import { isvalidUsername } from '@/utils/validate' 59 +import { isvalidUsername } from "@/utils/validate";
34 60
35 export default { 61 export default {
36 - name: 'login', 62 + name: "login",
37 data() { 63 data() {
38 const validateUsername = (rule, value, callback) => { 64 const validateUsername = (rule, value, callback) => {
39 if (!isvalidUsername(value)) { 65 if (!isvalidUsername(value)) {
40 - callback(new Error('请输入正确的用户名')) 66 + callback(new Error("请输入正确的用户名"));
41 } else { 67 } else {
42 - callback() 68 + callback();
43 } 69 }
44 - } 70 + };
45 const validatePass = (rule, value, callback) => { 71 const validatePass = (rule, value, callback) => {
46 if (value.length < 5) { 72 if (value.length < 5) {
47 - callback(new Error('密码不能小于5位')) 73 + callback(new Error("密码不能小于5位"));
48 } else { 74 } else {
49 - callback() 75 + callback();
50 } 76 }
51 - } 77 + };
52 return { 78 return {
53 loginForm: { 79 loginForm: {
54 - username: 'admin', 80 + username: "admin",
55 - password: 'admin' 81 + password: "admin"
56 }, 82 },
57 loginRules: { 83 loginRules: {
58 - username: [{ required: true, trigger: 'blur', validator: validateUsername }], 84 + username: [
59 - password: [{ required: true, trigger: 'blur', validator: validatePass }] 85 + { required: true, trigger: "blur", validator: validateUsername }
86 + ],
87 + password: [{ required: true, trigger: "blur", validator: validatePass }]
60 }, 88 },
61 loading: false, 89 loading: false,
62 - pwdType: 'password' 90 + pwdType: "password"
63 - } 91 + };
64 }, 92 },
65 methods: { 93 methods: {
66 showPwd() { 94 showPwd() {
67 - if (this.pwdType === 'password') { 95 + if (this.pwdType === "password") {
68 - this.pwdType = '' 96 + this.pwdType = "";
69 } else { 97 } else {
70 - this.pwdType = 'password' 98 + this.pwdType = "password";
71 } 99 }
72 }, 100 },
73 handleLogin() { 101 handleLogin() {
74 - console.log(11111) 102 + console.log(11111);
75 this.$refs.loginForm.validate(valid => { 103 this.$refs.loginForm.validate(valid => {
76 - console.log(valid) 104 + console.log(valid);
77 if (valid) { 105 if (valid) {
78 - this.loading = true 106 + this.loading = true;
79 - this.$store.dispatch('Login', this.loginForm).then(() => { 107 + this.$store
80 - this.loading = false 108 + .dispatch("Login", this.loginForm)
81 - this.$router.push({ path: '/' }) 109 + .then(() => {
82 - }).catch(() => { 110 + this.loading = false;
83 - this.loading = false 111 + this.$router.push({ path: "/" });
84 - }) 112 + })
113 + .catch(() => {
114 + this.loading = false;
115 + });
85 } else { 116 } else {
86 - console.log('error submit!!') 117 + console.log("error submit!!");
87 - return false 118 + return false;
88 } 119 }
89 - }) 120 + });
90 } 121 }
91 } 122 }
92 -} 123 +};
93 </script> 124 </script>
94 125
95 -<style rel="stylesheet/scss" lang="scss"> 126 +<style rel="stylesheet/scss" lang="scss" scoped>
96 -$bg:#2d3a4b; 127 +$bg: #2d3a4b;
97 -$light_gray:#eee; 128 +$light_gray: #eee;
129 +$dark_gray: #889aa4;
130 +$light_gray: #eee;
98 131
99 /* reset element-ui css */ 132 /* reset element-ui css */
100 .login-container { 133 .login-container {
134 + position: fixed;
135 + height: 100%;
136 + width: 100%;
137 + top: 0;
101 left: 0; 138 left: 0;
102 - .el-input { 139 + background-image: url("https://cn.bing.com/th?id=OHR.ClavijoLandscape_ZH-CN1525245124_1920x1080.jpg&rf=LaDigue_1920x1080.jpg&pid=hp");
140 + /deep/ .el-input {
103 display: inline-block; 141 display: inline-block;
104 height: 47px; 142 height: 47px;
105 width: 85%; 143 width: 85%;
...@@ -117,69 +155,61 @@ $light_gray:#eee; ...@@ -117,69 +155,61 @@ $light_gray:#eee;
117 } 155 }
118 } 156 }
119 } 157 }
120 - .el-form-item { 158 + /deep/ .el-form-item {
121 border: 1px solid rgba(255, 255, 255, 0.1); 159 border: 1px solid rgba(255, 255, 255, 0.1);
122 background: rgba(0, 0, 0, 0.1); 160 background: rgba(0, 0, 0, 0.1);
123 border-radius: 5px; 161 border-radius: 5px;
124 color: #454545; 162 color: #454545;
125 } 163 }
126 -} 164 + .login-from-box {
127 - 165 + position: relative;
128 -</style> 166 + backdrop-filter: saturate(180%) blur(20px);
129 167
130 -<style rel="stylesheet/scss" lang="scss" scoped> 168 + .login-form {
131 -$bg:#2d3a4b; 169 + position: absolute;
132 -$dark_gray:#889aa4; 170 + left: 0;
133 -$light_gray:#eee; 171 + right: 0;
134 -.login-container { 172 + width: 520px;
135 - position: fixed; 173 + padding: 35px 35px 15px 35px;
136 - height: 100%; 174 + margin: 120px auto;
137 - width: 100%; 175 + }
138 - background-color: $bg; 176 + .tips {
139 - .login-form { 177 + font-size: 14px;
140 - position: absolute; 178 + color: #fff;
141 - left: 0; 179 + margin-bottom: 10px;
142 - right: 0; 180 + span {
143 - width: 520px; 181 + &:first-of-type {
144 - padding: 35px 35px 15px 35px; 182 + margin-right: 16px;
145 - margin: 120px auto; 183 + }
146 - }
147 - .tips {
148 - font-size: 14px;
149 - color: #fff;
150 - margin-bottom: 10px;
151 - span {
152 - &:first-of-type {
153 - margin-right: 16px;
154 } 184 }
155 } 185 }
156 - } 186 + .svg-container {
157 - .svg-container { 187 + padding: 6px 5px 6px 15px;
158 - padding: 6px 5px 6px 15px; 188 + color: $dark_gray;
159 - color: $dark_gray; 189 + vertical-align: middle;
160 - vertical-align: middle; 190 + width: 30px;
161 - width: 30px; 191 + display: inline-block;
162 - display: inline-block; 192 + &_login {
163 - &_login { 193 + font-size: 20px;
164 - font-size: 20px; 194 + }
195 + }
196 + .title {
197 + font-size: 26px;
198 + font-weight: 400;
199 + color: $light_gray;
200 + margin: 0px auto 40px auto;
201 + text-align: center;
202 + font-weight: bold;
203 + }
204 + .show-pwd {
205 + position: absolute;
206 + right: 10px;
207 + top: 7px;
208 + font-size: 16px;
209 + color: $dark_gray;
210 + cursor: pointer;
211 + user-select: none;
165 } 212 }
166 - }
167 - .title {
168 - font-size: 26px;
169 - font-weight: 400;
170 - color: $light_gray;
171 - margin: 0px auto 40px auto;
172 - text-align: center;
173 - font-weight: bold;
174 - }
175 - .show-pwd {
176 - position: absolute;
177 - right: 10px;
178 - top: 7px;
179 - font-size: 16px;
180 - color: $dark_gray;
181 - cursor: pointer;
182 - user-select: none;
183 } 213 }
184 } 214 }
185 </style> 215 </style>
......