diff --git a/public/css/fonts/InstrumentSans-Bold.ttf b/public/css/fonts/InstrumentSans-Bold.ttf new file mode 100644 index 00000000..f602dcef Binary files /dev/null and b/public/css/fonts/InstrumentSans-Bold.ttf differ diff --git a/public/css/fonts/InstrumentSans-Regular.ttf b/public/css/fonts/InstrumentSans-Regular.ttf new file mode 100644 index 00000000..14c6113c Binary files /dev/null and b/public/css/fonts/InstrumentSans-Regular.ttf differ diff --git a/public/css/fonts/fontFamily.css b/public/css/fonts/fontFamily.css index a2f7501e..e4da7066 100644 --- a/public/css/fonts/fontFamily.css +++ b/public/css/fonts/fontFamily.css @@ -1,31 +1,41 @@ /* 字体定义 */ @font-face { font-family: 'Arial'; - src: url('./fonts/ARIAL.ttf') format('ttf'); + src: url('./fonts/ARIAL.ttf') format('truetype'); } @font-face { font-family: 'ArialBold'; - src: url('./fonts/ARIALBD.ttf') format('ttf'); + src: url('./fonts/ARIALBD.ttf') format('truetype'); } @font-face { font-family: 'ArialMedium'; - src: url('./fonts/ArialMdm.ttf') format('ttf'); + src: url('./fonts/ArialMdm.ttf') format('truetype'); } @font-face { font-family: 'Poppins'; - src: url('./fonts/Poppins-Regular.ttf') format('ttf'); + src: url('./fonts/Poppins-Regular.ttf') format('truetype'); font-weight: normal; } @font-face { font-family: 'PoppinsMedium'; - src: url('./fonts/Poppins-Medium.ttf') format('ttf'); + src: url('./fonts/Poppins-Medium.ttf') format('truetype'); } @font-face { font-family: 'PoppinsBold'; - src: url('./fonts/Poppins-SemiBold.ttf') format('ttf'); + src: url('./fonts/Poppins-SemiBold.ttf') format('truetype'); +} + +@font-face { + font-family: 'Instrument'; + src: url('./InstrumentSans-Regular.ttf') format('truetype'); +} + +@font-face { + font-family: 'InstrumentBold'; + src: url('./InstrumentSans-Bold.ttf') format('truetype'); } diff --git a/src/assets/images/award/apply_bg.png b/src/assets/images/award/apply_bg.png index eb170088..f2f1a835 100644 Binary files a/src/assets/images/award/apply_bg.png and b/src/assets/images/award/apply_bg.png differ diff --git a/src/assets/images/award/banner.mp4 b/src/assets/images/award/banner.mp4 new file mode 100644 index 00000000..c1d7d04f Binary files /dev/null and b/src/assets/images/award/banner.mp4 differ diff --git a/src/assets/images/award/bloom_bg.png b/src/assets/images/award/bloom_bg.png index f40622f2..111b119d 100644 Binary files a/src/assets/images/award/bloom_bg.png and b/src/assets/images/award/bloom_bg.png differ diff --git a/src/assets/images/award/point.png b/src/assets/images/award/point.png index ade4dab4..b2120b47 100644 Binary files a/src/assets/images/award/point.png and b/src/assets/images/award/point.png differ diff --git a/src/assets/style/style.css b/src/assets/style/style.css index df4233a9..8f96aae1 100644 --- a/src/assets/style/style.css +++ b/src/assets/style/style.css @@ -2506,4 +2506,7 @@ textarea:focus { } .justify-center { justify-content: center; +} +.flex-1{ + flex: 1; } \ No newline at end of file diff --git a/src/assets/style/style.less b/src/assets/style/style.less index e1c0a640..dc89d11c 100644 --- a/src/assets/style/style.less +++ b/src/assets/style/style.less @@ -2424,4 +2424,7 @@ textarea:focus{ } .justify-center { justify-content: center; +} +.flex-1{ + flex: 1; } \ No newline at end of file diff --git a/src/views/AwardPage/apply.vue b/src/views/AwardPage/apply.vue index bcd14179..9ed29bf7 100644 --- a/src/views/AwardPage/apply.vue +++ b/src/views/AwardPage/apply.vue @@ -1047,8 +1047,7 @@ .desc { color: #b10000; - // font-family: 'Instrument'; - font-family: revert-layer; + font-family: 'Instrument'; font-weight: 500; font-size: 2.4rem; } @@ -1067,8 +1066,7 @@ .desc { color: #b10000; - // font-family: 'Instrument'; - font-family: revert-layer; + font-family: 'Instrument'; font-weight: 500; font-size: 2.4rem; } @@ -1376,8 +1374,7 @@ } .desc { - // font-family: 'instrument'; - font-family: revert-layer; + font-family: 'Instrument'; font-weight: 400; font-size: 1.6rem; color: #6d6d6d; diff --git a/src/views/AwardPage/components/ApplySection.vue b/src/views/AwardPage/components/ApplySection.vue index ba40b94c..27e58e05 100644 --- a/src/views/AwardPage/components/ApplySection.vue +++ b/src/views/AwardPage/components/ApplySection.vue @@ -1,28 +1,170 @@ diff --git a/src/views/AwardPage/components/Bloom.vue b/src/views/AwardPage/components/Bloom.vue index c0161f8a..de4134c1 100644 --- a/src/views/AwardPage/components/Bloom.vue +++ b/src/views/AwardPage/components/Bloom.vue @@ -1,5 +1,5 @@ @@ -37,7 +61,9 @@ let bloomObserver: IntersectionObserver | null = null const setupBloomInitialState = () => { - const titleEls = [titleRef.value, subtitleRef.value].filter(Boolean) as HTMLElement[] + const titleEls = [titleRef.value, subtitleRef.value].filter( + Boolean + ) as HTMLElement[] if (titleEls.length) { gsap.set(titleEls, { opacity: 0, @@ -58,7 +84,9 @@ const playBloomAnimation = () => { if (hasPlayedBloomAnim.value) return - const titleEls = [titleRef.value, subtitleRef.value].filter(Boolean) as HTMLElement[] + const titleEls = [titleRef.value, subtitleRef.value].filter( + Boolean + ) as HTMLElement[] const textEl = textRef.value if (!titleEls.length || !textEl) return @@ -81,7 +109,7 @@ duration: 0.3, ease: 'power2.out' }, - '+=0.12' + '-=0.3' ) tl.to( textEl, @@ -103,8 +131,8 @@ setupBloomInitialState() if ('IntersectionObserver' in window) { bloomObserver = new IntersectionObserver( - (entries) => { - entries.forEach((entry) => { + entries => { + entries.forEach(entry => { if (entry.isIntersecting) { playBloomAnimation() } @@ -125,11 +153,19 @@ onBeforeUnmount(() => { bloomObserver?.disconnect() }) - - diff --git a/src/views/AwardPage/components/PrizesSection.vue b/src/views/AwardPage/components/PrizesSection.vue index 6c4848af..12bf8433 100644 --- a/src/views/AwardPage/components/PrizesSection.vue +++ b/src/views/AwardPage/components/PrizesSection.vue @@ -24,10 +24,13 @@ >
-
{{ item.money }}
+
+ {{ item.money }} +
{{ item.name }}
{ font-size: 2.4rem; color: #e0e0e0; text-align: center; + white-space: pre-line; } } } diff --git a/src/views/AwardPage/components/Slogan.vue b/src/views/AwardPage/components/Slogan.vue index 8829ab7c..25c4f994 100644 --- a/src/views/AwardPage/components/Slogan.vue +++ b/src/views/AwardPage/components/Slogan.vue @@ -1,5 +1,9 @@