renxiaodong/lingji-work-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into feature/0710_下载中心_rxd

Browse Source 
# Conflicts:
#	src/components/_base/navbar/index.vue
#	src/styles/components/checkbox.scss
This commit is contained in:
rd
2025-07-14 10:01:14 +08:00
parent 789de0150e f7662769ac
commit 30c6fe4ced
124 changed files with 1350 additions and 17677 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/styles/components/checkbox.scss
View File

@ -11,13 +11,13 @@
}
&.arco-checkbox-checked {
.arco-checkbox-icon {
background-color: #A794FE !important;
background-color: #a794fe !important;
}
}
&.arco-checkbox-indeterminate {
.arco-checkbox-icon {
border: none;
background-color: #A794FE !important;
background-color: #a794fe !important;
}
}
}
@ -28,5 +28,4 @@
border: none;
}
}
}

2
src/styles/components/pagination.scss
View File

@ -28,7 +28,7 @@
&-prepend {
color: var(--Text-2, #3c4043);
text-align: right;
font-family: 'PuHuiTi-Medium';
font-family: $font-family-medium;
font-size: 14px;
font-style: normal;
font-weight: 400;

2
src/styles/components/table.scss
View File

@ -1,7 +1,7 @@
.arco-table {
@mixin table-cell-text {
color: var(--Text-1, #3C4043);
font-family: 'PuHuiTi-Regular';
font-family: $font-family-regular;
font-size: 14px;
font-style: normal;
font-weight: 400;

2
src/styles/components/tabs.scss
View File

@ -4,7 +4,7 @@
.arco-tabs-tab {
.arco-tabs-tab-title {
color: var(--Text-2, #3c4043);
font-family: 'PuHuiTi-Medium';
font-family: $font-family-medium;
font-size: 16px;
font-style: normal;
font-weight: 400;

32
src/styles/font.scss
View File

@ -1,30 +1,18 @@
@font-face {
font-family: 'PuHuiTi-Regular';
src: url('@/assets/fonts/Alibaba-PuHuiTi-Regular.woff2') format('woff2');
font-display: swap;
font-family: 'Manrope-Regular';
src: url('@/assets/fonts/Manrope-Regular.ttf');
}
@font-face {
font-family: 'Manrope-Medium';
src: url('@/assets/fonts/Manrope-Medium.ttf');
}
@font-face {
font-family: 'PuHuiTi-Medium';
src: url('@/assets/fonts/Alibaba-PuHuiTi-Medium.woff2') format('woff2');
font-display: swap;
font-family: 'Manrope-Bold';
src: url('@/assets/fonts/Manrope-Bold.ttf');
}
@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;
}
.font-family-puhui-medium {
font-family: 'PuHuiTi-Medium' !important;
}
.font-family-puhui-bold {
font-family: 'PuHuiTi-Bold' !important;
font-family: 'Manrope-SemiBold';
src: url('@/assets/fonts/Manrope-SemiBold.ttf');
}

10
src/styles/index.scss Normal file
View File

@ -0,0 +1,10 @@
/*
* @Author: RenXiaoDong
* @Date: 2025-06-30 16:03:42
*/
@import './lib/variable.scss';
@import './lib/reset.scss';
@import './vars.scss';
@import './components/index.scss';
// @import './font.scss';

9
src/styles/index.ts
View File

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

25
src/styles/lib/reset.scss Normal file
View File

@ -0,0 +1,25 @@
* {
margin: 0;
padding: 0;
box-sizing: border-box;
font-family: PingFangSC-Regular, PingFang SC;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
html,
body {
background: $color-background;
font-family: $font-family-regular;
font-size: $font-size-14;
-webkit-print-color-adjust: exact;
}
p {
margin: 0;
padding: 0;
}
a {
text-decoration: none;
}

15
src/styles/lib/variable.scss Normal file
View File

@ -0,0 +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;

43
src/styles/vars.css → src/styles/vars.scss
View File

@ -1,8 +1,9 @@
:root {
/* 修改主色 */
--arco-primary-6: #dd3e05 !important; /* 默认主色 */
--arco-primary-5: #40ffdf !important; /* 悬停色 */
--arco-primary-7: #c9dbed !important; /* 点击色 */
/* 主色覆盖（强制替换 Arco 默认蓝色） */
--arco-primary-6: #6d4cfe !important;
--arco-primary-5: #8a70fe !important;
--arco-primary-7: #573dcb !important;
--arco-primary-1: #f5f2ff !important; /* 浅色背景 */
/* 修改成功/警告/错误色 */
--arco-success-6: #52c41a !important;
@ -14,40 +15,6 @@
--arco-bg-1: #f7f8fa !important; /* 页面背景 */
}
* {
box-sizing: border-box;
}
p {
margin: 0;
padding: 0;
}
.flex {
display: flex;
}
.item-center {
align-items: center;
}
.box-container {
border-radius: 2px;
padding: 20px;
margin: 8px;
background-color: #fff;
}
:root {
/* 主色覆盖（强制替换 Arco 默认蓝色） */
--arco-primary-6: #6d4cfe !important;
--arco-primary-5: #8a70fe !important;
--arco-primary-7: #573dcb !important;
--arco-primary-1: #f5f2ff !important; /* 浅色背景 */
}
.arco-checkbox-checked .arco-checkbox-icon {
background-color: #573dcb !important;
}
/* 强制所有组件使用主色 */
.arco-btn-primary,
.arco-menu-selected,