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

src/styles/font.scss

@@ -1,30 +1,18 @@
-// @font-face {
+@font-face {
-//   font-family: $font-family-regular;
+  font-family: 'Manrope-Regular';
-//   src: url('@/assets/fonts/Alibaba-PuHuiTi-Regular.woff2') format('woff2');
+  src: url('@/assets/fonts/Manrope-Regular.ttf');
-//   font-display: swap;
+}
-// }
+@font-face {
+  font-family: 'Manrope-Medium';
+  src: url('@/assets/fonts/Manrope-Medium.ttf');
+}
 
-// @font-face {
+@font-face {
-//   font-family: $font-family-medium;
+  font-family: 'Manrope-Bold';
-//   src: url('@/assets/fonts/Alibaba-PuHuiTi-Medium.woff2') format('woff2');
+  src: url('@/assets/fonts/Manrope-Bold.ttf');
-//   font-display: swap;
+}
-// }
 
-// @font-face {
+@font-face {
-//   font-family: 'PuHuiTi-Bold';
+  font-family: 'Manrope-SemiBold';
-//   src: url('@/assets/fonts/Alibaba-PuHuiTi-Bold.woff2') format('woff2');
+  src: url('@/assets/fonts/Manrope-SemiBold.ttf');
-//   font-display: swap;
+}
-// }
-
-// // 使用统一的字体族名
-// .font-family-puhui-regular {
-//   font-family: $font-family-regular !important;
-// }
-
-// .font-family-puhui-medium {
-//   font-family: $font-family-medium !important;
-// }
-
-// .font-family-puhui-bold {
-//   font-family: 'PuHuiTi-Bold' !important;
-// }

src/styles/lib/variable.scss

@@ -1,8 +1,15 @@
+
+// 汉字字体
 $font-family-regular: 'PingFangSC-Regular', 'Microsoft Yahei', Arial, sans-serif;
 $font-family-medium: 'PingFangSC-Medium', 'Microsoft Yahei', Arial, sans-serif;
 $font-family-light: 'PingFangSC-Light', 'Microsoft Yahei', Arial, sans-serif;
 $font-family-bold: 'PingFangSC-Semibold', 'PingFangSC-Regular', 'Microsoft Yahei', Arial, sans-serif;
+// 数字字体包
+$font-family-manrope-regular: 'Manrope-Regular';
+$font-family-manrope-medium: 'Manrope-Medium';
+$font-family-manrope-bold: 'Manrope-Bold';
+$font-family-manrope-semiBold: 'Manrope-SemiBold';
 
 $color-background: #f9f9f9;
 
-$font-size-14: 14px;
+$font-size-14: 14px;

src/views/components/dataEngine/keyWord.vue

@@ -674,7 +674,7 @@ onMounted(() => {
   font-weight: 400;
   line-height: 22px; /* 157.143% */
   &.num {
-    font-family: 'HarmonyOS Sans SC';
+    font-family: $font-family-manrope-regular;
   }
 }
 </style>

src/views/components/dataEngine/userPersona.vue

@@ -617,7 +617,7 @@ onMounted(() => {
   font-weight: 400;
   line-height: 22px; /* 157.143% */
   &.num {
-    font-family: 'HarmonyOS Sans SC';
+    font-family: $font-family-manrope-regular;
   }
 }
 :deep(.arco-tabs) {

src/views/property-marketing/media-account/account-dashboard/style.scss

@@ -45,7 +45,7 @@
         }
         .value {
           color: var(--Text-1, #211f24);
-          font-family: 'HarmonyOS Sans SC';
+          font-family: $font-family-manrope-regular;
           font-size: 18px;
           font-style: normal;
           font-weight: 500;

src/views/property-marketing/media-account/account-manage/components/account-table/index.vue

@@ -25,11 +25,11 @@
         </div>
         <div class="field-row">
           <span class="label">账号ID</span>
-          <span class="cts">{{ item.account_id || '-' }}</span>
+          <span class="cts num">{{ item.account_id || '-' }}</span>
         </div>
         <div class="field-row">
           <span class="label">手机号码</span>
-          <span class="cts">{{ item.mobile || '-' }}</span>
+          <span class="cts num">{{ item.mobile || '-' }}</span>
         </div>
         <div class="field-row">
           <span class="label">运营人员</span>

src/views/property-marketing/media-account/account-manage/components/account-table/style.scss

@@ -49,6 +49,9 @@
         font-style: normal;
         font-weight: 400;
         line-height: 20px; /* 166.667% */
+        &.num {
+          font-family: $font-family-manrope-regular;
+        }
       }
       .tag-box {
         display: flex;

src/views/property-marketing/put-account/account-manage/components/account-table/index.vue

@@ -25,11 +25,11 @@
         </div>
         <div class="field-row">
           <span class="label">账号ID</span>
-          <span class="cts">{{ item.account_id || '-' }}</span>
+          <span class="cts num">{{ item.account_id || '-' }}</span>
         </div>
         <div class="field-row">
           <span class="label">手机号码</span>
-          <span class="cts">{{ item.mobile }}</span>
+          <span class="cts num">{{ item.mobile }}</span>
         </div>
         <div class="field-row">
           <span class="label">运营人员</span>

src/views/property-marketing/put-account/account-manage/components/account-table/style.scss

@@ -49,6 +49,9 @@
         font-style: normal;
         font-weight: 400;
         line-height: 20px; /* 166.667% */
+        &.num {
+          font-family: $font-family-manrope-regular;
+        }
       }
       .tag-box {
         display: flex;