Merge remote-tracking branch 'origin/master' into feature/v1.3_营销资产中台

# Conflicts:
#	src/main.ts
#	src/styles/components/index.scss
#	src/styles/components/table.scss
#	src/styles/index.ts
#	src/views/components/dataEngine/keyWord.vue

src/styles/components/table.scss

@@ -1,7 +1,7 @@
 .arco-table {
   @mixin table-cell-text {
-    color: var(--Text-1, #211f24);
-    font-family: 'Alibaba PuHuiTi';
+    color: var(--Text-1, #3C4043);
+    font-family: 'PuHuiTi-Regular';
     font-size: 14px;
     font-style: normal;
     font-weight: 400;
@@ -19,6 +19,7 @@
               padding: 13px 16px;
               .arco-table-th-title {
                 @include table-cell-text;
+                font-family: 'PingFangSC-Medium';
               }
             }
           }
@@ -29,7 +30,8 @@
           .arco-table-td {
             .arco-table-cell {
               padding: 13px 16px;
-              .arco-table-cell-content {
+              .arco-table-cell-content,
+              .arco-table-td-content {
                 @include table-cell-text;
               }
             }

src/styles/font.scss

@@ -0,0 +1,24 @@
+@font-face {
+  font-family: 'PuHuiTi-Medium';
+  src: url('@/assets/fonts/Alibaba-PuHuiTi-Medium.otf');
+}
+
+@font-face {
+  font-family: 'PuHuiTi-Regular';
+  src: url('@/assets/fonts/Alibaba-PuHuiTi-Regular.otf');
+}
+
+@font-face {
+  font-family: 'PuHuiTi-Bold';
+  src: url('@/assets/fonts/Alibaba-PuHuiTi-Bold.otf');
+}
+
+.font-family-puhui-bold {
+  font-family: PuHuiTi-Bold !important;
+}
+.font-family-puhui-medium {
+  font-family: PuHuiTi-Medium !important;
+}
+.font-family-puhui-regular {
+  font-family: PuHuiTi-Regular !important;
+}

src/styles/index.ts

@@ -1,8 +1,9 @@
 /*
  * @Author: RenXiaoDong
- * @Date: 2025-06-27 14:03:21
+ * @Date: 2025-06-30 16:03:42
  */
 import './vars.css';
 import './components/index.scss';
+import './font.scss';
 import 'normalize.css';
 import 'uno.css';