diff --git a/package-lock.json b/package-lock.json index 6380927..a27f03c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "粒子研究院", + "name": "vue-manage-system", "version": "4.2.0", "lockfileVersion": 1, "requires": true, @@ -2428,7 +2428,7 @@ }, "async-foreach": { "version": "0.1.3", - "resolved": "https://registry.npmjs.org/async-foreach/-/async-foreach-0.1.3.tgz", + "resolved": "https://registry.npm.taobao.org/async-foreach/download/async-foreach-0.1.3.tgz", "integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=" }, "async-limiter": { @@ -2773,7 +2773,7 @@ }, "block-stream": { "version": "0.0.9", - "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", + "resolved": "https://registry.npm.taobao.org/block-stream/download/block-stream-0.0.9.tgz", "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", "requires": { "inherits": "~2.0.0" @@ -3926,7 +3926,7 @@ }, "console-control-strings": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "resolved": "https://registry.npm.taobao.org/console-control-strings/download/console-control-strings-1.1.0.tgz", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" }, "consolidate": { @@ -4538,7 +4538,7 @@ }, "cssfilter": { "version": "0.0.10", - "resolved": "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz", + "resolved": "https://registry.npm.taobao.org/cssfilter/download/cssfilter-0.0.10.tgz", "integrity": "sha1-xtJnJjKi5cg+AT5oZKQs6N79IK4=" }, "cssnano": { @@ -5038,7 +5038,7 @@ }, "delegates": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "resolved": "https://registry.npm.taobao.org/delegates/download/delegates-1.0.0.tgz", "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" }, "depd": { @@ -6351,7 +6351,6 @@ "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", - "dev": true, "optional": true }, "fstream": { @@ -6379,7 +6378,7 @@ }, "gauge": { "version": "2.7.4", - "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "resolved": "https://registry.nlark.com/gauge/download/gauge-2.7.4.tgz", "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "requires": { "aproba": "^1.0.3", @@ -6673,6 +6672,13 @@ "requires": { "lru-cache": "2", "sigmund": "~1.0.0" + }, + "dependencies": { + "lru-cache": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", + "integrity": "sha512-WpibWJ60c3AgAz8a2iYErDrcT2C7OmKnsWhIcHOjkUHFjkXncJhtLxNSqUmxRxRunpb5I8Vprd7aNSd2NtksJQ==" + } } } } @@ -7210,7 +7216,7 @@ }, "has-unicode": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "resolved": "https://registry.npm.taobao.org/has-unicode/download/has-unicode-2.0.1.tgz", "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" }, "has-value": { @@ -8840,9 +8846,9 @@ "dev": true }, "lru-cache": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz", - "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=" + "version": "7.14.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.14.1.tgz", + "integrity": "sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==" }, "make-dir": { "version": "3.1.0", @@ -9396,7 +9402,7 @@ }, "semver": { "version": "5.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "resolved": "https://registry.nlark.com/semver/download/semver-5.3.0.tgz?cache=0&sync_timestamp=1618847119601&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsemver%2Fdownload%2Fsemver-5.3.0.tgz", "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=" } } @@ -9593,7 +9599,7 @@ }, "nopt": { "version": "3.0.6", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "resolved": "https://registry.npm.taobao.org/nopt/download/nopt-3.0.6.tgz?cache=0&sync_timestamp=1597649905420&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnopt%2Fdownload%2Fnopt-3.0.6.tgz", "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", "requires": { "abbrev": "1" @@ -9910,7 +9916,7 @@ }, "os-tmpdir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "resolved": "https://registry.npm.taobao.org/os-tmpdir/download/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" }, "osenv": { @@ -12466,7 +12472,7 @@ }, "scss-tokenizer": { "version": "0.2.3", - "resolved": "https://registry.npmjs.org/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz", + "resolved": "https://registry.npm.taobao.org/scss-tokenizer/download/scss-tokenizer-0.2.3.tgz", "integrity": "sha1-jrBtualyMzOCTT9VMGQRSYR85dE=", "requires": { "js-base64": "^2.1.8", @@ -12475,7 +12481,7 @@ "dependencies": { "source-map": { "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "resolved": "https://registry.npm.taobao.org/source-map/download/source-map-0.4.4.tgz?cache=0&sync_timestamp=1589682764497&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsource-map%2Fdownload%2Fsource-map-0.4.4.tgz", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "requires": { "amdefine": ">=0.0.4" @@ -12709,6 +12715,14 @@ "integrity": "sha512-Vpfqwm4EnqGdlsBFNmHhxhElJYrdfcxPThu+ryKS5J8L/fhAwLazFZtq+S+TWZ9ANj2piSQLGj6NQg+lKPmxrw==", "dev": true }, + "shifty": { + "version": "2.19.1", + "resolved": "https://registry.npmjs.org/shifty/-/shifty-2.19.1.tgz", + "integrity": "sha512-7h420vwC2B0IW+v7UlofcEyXwVjslssNHJwPO8nHfI1UC7MSTEdssG21GcoQpULC6+ySo1akQGk5hxVmy16z5A==", + "requires": { + "fsevents": "^2.3.2" + } + }, "side-channel": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", @@ -14435,6 +14449,14 @@ "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz", "integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==" }, + "vue-animate-number": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/vue-animate-number/-/vue-animate-number-0.4.2.tgz", + "integrity": "sha512-VqImyD8SRUfXCr42YCyuM/9tyQ8mUK7DTzVoZ0rP6Uqb5r+433UDJYPniexsIL0RxZF2ojGF+zqRhLB07H8c9Q==", + "requires": { + "shifty": "^2.0.2" + } + }, "vue-cropperjs": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/vue-cropperjs/-/vue-cropperjs-3.0.0.tgz", diff --git a/package.json b/package.json index 9421e3b..0809c3d 100644 --- a/package.json +++ b/package.json @@ -17,8 +17,10 @@ "html2canvas": "^1.3.2", "js-cookie": "^2.2.1", "jspdf": "^2.4.0", + "lru-cache": "^7.14.1", "mavon-editor": "^2.9.1", "vue": "^2.6.14", + "vue-animate-number": "^0.4.2", "vue-cropperjs": "^3.0.0", "vue-i18n": "^8.26.5", "vue-pdf": "^4.3.0", diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue index 42b33d9..0e200bc 100644 --- a/src/layouts/header/index.vue +++ b/src/layouts/header/index.vue @@ -14,7 +14,9 @@
- + + +
@@ -144,23 +146,26 @@ $height: 90px; position: absolute; top: 67px; right: 89px; + display: flex; padding: 10px; background-color: #fff; .icon { - position: absolute; - top: 20px; - right: 22px; - font-size: 16px; - color: #959595; + display: inline-flex; + justify-content: center; + align-items: center; + width: 46px; + height: 46px; + background: #1583FF; + border-radius: 0px 6px 6px 0px; cursor: pointer; } input { width: 300px; - height: 36px; + height: 46px; padding: 0 40px 0 15px; font-size: 16px; color: #333; - line-height: 36px; + line-height: 46px; background-color: #f5f5f5; border: 0; border-radius: 4px; diff --git a/src/main.js b/src/main.js index b87e07b..1cb3f73 100644 --- a/src/main.js +++ b/src/main.js @@ -17,6 +17,7 @@ import Util from '@/libs/util' // 插件 import plugins from "@/plugins"; import filters from "@/plugins/filters"; +import VueAnimateNumber from 'vue-animate-number' Vue.use(plugins); @@ -30,6 +31,7 @@ Vue.prototype.$put = put; Vue.prototype.core = core Vue.config.productionTip = false; Vue.use(VueI18n); +Vue.use(VueAnimateNumber); Vue.use(ElementUI, { size: "small" }); const siteId = Util.getQuery('siteId') diff --git a/src/pages/about/index.vue b/src/pages/about/index.vue index 19bf9d5..cb30a8c 100644 --- a/src/pages/about/index.vue +++ b/src/pages/about/index.vue @@ -353,7 +353,10 @@ export default { background-color: #F5F5F5; transition: .3s; &:hover { - transform: scale(1.05); + background-color: #ff8b1d; + h6, .des { + color: #fff; + } } &:last-child { margin-right: 0; @@ -367,10 +370,12 @@ export default { margin: 35px 0 5px; font-size: 24px; color: #272727; + transition: .3s; } .des { font-size: 16px; color: #757575; + transition: .3s; } } .staff { @@ -380,6 +385,10 @@ export default { transition: .3s; &:hover { transform: scale(1.05); + background-color: #c993ff; + h6, .des { + color: #fff; + } } .staff-inner { width: 1581px; @@ -392,12 +401,14 @@ export default { margin-bottom: 30px; font-size: 30px; color: #333; + transition: .3s; @include mul-ellipsis(3); } .des { font-size: 20px; color: #333; line-height: 34px; + transition: .3s; } .pic { width: 53%; diff --git a/src/pages/application/index.vue b/src/pages/application/index.vue index 49e13fa..0efc8d9 100644 --- a/src/pages/application/index.vue +++ b/src/pages/application/index.vue @@ -210,6 +210,10 @@ export default { transition: .3s; &:hover { transform: scale(1.05); + .text { + color: #fff; + background-color: #394f6d; + } } &:nth-child(3n) { margin-right: 0; @@ -231,6 +235,7 @@ export default { text-align: center; color: #272727; background-color: #F5F5F5; + transition: .3s; } } .news-block { diff --git a/src/pages/column/index.vue b/src/pages/column/index.vue index 1c8ffc5..d6565ce 100644 --- a/src/pages/column/index.vue +++ b/src/pages/column/index.vue @@ -451,7 +451,7 @@ export default { } .sub { margin-top: 10px; - font-size: 32px; + font-size: 28px; } } .column-wrap { diff --git a/src/pages/column/result.vue b/src/pages/column/result.vue index 7b3bc07..43f0564 100644 --- a/src/pages/column/result.vue +++ b/src/pages/column/result.vue @@ -4,9 +4,7 @@

包含 “{{ title }}” 的搜索结果

@@ -110,6 +108,7 @@ export default { } } .search { + position: relative; display: inline-flex; height: 62px; margin-right: 30px; @@ -125,18 +124,18 @@ export default { background: #F7F7F7; } .icon { - display: inline-flex; - justify-content: center; - align-items: center; - width: 62px; - height: 62px; - background: #1583FF; + position: absolute; + top: 17px; + right: 15px; + font-size: 26px; + color: #ccc; border-radius: 0px 6px 6px 0px; } } .list { li { - margin-top: 60px; + margin-top: 30px; + border-bottom: 1px dashed #e3e3e3; } h6 { margin-bottom: 10px; @@ -151,6 +150,9 @@ export default { color: #333; @include mul-ellipsis(2); } + .breadcrumb { + margin: 15px 0 30px; + } } .none { margin-top: 118px; diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue index 2f67bdd..784029b 100644 --- a/src/pages/home/index.vue +++ b/src/pages/home/index.vue @@ -84,6 +84,7 @@