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

2
src/components/_base/breadcrumb/index.vue
View File

@ -37,7 +37,7 @@ const matched = computed(() => {
</a-breadcrumb> -->
</template>
<style scoped lang="less">
<style scoped lang="scss">
.container-breadcrumb {
margin: 16px 0;
:deep(.arco-breadcrumb-item) {

4
src/components/_base/exit-account-modal/index.vue
View File

@ -67,7 +67,7 @@ defineExpose({ open });
padding: 24px;
.s1 {
color: var(--Text-1, #211f24);
font-family: 'PuHuiTi-Medium';
font-family: $font-family-medium;
font-size: 14px;
font-style: normal;
font-weight: 400;
@ -75,7 +75,7 @@ defineExpose({ open });
}
.s2 {
color: var(--Text-2, #3c4043);
font-family: 'PuHuiTi-Regular';
font-family: $font-family-regular;
font-size: 12px;
font-style: normal;
font-weight: 400;

4
src/components/_base/menu/index.vue
View File

@ -170,7 +170,7 @@ export default defineComponent({
}
.arco-menu-title {
color: var(--Text-2, #3c4043);
font-family: 'PuHuiTi-Medium';
font-family: $font-family-medium;
font-size: 16px;
font-style: normal;
font-weight: 400;
@ -194,7 +194,7 @@ export default defineComponent({
border-radius: 8px;
.arco-menu-item-inner {
color: var(--Text-3, #737478);
font-family: 'PuHuiTi-Regular';
font-family: $font-family-regular;
font-size: 16px;
font-style: normal;
font-weight: 400;

2
src/components/_base/tab-bar/index.vue
View File

@ -43,7 +43,7 @@ onUnmounted(() => {
</div>
</template>
<style scoped lang="less">
<style scoped lang="scss">
.tab-bar-container {
position: relative;
background-color: var(--color-bg-2);

2
src/components/_base/tab-bar/tab-item.vue
View File

@ -144,7 +144,7 @@ const actionSelect = async (value: any) => {
</a-dropdown>
</template>
<style scoped lang="less">
<style scoped lang="scss">
.tag-link {
color: var(--color-text-2);
text-decoration: none;