diff --git a/package-lock.json b/package-lock.json index 8e08926..0b55790 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8308,6 +8308,11 @@ "integrity": "sha1-FC0RHzpuPa6PSpr9d9RYVbWpzOM=", "dev": true }, + "jquery": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz", + "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==" + }, "js-base64": { "version": "2.6.4", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.4.tgz", diff --git a/package.json b/package.json index 839ecae..93a255d 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "element-theme": "^2.0.1", "element-ui": "^2.15.6", "html2canvas": "^1.3.2", + "jquery": "^3.7.1", "js-cookie": "^2.2.1", "jspdf": "^2.4.0", "lru-cache": "^7.14.1", diff --git a/src/components/rightColumns/index.vue b/src/components/rightColumns/index.vue index 47f20fd..9246613 100644 --- a/src/components/rightColumns/index.vue +++ b/src/components/rightColumns/index.vue @@ -9,27 +9,41 @@ node-key="id" @node-click="columnTo"> -
{{$t('column.hot')}}
-{{ item.title }}
- {{ item.releaseTime }} -{{ $t('column.latestNews') }}
+{{ item.title }}
+ {{ item.releaseTime }} +{{$t('column.hot')}}
+{{ item.title }}
+ {{ item.releaseTime }} +{{$t('column.latestNews')}}
-{{ item.title }}
- {{ item.releaseTime }} -{{$t('column.latestNews')}}
+{{ item.title }}
+ {{ item.releaseTime }} +
@@ -383,13 +402,11 @@
{{ $t('column.hot') }}
-{{ item.title }}
- {{ item.releaseTime }} -{{ $t('column.latestNews') }}
-{{ item.title }}
- {{ item.releaseTime }} -{{ $t('column.latestNews') }}
+{{ item.title }}
+ {{ item.releaseTime }} +{{ $t('column.hot') }}
+{{ item.title }}
+ {{ item.releaseTime }} +{{ $t('column.latestNews') }}
+{{ item.title }}
+ {{ item.releaseTime }} +10) { + if (this.lastScrollTop < scrollTop && !this.hide) { + // this.hide = true + // document.querySelector(`#part2`).scrollIntoView({ + // behavior: 'smooth' + // }) this.hide = true - } else if (this.lastScrollTop > scrollTop && scrollTop <= (window.innerWidth / 2.03)) { + setTimeout(() => { + $(window).scrollTop(100) + // window.scrollTo({ + // top: window.innerWidth / 2.03, + // behavior: 'smooth' // 平滑滚动 + // }); + // this.scrollTop(window.innerWidth / 2.03, 200) + }, 300) + + } else if (this.lastScrollTop > scrollTop && scrollTop == 0 && this.hide) { + // this.hide = false + // document.querySelector(`#part1`).scrollIntoView({ + // behavior: 'smooth' + // }) + // window.scrollTo({ + // top: 0, + // behavior: 'smooth' // 平滑滚动 + // }); this.hide = false + setTimeout(() => { + $(window).scrollTop(0) + // window.scrollTo({ + // top: 0, + // behavior: 'smooth' // 平滑滚动 + // }); + // this.scrollTop(0, 200) + }, 300) } this.lastScrollTop = scrollTop }, + scrollTop (number = 0, time) { + if (!time) { + document.body.scrollTop = document.documentElement.scrollTop = number; + return number; + } + const spacingTime = 20; // 设置循环的间隔时间 值越小消耗性能越高 + let spacingInex = time / spacingTime; // 计算循环的次数 + let nowTop = document.body.scrollTop + document.documentElement.scrollTop; // 获取当前滚动条位置 + let everTop = (number - nowTop) / spacingInex; // 计算每次滑动的距离 + let scrollTimer = setInterval(() => { + if (spacingInex > 0) { + spacingInex--; + this.scrollTop(nowTop += everTop); + } else { + clearInterval(scrollTimer); // 清除计时器 + } + }, spacingTime); + }, // 节流 throttle (fn, time) { // 上一次的执行时间 @@ -497,11 +545,11 @@ $bannerHeight: calc(100vw / 2.03); z-index: 2; position: relative; top: $bannerHeight; - padding-bottom: 229px; + padding: 6rem 0 229px; background-color: #fff; transition: all 0.7s cubic-bezier(0.5, 0, 0.2, 1) 0s; &.active { - top: 130px; + top: 106px; } } .block { @@ -521,6 +569,9 @@ $bannerHeight: calc(100vw / 2.03); .inner { width: 1200px; } +.card-block { + background: url(http://10.10.11.7/images/iasf/14.jpg) 0 0/100% 100% no-repeat; +} .card { display: flex; justify-content: space-between;