From 311cb02130aced774cc450ddcbbff018bbc53678 Mon Sep 17 00:00:00 2001 From: chutingting Date: Thu, 11 Jan 2024 13:09:16 +0800 Subject: [PATCH] edit css --- package-lock.json | 231 ++++++++++++++++++++++++++++++++++++--- src/router/index.js | 13 +-- src/views/home/index.vue | 4 +- 3 files changed, 222 insertions(+), 26 deletions(-) diff --git a/package-lock.json b/package-lock.json index bbb732b..52246ff 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2805,17 +2805,76 @@ "strip-ansi": "^6.0.0" } }, - "node_modules/@vue/compiler-sfc": { - "version": "2.7.16", - "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz", - "integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==", + "node_modules/@vue/compiler-core": { + "version": "3.4.8", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.8.tgz", + "integrity": "sha512-GjAwOydZV6UyVBi1lYW5v4jjfU6wOeyi3vBATKJOwV7muYF0/nZi4kfdJc0pwdT5lXwbbx57lyA2Y356rFpw1A==", + "dev": true, + "optional": true, + "peer": true, "dependencies": { - "@babel/parser": "^7.23.5", - "postcss": "^8.4.14", - "source-map": "^0.6.1" + "@babel/parser": "^7.23.6", + "@vue/shared": "3.4.8", + "entities": "^4.5.0", + "estree-walker": "^2.0.2", + "source-map-js": "^1.0.2" + } + }, + "node_modules/@vue/compiler-core/node_modules/entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "dev": true, + "optional": true, + "peer": true, + "engines": { + "node": ">=0.12" }, - "optionalDependencies": { - "prettier": "^1.18.2 || ^2.0.0" + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/@vue/compiler-dom": { + "version": "3.4.8", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.8.tgz", + "integrity": "sha512-GsPyji42zmkSJlaDFKXvwB97ukTlHzlFH/iVzPFYz/APnSzuhu/CMFQbsYmrtsnc2yscF39eC4rKzvKR27aBug==", + "dev": true, + "optional": true, + "peer": true, + "dependencies": { + "@vue/compiler-core": "3.4.8", + "@vue/shared": "3.4.8" + } + }, + "node_modules/@vue/compiler-sfc": { + "version": "3.4.8", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.8.tgz", + "integrity": "sha512-3ZcurOa6bQdZ6VZLtMqYSUZqpsMqfX0MC3oCxQG0VIJFCqouZAgRYJN1c8QvGs7HW5wW8aXVvUOQU0ILVlYHKA==", + "dev": true, + "optional": true, + "peer": true, + "dependencies": { + "@babel/parser": "^7.23.6", + "@vue/compiler-core": "3.4.8", + "@vue/compiler-dom": "3.4.8", + "@vue/compiler-ssr": "3.4.8", + "@vue/shared": "3.4.8", + "estree-walker": "^2.0.2", + "magic-string": "^0.30.5", + "postcss": "^8.4.32", + "source-map-js": "^1.0.2" + } + }, + "node_modules/@vue/compiler-ssr": { + "version": "3.4.8", + "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.8.tgz", + "integrity": "sha512-nxN79LHeAemhBpIa2PQ6rz57cW7W4C/XIJCOMSn2g49u6q2ekirmJI0osAOTErQPApOR0KwP2QyeTexX4zQCrw==", + "dev": true, + "optional": true, + "peer": true, + "dependencies": { + "@vue/compiler-dom": "3.4.8", + "@vue/shared": "3.4.8" } }, "node_modules/@vue/component-compiler-utils": { @@ -2920,6 +2979,14 @@ "webpack": ">=4.0.0" } }, + "node_modules/@vue/shared": { + "version": "3.4.8", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.8.tgz", + "integrity": "sha512-ChLCWzXiJboQ009oVkemhEoUdrxHme7v3ip+Kh+/kDDeF1WtHWGt0knRLGm1Y4YqCRTSs9QxsZIY8paJj5Szrw==", + "dev": true, + "optional": true, + "peer": true + }, "node_modules/@vue/web-component-wrapper": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz", @@ -7781,6 +7848,14 @@ "node": ">=4.0" } }, + "node_modules/estree-walker": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", + "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", + "dev": true, + "optional": true, + "peer": true + }, "node_modules/esutils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", @@ -10997,6 +11072,20 @@ "yallist": "^3.0.2" } }, + "node_modules/magic-string": { + "version": "0.30.5", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz", + "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==", + "dev": true, + "optional": true, + "peer": true, + "dependencies": { + "@jridgewell/sourcemap-codec": "^1.4.15" + }, + "engines": { + "node": ">=12" + } + }, "node_modules/make-dir": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", @@ -17662,6 +17751,19 @@ "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==", "dev": true }, + "node_modules/vue/node_modules/@vue/compiler-sfc": { + "version": "2.7.16", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz", + "integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==", + "dependencies": { + "@babel/parser": "^7.23.5", + "postcss": "^8.4.14", + "source-map": "^0.6.1" + }, + "optionalDependencies": { + "prettier": "^1.18.2 || ^2.0.0" + } + }, "node_modules/watchpack": { "version": "1.7.5", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz", @@ -20840,15 +20942,72 @@ "strip-ansi": "^6.0.0" } }, + "@vue/compiler-core": { + "version": "3.4.8", + "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.8.tgz", + "integrity": "sha512-GjAwOydZV6UyVBi1lYW5v4jjfU6wOeyi3vBATKJOwV7muYF0/nZi4kfdJc0pwdT5lXwbbx57lyA2Y356rFpw1A==", + "dev": true, + "optional": true, + "peer": true, + "requires": { + "@babel/parser": "^7.23.6", + "@vue/shared": "3.4.8", + "entities": "^4.5.0", + "estree-walker": "^2.0.2", + "source-map-js": "^1.0.2" + }, + "dependencies": { + "entities": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", + "dev": true, + "optional": true, + "peer": true + } + } + }, + "@vue/compiler-dom": { + "version": "3.4.8", + "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.8.tgz", + "integrity": "sha512-GsPyji42zmkSJlaDFKXvwB97ukTlHzlFH/iVzPFYz/APnSzuhu/CMFQbsYmrtsnc2yscF39eC4rKzvKR27aBug==", + "dev": true, + "optional": true, + "peer": true, + "requires": { + "@vue/compiler-core": "3.4.8", + "@vue/shared": "3.4.8" + } + }, "@vue/compiler-sfc": { - "version": "2.7.16", - "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz", - "integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==", + "version": "3.4.8", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.8.tgz", + "integrity": "sha512-3ZcurOa6bQdZ6VZLtMqYSUZqpsMqfX0MC3oCxQG0VIJFCqouZAgRYJN1c8QvGs7HW5wW8aXVvUOQU0ILVlYHKA==", + "dev": true, + "optional": true, + "peer": true, "requires": { - "@babel/parser": "^7.23.5", - "postcss": "^8.4.14", - "prettier": "^1.18.2 || ^2.0.0", - "source-map": "^0.6.1" + "@babel/parser": "^7.23.6", + "@vue/compiler-core": "3.4.8", + "@vue/compiler-dom": "3.4.8", + "@vue/compiler-ssr": "3.4.8", + "@vue/shared": "3.4.8", + "estree-walker": "^2.0.2", + "magic-string": "^0.30.5", + "postcss": "^8.4.32", + "source-map-js": "^1.0.2" + } + }, + "@vue/compiler-ssr": { + "version": "3.4.8", + "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.8.tgz", + "integrity": "sha512-nxN79LHeAemhBpIa2PQ6rz57cW7W4C/XIJCOMSn2g49u6q2ekirmJI0osAOTErQPApOR0KwP2QyeTexX4zQCrw==", + "dev": true, + "optional": true, + "peer": true, + "requires": { + "@vue/compiler-dom": "3.4.8", + "@vue/shared": "3.4.8" } }, "@vue/component-compiler-utils": { @@ -20926,6 +21085,14 @@ "dev": true, "requires": {} }, + "@vue/shared": { + "version": "3.4.8", + "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.8.tgz", + "integrity": "sha512-ChLCWzXiJboQ009oVkemhEoUdrxHme7v3ip+Kh+/kDDeF1WtHWGt0knRLGm1Y4YqCRTSs9QxsZIY8paJj5Szrw==", + "dev": true, + "optional": true, + "peer": true + }, "@vue/web-component-wrapper": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz", @@ -24786,6 +24953,14 @@ "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", "dev": true }, + "estree-walker": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", + "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", + "dev": true, + "optional": true, + "peer": true + }, "esutils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", @@ -27289,6 +27464,17 @@ "yallist": "^3.0.2" } }, + "magic-string": { + "version": "0.30.5", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz", + "integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==", + "dev": true, + "optional": true, + "peer": true, + "requires": { + "@jridgewell/sourcemap-codec": "^1.4.15" + } + }, "make-dir": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", @@ -32511,6 +32697,19 @@ "requires": { "@vue/compiler-sfc": "2.7.16", "csstype": "^3.1.0" + }, + "dependencies": { + "@vue/compiler-sfc": { + "version": "2.7.16", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz", + "integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==", + "requires": { + "@babel/parser": "^7.23.5", + "postcss": "^8.4.14", + "prettier": "^1.18.2 || ^2.0.0", + "source-map": "^0.6.1" + } + } } }, "vue-eslint-parser": { diff --git a/src/router/index.js b/src/router/index.js index 9ce393d..5ca9795 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -77,13 +77,10 @@ const router = new VueRouter({ routes }) -// router.beforeEach(function (to, from, next) { -// if (!localStorage.getItem('loginName')) { -// if (to.path !== '/login') { -// return next('/login') -// } -// } -// next() -// }) +router.beforeEach(function (to, from, next) { + document.body.scrollTop = 0 + document.documentElement.scrollTop = 0 + next() +}) export default router diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 2179fcb..f6f8849 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -355,7 +355,6 @@ export default { .logo { left: 0; width: 165px; - height: 45px; } .content { .top { @@ -374,6 +373,7 @@ export default { text-align: left; margin-right: 50px; width: 90%; + margin-top: 50px; .title { border-left: 7px solid #07CAAF; font-size: 36px; @@ -397,7 +397,7 @@ export default { .btn { width:100%; position: absolute; - bottom: 55px; + bottom: 90px; .more { position: absolute; left: 0px;