From 0b29e77efb64e9403e304fd5ebb8b246cbf039db Mon Sep 17 00:00:00 2001
From: rd <1344903914@qq.com>
Date: Thu, 10 Jul 2025 16:20:23 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"feat:=20=E9=A2=84=E5=8A=A0=E8=BD=BD?=
=?UTF-8?q?=E5=AD=97=E4=BD=93=E5=8C=85"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit b76b39f94a42b3802fd16a35a6b9eab28009a98e.
---
index.html | 4 ---
.../assets}/fonts/Alibaba-PuHuiTi-Bold.woff2 | Bin
.../fonts/Alibaba-PuHuiTi-Medium.woff2 | Bin
.../fonts/Alibaba-PuHuiTi-Regular.woff2 | Bin
src/styles/font.scss | 27 ++++++++++--------
5 files changed, 15 insertions(+), 16 deletions(-)
rename {public => src/assets}/fonts/Alibaba-PuHuiTi-Bold.woff2 (100%)
rename {public => src/assets}/fonts/Alibaba-PuHuiTi-Medium.woff2 (100%)
rename {public => src/assets}/fonts/Alibaba-PuHuiTi-Regular.woff2 (100%)
diff --git a/index.html b/index.html
index 370ebb6..1f23f8d 100644
--- a/index.html
+++ b/index.html
@@ -1,4 +1,3 @@
-
@@ -6,9 +5,6 @@
灵机AI营销平台
-
-
-
diff --git a/public/fonts/Alibaba-PuHuiTi-Bold.woff2 b/src/assets/fonts/Alibaba-PuHuiTi-Bold.woff2
similarity index 100%
rename from public/fonts/Alibaba-PuHuiTi-Bold.woff2
rename to src/assets/fonts/Alibaba-PuHuiTi-Bold.woff2
diff --git a/public/fonts/Alibaba-PuHuiTi-Medium.woff2 b/src/assets/fonts/Alibaba-PuHuiTi-Medium.woff2
similarity index 100%
rename from public/fonts/Alibaba-PuHuiTi-Medium.woff2
rename to src/assets/fonts/Alibaba-PuHuiTi-Medium.woff2
diff --git a/public/fonts/Alibaba-PuHuiTi-Regular.woff2 b/src/assets/fonts/Alibaba-PuHuiTi-Regular.woff2
similarity index 100%
rename from public/fonts/Alibaba-PuHuiTi-Regular.woff2
rename to src/assets/fonts/Alibaba-PuHuiTi-Regular.woff2
diff --git a/src/styles/font.scss b/src/styles/font.scss
index ce187af..ea0f7c1 100644
--- a/src/styles/font.scss
+++ b/src/styles/font.scss
@@ -1,19 +1,22 @@
-@font-face {
- font-family: 'PuHuiTi-Bold';
- src: url('/fonts/Alibaba-PuHuiTi-Bold.woff2') format('woff2');
- font-display: fallback;
-}
-@font-face {
- font-family: 'PuHuiTi-Medium';
- src: url('/fonts/Alibaba-PuHuiTi-Medium.woff2') format('woff2');
- font-display: fallback;
-}
@font-face {
font-family: 'PuHuiTi-Regular';
- src: url('/fonts/Alibaba-PuHuiTi-Regular.woff2') format('woff2');
- font-display: fallback;
+ src: url('@/assets/fonts/Alibaba-PuHuiTi-Regular.woff2') format('woff2');
+ font-display: swap;
}
+@font-face {
+ font-family: 'PuHuiTi-Medium';
+ src: url('@/assets/fonts/Alibaba-PuHuiTi-Medium.woff2') format('woff2');
+ font-display: swap;
+}
+
+@font-face {
+ font-family: 'PuHuiTi-Bold';
+ src: url('@/assets/fonts/Alibaba-PuHuiTi-Bold.woff2') format('woff2');
+ font-display: swap;
+}
+
+// 使用统一的字体族名
.font-family-puhui-regular {
font-family: 'PuHuiTi-Regular' !important;
}