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;

2
src/components/confirm-button/index.vue
View File

@ -67,4 +67,4 @@ function handleCancel() {
emit('cancelEmit');
}
</script>
<style lang="less" scoped></style>
<style lang="scss" scoped></style>

4
src/components/container.vue
View File

@ -15,7 +15,7 @@ const props = defineProps<{
title: string;
}>();
</script>
<style scoped lang="less">
<style scoped lang="scss">
.container {
border: 1px solid var(--BG-300, rgba(230, 230, 232, 1));
background: var(--BG-white, rgba(255, 255, 255, 1));
@ -23,7 +23,7 @@ const props = defineProps<{
border-radius: 8px;
}
.title {
font-family: 'PuHuiTi-Medium';
font-family: $font-family-medium;
font-weight: 400;
font-size: 18px;
line-height: 24px;

6
src/components/custom-table-column-modal/style.scss
View File

@ -22,7 +22,7 @@
margin-bottom: 16px;
.text {
color: var(--Text-1, #211f24);
font-family: 'PuHuiTi-Medium';
font-family: $font-family-medium;
font-size: 16px;
font-style: normal;
font-weight: 400;
@ -47,7 +47,7 @@
flex-direction: column;
.checked-title {
color: var(--Text-1, #211f24);
font-family: 'PuHuiTi-Medium';
font-family: $font-family-medium;
font-size: 16px;
font-style: normal;
font-weight: 400;
@ -69,7 +69,7 @@
align-items: center;
.text {
color: var(--Text-1, #211f24);
font-family: 'PuHuiTi-Medium';
font-family: $font-family-medium;
font-size: 14px;
font-style: normal;
font-weight: 400;

3
src/components/customer-service-modal.vue
View File

@ -8,5 +8,4 @@
<script setup lang="ts">
import Modal from '@/components/modal.vue';
</script>
<style lang="less">
</style>
<style lang="scss"></style>

8
src/components/delete-modal.vue
View File

@ -8,7 +8,7 @@
</a-modal>
</template>
<script setup lang="ts"></script>
<style lang="less">
<style lang="scss">
:deep(.arco-btn-status-danger) {
background-color: red !important;
width: 1000px !important;
@ -19,7 +19,7 @@
}
.delete-modal-title {
margin-top: 24px;
font-family: 'PuHuiTi-Medium';
font-family: $font-family-medium;
font-weight: 400;
font-size: 14px;
color: var(--Text-1, rgba(33, 31, 36, 1));
@ -35,14 +35,14 @@
border: 1px solid var(--BG-500, rgba(177, 178, 181, 1));
border-radius: 4px;
padding: 7px 20px;
font-family: 'PuHuiTi-Medium';
font-family: $font-family-medium;
font-weight: 400;
font-size: 14px;
}
:last-child {
border-radius: 4px;
padding: 7px 20px;
font-family: 'PuHuiTi-Medium';
font-family: $font-family-medium;
font-weight: 400;
font-size: 14px;
margin-left: 16px;

4
src/components/join-modal.vue
View File

@ -31,10 +31,10 @@ onMounted(() => {
getEnterprise();
});
</script>
<style lang="less">
<style lang="scss">
.join-body {
margin: 0;
font-family: 'PuHuiTi-Medium';
font-family: $font-family-medium;
font-weight: 400;
font-size: 14px;
color: var(--Text-1, rgba(33, 31, 36, 1));

6
src/components/modal.vue
View File

@ -4,7 +4,7 @@
</a-modal>
</template>
<script setup lang="ts"></script>
<style lang="less">
<style lang="scss">
.modal {
.arco-modal-header {
border-bottom: none;
@ -15,14 +15,14 @@
border: 1px solid var(--BG-500, rgba(177, 178, 181, 1));
border-radius: 4px;
padding: 7px 20px;
font-family: 'PuHuiTi-Medium';
font-family: $font-family-medium;
font-weight: 400;
font-size: 14px;
}
:last-child {
border-radius: 4px;
padding: 7px 20px;
font-family: 'PuHuiTi-Medium';
font-family: $font-family-medium;
font-weight: 400;
font-size: 14px;
margin-left: 16px;

2
src/components/no-data/index.vue
View File

@ -39,7 +39,7 @@ const props = defineProps({
line-height: 1.5em;
.text {
color: var(--Text-3, #737478);
font-family: 'PuHuiTi-Regular';
font-family: $font-family-regular;
font-size: 14px;
font-style: normal;
font-weight: 400;

2
src/components/wyg-form/index.vue
View File

@ -249,7 +249,7 @@ defineExpose({
updateFieldsList,
});
</script>
<style lang="less" scoped>
<style lang="scss" scoped>
:deep(.arco-picker) {
width: 100%;
}

2
src/components/wyg-table/index.vue
View File

@ -70,4 +70,4 @@ watchEffect(() => {
}
});
</script>
<style lang="less" scoped></style>
<style lang="scss" scoped></style>