From fad1b006cde6d64fbc0763ab4e40b3e91bf04b70 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Fri, 9 Sep 2022 11:25:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 53 ++++++++++++++++++++++++++------- package.json | 1 + src/layouts/header/index.vue | 12 +++++++- src/pages/about/list/index.vue | 4 +-- src/pages/index/list/index.vue | 54 ++++++++++++++++------------------ 5 files changed, 81 insertions(+), 43 deletions(-) diff --git a/package-lock.json b/package-lock.json index 948c93c..250f3eb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -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": { @@ -2771,9 +2771,19 @@ "dev": true, "optional": true }, + "bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", + "dev": true, + "optional": true, + "requires": { + "file-uri-to-path": "1.0.0" + } + }, "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" @@ -3863,6 +3873,11 @@ } } }, + "comutils": { + "version": "1.1.19", + "resolved": "https://registry.npmjs.org/comutils/-/comutils-1.1.19.tgz", + "integrity": "sha512-JxXB67juILiwhdLwOsYyjUqwWEhHdObI0EClOPk+JDtEuTbac59s0pxGpfCBnNNQ5JommifmcMGneW/4Cg7YWw==" + }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -3926,7 +3941,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 +4553,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 +5053,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": { @@ -6032,6 +6047,13 @@ } } }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "dev": true, + "optional": true + }, "filesize": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/filesize/-/filesize-2.0.4.tgz", @@ -6379,7 +6401,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", @@ -7210,7 +7232,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": { @@ -9593,7 +9615,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 +9932,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 +12488,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 +12497,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" @@ -14506,6 +14528,14 @@ "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.5.3.tgz", "integrity": "sha512-FUlILrW3DGitS2h+Xaw8aRNvGTwtuaxrRkNSHWTizOfLUie7wuYwezeZ50iflRn8YPV5kxmU2LQuu3nM/b3Zsg==" }, + "vue-seamless-scroll": { + "version": "1.1.23", + "resolved": "https://registry.npmjs.org/vue-seamless-scroll/-/vue-seamless-scroll-1.1.23.tgz", + "integrity": "sha512-HBjUub8WwsKJzbFCrwKPDrZn4e+SSbkKgwWtjKtfLwesiFGwSsVxP44/Z6d3kpXy94qIFOiflJH6l0/9pj7SGA==", + "requires": { + "comutils": "^1.1.9" + } + }, "vue-style-loader": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz", @@ -14633,6 +14663,7 @@ "dev": true, "optional": true, "requires": { + "bindings": "^1.5.0", "nan": "^2.12.1" } }, diff --git a/package.json b/package.json index 9421e3b..30d99cc 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "vue-pdf": "^4.3.0", "vue-quill-editor": "^3.0.6", "vue-router": "^3.5.3", + "vue-seamless-scroll": "^1.1.23", "vuedraggable": "^2.24.3", "vuex": "^3.6.2", "wow.js": "^1.2.2" diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue index c0ae077..a82cc95 100644 --- a/src/layouts/header/index.vue +++ b/src/layouts/header/index.vue @@ -21,7 +21,16 @@ export default { }, methods: { - + toIndex() { + // 如果是在首页，直接刷新页面，否则，跳转到首页，并且 + if (this.$route.path === '/index') { + location.reload() + } else { + this.$refs.nav.jump({ + index: '/index' + }) + } + } } }; @@ -41,6 +50,7 @@ $height: 64px; box-shadow: 0px 0px 6px 0px rgba(178, 178, 178, 0.32); .logo{ margin: 0 50px 0 63px; + cursor: pointer; } .nav-wrap { position: absolute; diff --git a/src/pages/about/list/index.vue b/src/pages/about/list/index.vue index a8d3575..9f55a34 100644 --- a/src/pages/about/list/index.vue +++ b/src/pages/about/list/index.vue @@ -13,7 +13,6 @@

HUORAN TECH

公司致力于采用业界领先的信息化技术和过硬的软件研发能力服务于各大高校、金融机构等行业，利用我司技术优势将区块链、云计算、大数据、人工智能等行业前沿技术与金融、教育等行业进行深度融合，为客户提供功能先进、运行高效且便于使用的产业信息化综合解决方案。

-

公司自组建以来已成功研发并交付多款信息化产品的定制项目。截至目前，或然累计服务包括河海大学、电科科技大学、四川大学、闽江学院、巢湖学院、山东财经大学等高校。

@@ -227,8 +226,7 @@ export default { color: #E5E5E5; } .desc{ - margin-bottom: 20px; - font-size: 14px; + font-size: 15px; color: #535C6E; line-height: 25px; } diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue index 41ae9da..62ccff1 100644 --- a/src/pages/index/list/index.vue +++ b/src/pages/index/list/index.vue @@ -215,23 +215,13 @@ - + + + @@ -278,13 +268,18 @@ import WOW from 'wow.js' import * as echarts from 'echarts' import 'echarts/map/js/china.js' import chinaFull from './chinaFull.json' +import scroll from 'vue-seamless-scroll' export default { name: 'index', data() { - return { - token: util.local.get(Setting.tokenKey), - active: '' - } + return { + token: util.local.get(Setting.tokenKey), + active: '', + clients: [1, 2, 3, 4, 5] + } + }, + components: { + scroll }, mounted() { new WOW().init() @@ -436,7 +431,7 @@ export default { index = -1 } }, 2000) - }, + } } }; @@ -539,7 +534,7 @@ export default { } .a-en { position: absolute; - top: -21px; + top: -28px; font-size: 46px; color: #B6C4D9; opacity: .7; @@ -878,10 +873,16 @@ export default { line-height: 33px; } } + .clients { + width: 1200px; + margin-top: 30px; + overflow: hidden; + } .client-list { display: flex; - flex-wrap: wrap; - margin-top: 30px; + &::-webkit-scrollbar { + display: none; + } li { display: flex; justify-content: center; @@ -892,9 +893,6 @@ export default { background-color: #fff; box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.0400); border: 1px solid #ECECEC; - &:nth-child(5n) { - margin-right: 0; - } } } .pics{