diff --git a/config/plugins/unocss.ts b/config/plugins/unocss.ts index c5b1970..0910253 100644 --- a/config/plugins/unocss.ts +++ b/config/plugins/unocss.ts @@ -1,8 +1,8 @@ /* * @Author: 田鑫 * @Date: 2023-03-05 18:14:16 - * @LastEditors: Please set LastEditors - * @LastEditTime: 2025-06-25 10:54:24 + * @LastEditors: rd 1344903914@qq.com + * @LastEditTime: 2025-07-11 16:30:29 * @Description: */ import Unocss from 'unocss/vite'; @@ -41,21 +41,5 @@ export const configUnocss = () => [/^w-(\d+)$/, ([, d]) => ({ width: `${d}px !important` })], [/^h-(\d+)$/, ([, d]) => ({ height: `${d}px !important` })], [/^ft-(\d+)$/, ([, d]) => ({ 'font-size': `${d}px !important` })], - [ - 'box-container', - { - 'border-radius': '2px', - padding: '20px', - margin: '8px', - 'background-color': '#fff', - }, - ], - [ - 'justify-between', - { - 'justify-content': 'space-between', - }, - ], - ['align-center', { 'text-align': 'center' }], ], }); diff --git a/src/App.vue b/src/App.vue index 325eb50..4441999 100644 --- a/src/App.vue +++ b/src/App.vue @@ -41,3 +41,7 @@ onMounted(() => { }); }); + + diff --git a/src/assets/fonts/Alibaba-PuHuiTi-Bold.woff2 b/src/assets/fonts/Alibaba-PuHuiTi-Bold.woff2 deleted file mode 100644 index 1d97b91..0000000 Binary files a/src/assets/fonts/Alibaba-PuHuiTi-Bold.woff2 and /dev/null differ diff --git a/src/assets/fonts/Alibaba-PuHuiTi-Medium.woff2 b/src/assets/fonts/Alibaba-PuHuiTi-Medium.woff2 deleted file mode 100644 index 61d1468..0000000 Binary files a/src/assets/fonts/Alibaba-PuHuiTi-Medium.woff2 and /dev/null differ diff --git a/src/assets/fonts/Alibaba-PuHuiTi-Regular.woff2 b/src/assets/fonts/Alibaba-PuHuiTi-Regular.woff2 deleted file mode 100644 index bc37329..0000000 Binary files a/src/assets/fonts/Alibaba-PuHuiTi-Regular.woff2 and /dev/null differ diff --git a/src/assets/fonts/Manrope-Bold.ttf b/src/assets/fonts/Manrope-Bold.ttf new file mode 100644 index 0000000..2f84ae3 Binary files /dev/null and b/src/assets/fonts/Manrope-Bold.ttf differ diff --git a/src/assets/fonts/Manrope-Medium.ttf b/src/assets/fonts/Manrope-Medium.ttf new file mode 100644 index 0000000..c73d774 Binary files /dev/null and b/src/assets/fonts/Manrope-Medium.ttf differ diff --git a/src/assets/fonts/Manrope-Regular.ttf b/src/assets/fonts/Manrope-Regular.ttf new file mode 100644 index 0000000..c02b01b Binary files /dev/null and b/src/assets/fonts/Manrope-Regular.ttf differ diff --git a/src/assets/fonts/Manrope-SemiBold.ttf b/src/assets/fonts/Manrope-SemiBold.ttf new file mode 100644 index 0000000..30ee031 Binary files /dev/null and b/src/assets/fonts/Manrope-SemiBold.ttf differ diff --git a/src/components/_base/breadcrumb/index.vue b/src/components/_base/breadcrumb/index.vue index e923879..b5539c7 100644 --- a/src/components/_base/breadcrumb/index.vue +++ b/src/components/_base/breadcrumb/index.vue @@ -37,7 +37,7 @@ const matched = computed(() => { --> - + diff --git a/src/components/container.vue b/src/components/container.vue index 14d2f20..b99a435 100644 --- a/src/components/container.vue +++ b/src/components/container.vue @@ -15,7 +15,7 @@ const props = defineProps<{ title: string; }>(); - + diff --git a/src/components/delete-modal.vue b/src/components/delete-modal.vue index 0d3664d..ad26313 100644 --- a/src/components/delete-modal.vue +++ b/src/components/delete-modal.vue @@ -8,7 +8,7 @@ - + diff --git a/src/layouts/Basic.vue b/src/layouts/Basic.vue index f3879ae..935161d 100644 --- a/src/layouts/Basic.vue +++ b/src/layouts/Basic.vue @@ -102,9 +102,9 @@ provide('toggleDrawerMenu', () => { - @@ -694,7 +694,7 @@ onMounted(() => { padding: 12px 20px 0; .cts { color: var(--Text-2, #3c4043); - font-family: 'PuHuiTi-Regular'; + font-family: $font-family-regular; font-size: 12px; font-style: normal; font-weight: 400; diff --git a/src/views/components/dataEngine/userPainPoints.vue b/src/views/components/dataEngine/userPainPoints.vue index 74bc9e5..52b5fb5 100644 --- a/src/views/components/dataEngine/userPainPoints.vue +++ b/src/views/components/dataEngine/userPainPoints.vue @@ -276,7 +276,7 @@ const search = () => { align-items: center; .title { color: var(--Text-1, #211f24); - font-family: 'PuHuiTi-Medium'; + font-family: $font-family-medium; font-size: 16px; font-style: normal; font-weight: 400; @@ -299,7 +299,7 @@ const search = () => { padding: 12px 20px 0; .cts { color: var(--Text-2, #3c4043); - font-family: 'PuHuiTi-Regular'; + font-family: $font-family-regular; font-size: 12px; font-style: normal; font-weight: 400; diff --git a/src/views/components/dataEngine/userPersona.vue b/src/views/components/dataEngine/userPersona.vue index 8ae2b1d..ee736a0 100644 --- a/src/views/components/dataEngine/userPersona.vue +++ b/src/views/components/dataEngine/userPersona.vue @@ -602,7 +602,7 @@ onMounted(() => { align-items: center; .title { color: var(--Text-1, #211f24); - font-family: 'PuHuiTi-Medium'; + font-family: $font-family-medium; font-size: 16px; font-style: normal; font-weight: 400; @@ -611,13 +611,13 @@ onMounted(() => { } .cts { color: var(--Text-2, #3c4043); - font-family: 'PuHuiTi-Regular'; + font-family: $font-family-regular; font-size: 14px; font-style: normal; font-weight: 400; line-height: 22px; /* 157.143% */ &.num { - font-family: 'HarmonyOS Sans SC'; + font-family: $font-family-manrope-regular; } } :deep(.arco-tabs) { diff --git a/src/views/components/drag/DraggableResizable.vue b/src/views/components/drag/DraggableResizable.vue index 911fabf..6d711ac 100644 --- a/src/views/components/drag/DraggableResizable.vue +++ b/src/views/components/drag/DraggableResizable.vue @@ -360,7 +360,7 @@ if (container.value) { } - + diff --git a/src/views/components/layout/comp3.vue b/src/views/components/layout/comp3.vue index a2f9505..2e04f2f 100644 --- a/src/views/components/layout/comp3.vue +++ b/src/views/components/layout/comp3.vue @@ -10,4 +10,4 @@ - + diff --git a/src/views/components/layout/comp4.vue b/src/views/components/layout/comp4.vue index 9c3bc35..222c6b5 100644 --- a/src/views/components/layout/comp4.vue +++ b/src/views/components/layout/comp4.vue @@ -10,4 +10,4 @@ - + diff --git a/src/views/components/layout/index.vue b/src/views/components/layout/index.vue index fab9732..bcfa90e 100644 --- a/src/views/components/layout/index.vue +++ b/src/views/components/layout/index.vue @@ -380,7 +380,7 @@ function getComponentStyle(component: ComponentState) { } - \ No newline at end of file diff --git a/src/views/components/permission/choose-enterprise.vue b/src/views/components/permission/choose-enterprise.vue index f49517f..46763b0 100644 --- a/src/views/components/permission/choose-enterprise.vue +++ b/src/views/components/permission/choose-enterprise.vue @@ -15,5 +15,5 @@ const enterprise = ref(''); - \ No newline at end of file diff --git a/src/views/components/table/index.vue b/src/views/components/table/index.vue index aff4fc3..410c236 100644 --- a/src/views/components/table/index.vue +++ b/src/views/components/table/index.vue @@ -49,4 +49,4 @@ function add() { function deleteItem(record) {} - + diff --git a/src/views/components/workplace/index.vue b/src/views/components/workplace/index.vue index 66616e1..a672635 100644 --- a/src/views/components/workplace/index.vue +++ b/src/views/components/workplace/index.vue @@ -46,7 +46,7 @@ const getSuccessCaseList = async () => { }; - diff --git a/vite.config.ts b/vite.config.ts index 70c8cae..0158ad7 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -20,7 +20,7 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => { css: { preprocessorOptions: { scss: { - // additionalData: `@import "@/styles/vars.css";`, + additionalData: `@import "@/styles/lib/variable.scss";`, }, }, },