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

# Conflicts:
#	src/views/property-marketing/intelligent-solution/businessAnalysisReport.vue
#	src/views/property-marketing/put-account/account-dashboard/index.vue
This commit is contained in:
林志军
2025-06-30 17:32:22 +08:00
15 changed files with 1108 additions and 101 deletions

View File

@ -22,17 +22,8 @@
border: 1px solid var(--BG-500, #b1b2b5);
}
}
.arco-modal-header {
border-bottom: 1px solid var(--Border-1, #d7d7d9);
height: 56px;
padding: 0 20px;
.arco-modal-title {
justify-content: flex-start;
}
}
.arco-modal-body {
padding: 24px 20px;
.arco-form-item {
margin-bottom: 16px;
&:last-child {
@ -48,15 +39,6 @@
}
}
}
.arco-modal-footer {
display: flex;
height: 64px;
padding: 0px 20px;
justify-content: flex-end;
align-items: center;
border-top: 1px solid var(--Border-1, #d7d7d9);
}
}