From a2c1ebe19aac025fc1aa735715971d12935e98fa Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Mon, 26 Nov 2018 15:34:45 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=87=8F=E5=B0=8F=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=B4=E9=9A=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 7a8d9e61455d56879131cdb297202b7ce95f0385 [formerly 7a8d9e61455d56879131cdb297202b7ce95f0385 [formerly 7a8d9e61455d56879131cdb297202b7ce95f0385 [formerly 7a8d9e61455d56879131cdb297202b7ce95f0385 [formerly c2c04f2e0e6656f008849cfd0ec3ab6d47f82a85 [formerly cc7036a55e40d5c29c89f1771ad758dda05c9f05]]]]] Former-commit-id: b91a42d309a9981f30031ddb228e92b6d78b09af Former-commit-id: 42c088c3a37a8867e10213bbffc960ab28d68133 Former-commit-id: 23140be1dc8a05bb3f8550c5adcf760d7b213eb6 [formerly 8195b3f020f51edf43765d9e1b68e20efee9f9e9] Former-commit-id: a3c37c056a1e6b82325792bf5c37043ed345a05e Former-commit-id: 70ae363d49743fe781b43bae4387975f13de822e Former-commit-id: f7701e177011081c05119f7aa905c0cd67e2cd51 Former-commit-id: d0cd2d49d5208cb0916f3788473f4c6074c02957 Former-commit-id: e3f33bea9e3a3f3e59cb89d235c5b6eee6f55ead --- src/components/d2-container/components/d2-source.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/d2-container/components/d2-source.vue b/src/components/d2-container/components/d2-source.vue index 4993f4fb..35e4353c 100644 --- a/src/components/d2-container/components/d2-source.vue +++ b/src/components/d2-container/components/d2-source.vue @@ -25,7 +25,7 @@ export default { // 一秒后显示按钮 setTimeout(() => { this.isActive = true - }, 1000) + }, 500) }, methods: { // 点击按钮的时候跳转到源代码 From 8e91993750ac29568f284ea9177184f7cf965717 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 27 Nov 2018 10:51:48 +0800 Subject: [PATCH 2/4] new page Former-commit-id: a01298bf12c6a5e0fab2ee14370537cfa361fd2d [formerly a01298bf12c6a5e0fab2ee14370537cfa361fd2d [formerly a01298bf12c6a5e0fab2ee14370537cfa361fd2d [formerly a01298bf12c6a5e0fab2ee14370537cfa361fd2d [formerly 85cca94ffb981e86c46fb3aeca3a08038d70f6b8 [formerly 256de8e7c848da6cf54d56f42bcdc71db7a5b0a4]]]]] Former-commit-id: e04a769ce616e8449aa76848d6a29c326ff30db9 Former-commit-id: ed5596eaae066fc2c2f58a080b8e53cdc68678b3 Former-commit-id: 880808789ecbbf7c8857400c2f2cb1975d449c34 [formerly 47b402819e0b7e957ad04814a3cfa5bb631c4686] Former-commit-id: d9c42554f75ed5e9962bad8202124bba3437b9ea Former-commit-id: 675a01ca4c3af26dfc83c8a8c2813e51abab8a3b Former-commit-id: 83c56fd6a1b6cf34f341d926b5b6cc9c6942ef5d Former-commit-id: 92a2bb04851bec6b2774dfea6c77e8f635ceff68 Former-commit-id: 131b1371a791cde9d4db97d7c1347215f12edde8 --- package-lock.json.REMOVED.git-id | 1 + package.json | 1 - src/pages/login/config/README.md | 2 - src/pages/login/config/bubble.js | 112 ------------ src/pages/login/config/default.js | 112 ------------ src/pages/login/config/nasa.js | 112 ------------ src/pages/login/config/snow.js | 112 ------------ src/pages/login/image/logo.png.REMOVED.git-id | 1 - .../login/image/logo@2x.png.REMOVED.git-id | 1 + src/pages/login/page.vue | 160 ------------------ src/pages/login/page.vue.REMOVED.git-id | 1 + src/pages/login/style.scss | 89 ---------- 12 files changed, 3 insertions(+), 701 deletions(-) create mode 100644 package-lock.json.REMOVED.git-id delete mode 100644 src/pages/login/config/README.md delete mode 100644 src/pages/login/config/bubble.js delete mode 100644 src/pages/login/config/default.js delete mode 100644 src/pages/login/config/nasa.js delete mode 100644 src/pages/login/config/snow.js delete mode 100644 src/pages/login/image/logo.png.REMOVED.git-id create mode 100644 src/pages/login/image/logo@2x.png.REMOVED.git-id delete mode 100644 src/pages/login/page.vue create mode 100644 src/pages/login/page.vue.REMOVED.git-id delete mode 100644 src/pages/login/style.scss diff --git a/package-lock.json.REMOVED.git-id b/package-lock.json.REMOVED.git-id new file mode 100644 index 00000000..2f1b1384 --- /dev/null +++ b/package-lock.json.REMOVED.git-id @@ -0,0 +1 @@ +273bfaa679d4398e12f5270f76df4e1953da170b \ No newline at end of file diff --git a/package.json b/package.json index f5477f82..933903c7 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,6 @@ "mockjs": "^1.0.1-beta3", "nprogress": "^0.2.0", "papaparse": "^4.3.6", - "particles.js": "^2.0.0", "quill": "^1.3.4", "screenfull": "^3.3.2", "simplemde": "^1.11.2", diff --git a/src/pages/login/config/README.md b/src/pages/login/config/README.md deleted file mode 100644 index 87be2291..00000000 --- a/src/pages/login/config/README.md +++ /dev/null @@ -1,2 +0,0 @@ -// 例子插件配置地址 -// https://vincentgarreau.com/particles.js/#default \ No newline at end of file diff --git a/src/pages/login/config/bubble.js b/src/pages/login/config/bubble.js deleted file mode 100644 index 7fd19c0d..00000000 --- a/src/pages/login/config/bubble.js +++ /dev/null @@ -1,112 +0,0 @@ -/* eslint-disable */ - -export default { - "particles": { - "number": { - "value": 6, - "density": { - "enable": true, - "value_area": 800 - } - }, - "color": { - "value": "#444" - }, - "shape": { - "type": "polygon", - "stroke": { - "width": 0, - "color": "#000" - }, - "polygon": { - "nb_sides": 6 - }, - "image": { - "src": "img/github.svg", - "width": 100, - "height": 100 - } - }, - "opacity": { - "value": 0.3, - "random": true, - "anim": { - "enable": false, - "speed": 1, - "opacity_min": 0.1, - "sync": false - } - }, - "size": { - "value": 160, - "random": false, - "anim": { - "enable": true, - "speed": 10, - "size_min": 40, - "sync": false - } - }, - "line_linked": { - "enable": false, - "distance": 200, - "color": "#ffffff", - "opacity": 1, - "width": 2 - }, - "move": { - "enable": true, - "speed": 8, - "direction": "none", - "random": false, - "straight": false, - "out_mode": "out", - "bounce": false, - "attract": { - "enable": false, - "rotateX": 600, - "rotateY": 1200 - } - } - }, - "interactivity": { - "detect_on": "canvas", - "events": { - "onhover": { - "enable": false, - "mode": "grab" - }, - "onclick": { - "enable": false, - "mode": "push" - }, - "resize": true - }, - "modes": { - "grab": { - "distance": 400, - "line_linked": { - "opacity": 1 - } - }, - "bubble": { - "distance": 400, - "size": 40, - "duration": 2, - "opacity": 8, - "speed": 3 - }, - "repulse": { - "distance": 200, - "duration": 0.4 - }, - "push": { - "particles_nb": 4 - }, - "remove": { - "particles_nb": 2 - } - } - }, - "retina_detect": true -} diff --git a/src/pages/login/config/default.js b/src/pages/login/config/default.js deleted file mode 100644 index b199917f..00000000 --- a/src/pages/login/config/default.js +++ /dev/null @@ -1,112 +0,0 @@ -/* eslint-disable */ - -export default { - "particles": { - "number": { - "value": 80, - "density": { - "enable": true, - "value_area": 800 - } - }, - "color": { - "value": "#DCDFE6" - }, - "shape": { - "type": "circle", - "stroke": { - "width": 0, - "color": "#000000" - }, - "polygon": { - "nb_sides": 5 - }, - "image": { - "src": "img/github.svg", - "width": 100, - "height": 100 - } - }, - "opacity": { - "value": 1, - "random": false, - "anim": { - "enable": false, - "speed": 1, - "opacity_min": 0.1, - "sync": false - } - }, - "size": { - "value": 4, - "random": true, - "anim": { - "enable": false, - "speed": 40, - "size_min": 0.1, - "sync": false - } - }, - "line_linked": { - "enable": true, - "distance": 150, - "color": "#DCDFE6", - "opacity": 0.4, - "width": 2 - }, - "move": { - "enable": true, - "speed": 6, - "direction": "none", - "random": false, - "straight": false, - "out_mode": "out", - "bounce": false, - "attract": { - "enable": false, - "rotateX": 600, - "rotateY": 1200 - } - } - }, - "interactivity": { - "detect_on": "canvas", - "events": { - "onhover": { - "enable": true, - "mode": "repulse" - }, - "onclick": { - "enable": true, - "mode": "push" - }, - "resize": true - }, - "modes": { - "grab": { - "distance": 400, - "line_linked": { - "opacity": 1 - } - }, - "bubble": { - "distance": 400, - "size": 40, - "duration": 2, - "opacity": 8, - "speed": 3 - }, - "repulse": { - "distance": 200, - "duration": 0.4 - }, - "push": { - "particles_nb": 4 - }, - "remove": { - "particles_nb": 2 - } - } - }, - "retina_detect": true -} diff --git a/src/pages/login/config/nasa.js b/src/pages/login/config/nasa.js deleted file mode 100644 index 4baf4feb..00000000 --- a/src/pages/login/config/nasa.js +++ /dev/null @@ -1,112 +0,0 @@ -/* eslint-disable */ - -export default { - "particles": { - "number": { - "value": 160, - "density": { - "enable": true, - "value_area": 800 - } - }, - "color": { - "value": "#ffffff" - }, - "shape": { - "type": "circle", - "stroke": { - "width": 0, - "color": "#000000" - }, - "polygon": { - "nb_sides": 5 - }, - "image": { - "src": "img/github.svg", - "width": 100, - "height": 100 - } - }, - "opacity": { - "value": 1, - "random": true, - "anim": { - "enable": true, - "speed": 1, - "opacity_min": 0, - "sync": false - } - }, - "size": { - "value": 3, - "random": true, - "anim": { - "enable": false, - "speed": 4, - "size_min": 0.3, - "sync": false - } - }, - "line_linked": { - "enable": false, - "distance": 150, - "color": "#ffffff", - "opacity": 0.4, - "width": 1 - }, - "move": { - "enable": true, - "speed": 1, - "direction": "none", - "random": true, - "straight": false, - "out_mode": "out", - "bounce": false, - "attract": { - "enable": false, - "rotateX": 600, - "rotateY": 600 - } - } - }, - "interactivity": { - "detect_on": "canvas", - "events": { - "onhover": { - "enable": true, - "mode": "bubble" - }, - "onclick": { - "enable": true, - "mode": "repulse" - }, - "resize": true - }, - "modes": { - "grab": { - "distance": 400, - "line_linked": { - "opacity": 1 - } - }, - "bubble": { - "distance": 250, - "size": 0, - "duration": 2, - "opacity": 0, - "speed": 3 - }, - "repulse": { - "distance": 400, - "duration": 0.4 - }, - "push": { - "particles_nb": 4 - }, - "remove": { - "particles_nb": 2 - } - } - }, - "retina_detect": true -} diff --git a/src/pages/login/config/snow.js b/src/pages/login/config/snow.js deleted file mode 100644 index 31948b45..00000000 --- a/src/pages/login/config/snow.js +++ /dev/null @@ -1,112 +0,0 @@ -/* eslint-disable */ - -export default { - "particles": { - "number": { - "value": 400, - "density": { - "enable": true, - "value_area": 800 - } - }, - "color": { - "value": "#fff" - }, - "shape": { - "type": "circle", - "stroke": { - "width": 0, - "color": "#000000" - }, - "polygon": { - "nb_sides": 5 - }, - "image": { - "src": "img/github.svg", - "width": 100, - "height": 100 - } - }, - "opacity": { - "value": 0.5, - "random": true, - "anim": { - "enable": false, - "speed": 1, - "opacity_min": 0.1, - "sync": false - } - }, - "size": { - "value": 10, - "random": true, - "anim": { - "enable": false, - "speed": 40, - "size_min": 0.1, - "sync": false - } - }, - "line_linked": { - "enable": false, - "distance": 500, - "color": "#ffffff", - "opacity": 0.4, - "width": 2 - }, - "move": { - "enable": true, - "speed": 6, - "direction": "bottom", - "random": false, - "straight": false, - "out_mode": "out", - "bounce": false, - "attract": { - "enable": false, - "rotateX": 600, - "rotateY": 1200 - } - } - }, - "interactivity": { - "detect_on": "canvas", - "events": { - "onhover": { - "enable": true, - "mode": "bubble" - }, - "onclick": { - "enable": true, - "mode": "repulse" - }, - "resize": true - }, - "modes": { - "grab": { - "distance": 400, - "line_linked": { - "opacity": 0.5 - } - }, - "bubble": { - "distance": 400, - "size": 4, - "duration": 0.3, - "opacity": 1, - "speed": 3 - }, - "repulse": { - "distance": 200, - "duration": 0.4 - }, - "push": { - "particles_nb": 4 - }, - "remove": { - "particles_nb": 2 - } - } - }, - "retina_detect": true -} diff --git a/src/pages/login/image/logo.png.REMOVED.git-id b/src/pages/login/image/logo.png.REMOVED.git-id deleted file mode 100644 index b6991139..00000000 --- a/src/pages/login/image/logo.png.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -f29a9f7890b5e19744437a623f72248bb9698bb3 \ No newline at end of file diff --git a/src/pages/login/image/logo@2x.png.REMOVED.git-id b/src/pages/login/image/logo@2x.png.REMOVED.git-id new file mode 100644 index 00000000..c2d6a17e --- /dev/null +++ b/src/pages/login/image/logo@2x.png.REMOVED.git-id @@ -0,0 +1 @@ +f37e18711a040d8dd2ad2af9cfb9f4ea6760c07a \ No newline at end of file diff --git a/src/pages/login/page.vue b/src/pages/login/page.vue deleted file mode 100644 index 2a81f5e8..00000000 --- a/src/pages/login/page.vue +++ /dev/null @@ -1,160 +0,0 @@ - - - - - diff --git a/src/pages/login/page.vue.REMOVED.git-id b/src/pages/login/page.vue.REMOVED.git-id new file mode 100644 index 00000000..d8ffdd5a --- /dev/null +++ b/src/pages/login/page.vue.REMOVED.git-id @@ -0,0 +1 @@ +90001d614533eeb7b3390bc26ff8db6a97d1b096 \ No newline at end of file diff --git a/src/pages/login/style.scss b/src/pages/login/style.scss deleted file mode 100644 index 5fc44ca4..00000000 --- a/src/pages/login/style.scss +++ /dev/null @@ -1,89 +0,0 @@ -.login-page { - background-color: #EDF4FA; - height: 100%; - position: relative; - // 层 - .layer { - position: absolute; - height: 100%; - width: 100%; - &.flex-center { - display: flex; - justify-content: center; - align-items: center; - flex-direction: column; - } - } - // 背景 - .bg { - canvas { - display: block; - margin: 0px; - padding: 0px; - } - } - // logo - .logo-group { - margin-top: -75px - 70px; - position: relative; - top: 75px; - img { - height: 140px; - } - } - // 登录表单 - .form-group { - width: 300px; - // 重新设置卡片阴影 - .el-card { - box-shadow: 0 0 8px 0 rgba(232,237,250,.6), 0 2px 4px 0 rgba(232,237,250,.5); - .el-card__body { - padding-top: 70px; - } - } - // 登录按钮 - .button-login { - width: 100%; - } - // 输入框左边的图表区域缩窄 - .el-input-group__prepend { - padding: 0px 14px; - } - .login-code { - height: 40px - 2px; - display: block; - margin: 0px -20px; - border-top-right-radius: 2px; - border-bottom-right-radius: 2px; - } - } - // 帮助按钮 - .button-help { - width: 300px; - margin-top: 20px; - } - .user-btn { - @extend %flex-center-col; - @extend %unable-select; - padding: 10px 0px; - border-radius: 4px; - &:hover { - background-color: $color-bg; - i { - color: $color-text-normal; - } - span { - color: $color-text-normal; - } - } - i { - font-size: 36px; - color: $color-text-sub; - } - span { - font-size: 12px; - margin-top: 10px; - color: $color-text-sub; - } - } -} \ No newline at end of file From 4b925d93ed2d66242df991f49fca4d3c6ac0fa8c Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 27 Nov 2018 10:53:25 +0800 Subject: [PATCH 3/4] v Former-commit-id: 910ad779c33260ddd5bd015d53d77b0b09a282bd [formerly 910ad779c33260ddd5bd015d53d77b0b09a282bd [formerly 910ad779c33260ddd5bd015d53d77b0b09a282bd [formerly 910ad779c33260ddd5bd015d53d77b0b09a282bd [formerly 44d90fb7cb3d31f34cf99cf3557fb412a7b14158 [formerly 1ec289b13252b747efa8f053b14892d7fd14815f]]]]] Former-commit-id: 503e7bd8913e5fbca128af0266df9dc1213ca176 Former-commit-id: 327693ac954c9d489ae4272e692701fa30fedc48 Former-commit-id: 0c70794761f4dbc1093a8c9f4018674af3769087 [formerly df642810363b130e2f6d76f2bf9f07c1692481b4] Former-commit-id: 85ee4dbc7053307e735be52c921273f0bbeb292f Former-commit-id: a906af6aa186334c4691a45059fd240da8223d71 Former-commit-id: 2dd7708efd8014380e7f418351d050f93dc5a54f Former-commit-id: 59fa26626a8052ab99cdc6821457e14931b69782 Former-commit-id: e289df2145c5eb5451a3dd0d06ac8146199e9971 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 933903c7..305788dc 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "d2-admin", - "version": "1.6.7", + "version": "1.6.8", "private": true, "scripts": { "serve": "vue-cli-service serve --open", From 34bb5b22479dd42fecdca2520c12d4c4e51239bf Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 27 Nov 2018 11:09:20 +0800 Subject: [PATCH 4/4] style update Former-commit-id: 66138f208105734363b6450831ef7c63bd7a0010 [formerly 66138f208105734363b6450831ef7c63bd7a0010 [formerly 66138f208105734363b6450831ef7c63bd7a0010 [formerly 66138f208105734363b6450831ef7c63bd7a0010 [formerly 0ef1248ceb32233e1ed42b77a65ad7ddf41e8177 [formerly cf4ab6894049d703a0803733c849ccfce06ab88f]]]]] Former-commit-id: 24952048b53521d643c886f35c32695bc8402c22 Former-commit-id: 1d47626364f3dc04fe56fd93d9d5573639b648b3 Former-commit-id: 87c60577b17f96fd65d761bc0ca1bff9724d9571 [formerly 41d351f2fa10922513a74e4ef54dde9a54200b31] Former-commit-id: 01262fccc646299f95b64458579fd7d898b27cc4 Former-commit-id: c91dc2b2fc364da3c83bdc6c6239ca669c1586e4 Former-commit-id: 0fd692c1ce29dac70c596107f0d81fb841808637 Former-commit-id: 667db7e737956e7c99980f36e028739c29bbecf4 Former-commit-id: d04c370f8294274131b7459b9ee736d662e2700f --- src/pages/login/page.vue.REMOVED.git-id | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/login/page.vue.REMOVED.git-id b/src/pages/login/page.vue.REMOVED.git-id index d8ffdd5a..0dcc1eb9 100644 --- a/src/pages/login/page.vue.REMOVED.git-id +++ b/src/pages/login/page.vue.REMOVED.git-id @@ -1 +1 @@ -90001d614533eeb7b3390bc26ff8db6a97d1b096 \ No newline at end of file +6c5a0e1b91c5fe254348745d01ffcf909811946f \ No newline at end of file