From 1bf641a068eb5f58c1b6ac1b230f1416ffb9fb36 Mon Sep 17 00:00:00 2001
From: rd <1344903914@qq.com>
Date: Thu, 10 Jul 2025 15:36:02 +0800
Subject: [PATCH 1/3] =?UTF-8?q?style:=20=E5=8E=BB=E9=99=A4=E6=8C=87?=
=?UTF-8?q?=E4=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package.json | 1 -
1 file changed, 1 deletion(-)
diff --git a/package.json b/package.json
index a1c4938..5f28272 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,6 @@
"private": true,
"scripts": {
"dev": "vite",
- "build": "run-p build-only",
"build:test": "vite build --mode test && tar -czvf dist-test.tar.gz dist",
"build:prod": "vite build --mode production && tar -czvf dist.tar.gz dist",
"build-only": "vite build -- mode development",
From b76b39f94a42b3802fd16a35a6b9eab28009a98e Mon Sep 17 00:00:00 2001
From: rd <1344903914@qq.com>
Date: Thu, 10 Jul 2025 16:17:12 +0800
Subject: [PATCH 2/3] =?UTF-8?q?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
---
index.html | 4 +++
.../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, 16 insertions(+), 15 deletions(-)
rename {src/assets => public}/fonts/Alibaba-PuHuiTi-Bold.woff2 (100%)
rename {src/assets => public}/fonts/Alibaba-PuHuiTi-Medium.woff2 (100%)
rename {src/assets => public}/fonts/Alibaba-PuHuiTi-Regular.woff2 (100%)
diff --git a/index.html b/index.html
index 1f23f8d..370ebb6 100644
--- a/index.html
+++ b/index.html
@@ -1,3 +1,4 @@
+
@@ -5,6 +6,9 @@
灵机AI营销平台
+
+
+
diff --git a/src/assets/fonts/Alibaba-PuHuiTi-Bold.woff2 b/public/fonts/Alibaba-PuHuiTi-Bold.woff2
similarity index 100%
rename from src/assets/fonts/Alibaba-PuHuiTi-Bold.woff2
rename to public/fonts/Alibaba-PuHuiTi-Bold.woff2
diff --git a/src/assets/fonts/Alibaba-PuHuiTi-Medium.woff2 b/public/fonts/Alibaba-PuHuiTi-Medium.woff2
similarity index 100%
rename from src/assets/fonts/Alibaba-PuHuiTi-Medium.woff2
rename to public/fonts/Alibaba-PuHuiTi-Medium.woff2
diff --git a/src/assets/fonts/Alibaba-PuHuiTi-Regular.woff2 b/public/fonts/Alibaba-PuHuiTi-Regular.woff2
similarity index 100%
rename from src/assets/fonts/Alibaba-PuHuiTi-Regular.woff2
rename to public/fonts/Alibaba-PuHuiTi-Regular.woff2
diff --git a/src/styles/font.scss b/src/styles/font.scss
index ea0f7c1..ce187af 100644
--- a/src/styles/font.scss
+++ b/src/styles/font.scss
@@ -1,22 +1,19 @@
-@font-face {
- font-family: 'PuHuiTi-Regular';
- 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;
+ 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;
}
-// 使用统一的字体族名
.font-family-puhui-regular {
font-family: 'PuHuiTi-Regular' !important;
}
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 3/3] =?UTF-8?q?Revert=20"feat:=20=E9=A2=84=E5=8A=A0?=
=?UTF-8?q?=E8=BD=BD=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;
}