diff --git a/src/components/CaseCard.vue b/src/components/CaseCard.vue index a2b6f18..af8dbbf 100644 --- a/src/components/CaseCard.vue +++ b/src/components/CaseCard.vue @@ -97,16 +97,16 @@ const meta = computed>(() => [ &__tag { position: absolute; - top: 87px; - left: 22px; - height: 44px; - padding: 0 14px; + top: 12px; + left: 12px; + height: 28px; + padding: 0 @spacing-sm; border-radius: @radius-sm; background: @primary-strong; color: @white; - font-size: 28px; + font-size: @font-size-sm; font-weight: 500; - line-height: 44px; + line-height: 28px; &--hardware { background: @tag-hardware; diff --git a/src/components/CasesFilter.vue b/src/components/CasesFilter.vue index 42b1ef9..af66a57 100644 --- a/src/components/CasesFilter.vue +++ b/src/components/CasesFilter.vue @@ -292,15 +292,15 @@ function clearChips(): void { diff --git a/src/components/PaginationBar.vue b/src/components/PaginationBar.vue index 25adcd6..0db6fc9 100644 --- a/src/components/PaginationBar.vue +++ b/src/components/PaginationBar.vue @@ -67,18 +67,18 @@ function go(page: number): void { .pagination { .flex(row, center); gap: @spacing-xs; - padding: 12px 0; + padding: @spacing-base 0; &__btn { .flex(row, center); - min-width: 20px; - height: 25px; - padding: 0 3px; + min-width: 28px; + height: 28px; + padding: 0 6px; border: 1px solid @border-color; border-radius: @radius-sm; background: @white; - color: @text-color-secondary; - font-size: 11px; + color: @text-color; + font-size: @font-size-sm; transition: all 0.2s; &:hover:not(:disabled):not(.is-ellipsis) { @@ -87,9 +87,10 @@ function go(page: number): void { } &.is-active { - border-color: @cases-page-active-bg; - background: @cases-page-active-bg; + border-color: @primary-strong; + background: @primary-light; color: @primary-strong; + font-weight: 500; } &.is-ellipsis { diff --git a/src/components/SmsCodeInput.vue b/src/components/SmsCodeInput.vue index 41509c8..cc75a2c 100644 --- a/src/components/SmsCodeInput.vue +++ b/src/components/SmsCodeInput.vue @@ -38,7 +38,7 @@ function onGetCode(): void { min-width: 0; height: 40px; padding: 0 12px; - border: 1px solid #dde1e7; + border: 1px solid @border-color; border-radius: @radius-sm; background: @white; font-size: 13px; diff --git a/src/styles/variables.less b/src/styles/variables.less index 28f3de4..5832031 100644 --- a/src/styles/variables.less +++ b/src/styles/variables.less @@ -90,10 +90,10 @@ @shadow-lg: 0 4px 16px rgba(31, 39, 51, 0.12); @filter-selected-bg: #e7eeff; -@pill-bg: #ededed; +@pill-bg: #f5f6f8; @pill-selected-bg: #075cff; @chips-panel-bg: #eaf1ff; -@input-bg: #ededed; +@input-bg: #f5f6f8; @tag-hardware: #4caf50; @tag-iot: #5720ba; @tag-manufacturing: #ff8f1f; @@ -105,19 +105,23 @@ @cases-filter-title: #222222; @cases-text: #333333; @cases-muted: #666666; -@cases-input-border: #999999; +@cases-input-border: #cdd3dd; @cases-icon: #797979; -@cases-reset-bg: #f0f0f0; -@cases-card-border: #e1dfdf; -@cases-card-shadow: 0 4px 10px rgba(0, 0, 0, 0.08); +@cases-reset-bg: #f5f6f8; +@cases-card-border: #e4e7ec; +@cases-card-shadow: 0 2px 8px rgba(31, 39, 51, 0.06); @cases-page-active-bg: #e0e9fa; +@cases-filter-width: 320px; @demand-selected-bg: #024fff; @demand-accent: #024fff; @demand-secondary-bg: #075cff; -@project-table-head-bg: #e8e8e8; -@project-table-line: #bbbbbb; +@project-table-head-bg: #f7f8fa; +@project-table-line: #e4e7ec; +@project-filter-width: 320px; +@project-pill-bg: #f5f6f8; +@project-input-bg: #f5f6f8; @project-accent: #024fff; @project-track: #edeff2; @@ -181,8 +185,8 @@ @demand-ink: #121212; @demand-heading: #333333; @demand-subtitle: #666666; -@demand-line: #999999; -@demand-upload-bg: #ededed; +@demand-line: #e4e7ec; +@demand-upload-bg: #f5f6f8; @demand-radio-idle: #c7c2c2; @auth-gradient-from: #505be8; @auth-gradient-to: #8b3fe8; @@ -208,7 +212,7 @@ @project-cell: #4b5563; @project-card: #ffffff; @project-field-bg: #f3f4f6; -@project-input-border: #dde1e7; +@project-input-border: #e4e7ec; @project-head-bg: #f7f8fa; @project-upload-tag: #ef4444; @project-banner-soft: #fdeeee; @@ -223,12 +227,12 @@ @contract-accent: #075cff; @contract-muted: #666666; -@contract-head-text: #222222; +@contract-head-text: #666666; @contract-cell-text: #333333; -@contract-line: #999999; -@contract-table-head-bg: #ededed; +@contract-line: #e4e7ec; +@contract-table-head-bg: #f7f8fa; @contract-placeholder: #b3b9c4; -@contract-reset-bg: #eef0f3; +@contract-reset-bg: #f5f6f8; @contract-qr-bg: #d6d6d6; @finance-hero-gradient: linear-gradient( @@ -239,8 +243,8 @@ ); @finance-chart-bar: #4a90c4; @finance-chart-grid: #edeef2; -@finance-table-head-bg: #f1f3f5; -@finance-field-bg: #f3f4f6; +@finance-table-head-bg: #f7f8fa; +@finance-field-bg: #f5f6f8; @finance-page-active: #d5e2fe; @finance-summary-cta: #ffb754; @finance-result-circle: #7ed321; @@ -252,7 +256,7 @@ @profile-nav-active-bg: #e7eeff; @profile-card-border: #f0f1f3; @profile-line: #e5e7eb; -@profile-input-border: #dde1e7; +@profile-input-border: #e4e7ec; @profile-radius: 6px; @profile-page-bg: #f4f5f9; @profile-ink: #1f2937; diff --git a/src/views/cases/cpns/CaseHero.vue b/src/views/cases/cpns/CaseHero.vue index 4b72797..08a5540 100644 --- a/src/views/cases/cpns/CaseHero.vue +++ b/src/views/cases/cpns/CaseHero.vue @@ -30,18 +30,26 @@ const coverStyle = computed(() => diff --git a/src/views/contract/sign.vue b/src/views/contract/sign.vue index 96f6ed5..ed4fffc 100644 --- a/src/views/contract/sign.vue +++ b/src/views/contract/sign.vue @@ -63,16 +63,18 @@ onMounted(load) diff --git a/src/views/demand/cpns/DemandConfirmForm.vue b/src/views/demand/cpns/DemandConfirmForm.vue index e0ff44f..0c43e00 100644 --- a/src/views/demand/cpns/DemandConfirmForm.vue +++ b/src/views/demand/cpns/DemandConfirmForm.vue @@ -99,24 +99,24 @@ function onRemark(event: Event): void { } &__label { - font-size: 20px; + font-size: @font-size-base; font-weight: 500; - line-height: 29px; + line-height: 1.4; color: @demand-heading; } &__input { .text-control(); - height: 49px; - padding: 0 18px; - border-color: @demand-line; + height: 40px; + padding: 0 @spacing-base; + border-color: @border-color; border-radius: @radius-sm; - font-size: 20px; + font-size: @font-size-base; color: @demand-ink; &::placeholder { font-weight: 400; - color: @demand-line; + color: @text-color-disabled; } } @@ -127,27 +127,27 @@ function onRemark(event: Event): void { &__textarea { .text-control(); - height: 270px; - min-height: 270px; - padding: 10px 18px 24px; - border-color: @demand-line; + height: 160px; + min-height: 160px; + padding: @spacing-base; + border-color: @border-color; border-radius: @radius-sm; - font-size: 20px; + font-size: @font-size-base; color: @demand-ink; - line-height: 29px; + line-height: 1.5; resize: vertical; &::placeholder { font-weight: 400; - color: @demand-line; + color: @text-color-disabled; } } &__count { position: absolute; - right: @spacing-lg; + right: @spacing-base; bottom: @spacing-sm; - font-size: 16px; + font-size: @font-size-sm; color: @text-color-disabled; } } diff --git a/src/views/demand/cpns/DemandInfoForm.vue b/src/views/demand/cpns/DemandInfoForm.vue index da151c3..b329a32 100644 --- a/src/views/demand/cpns/DemandInfoForm.vue +++ b/src/views/demand/cpns/DemandInfoForm.vue @@ -201,9 +201,9 @@ function onBudgetManualBlur(event: Event): void { } &__label { - font-size: 20px; + font-size: @font-size-base; font-weight: 500; - line-height: 29px; + line-height: 1.4; color: @demand-heading; } @@ -214,16 +214,16 @@ function onBudgetManualBlur(event: Event): void { &__input { .text-control(); - height: 49px; - padding: 0 18px; - border-color: @demand-line; + height: 40px; + padding: 0 @spacing-base; + border-color: @border-color; border-radius: @radius-sm; - font-size: 20px; + font-size: @font-size-base; color: @demand-ink; &::placeholder { font-weight: 400; - color: @demand-line; + color: @text-color-disabled; } } @@ -234,47 +234,47 @@ function onBudgetManualBlur(event: Event): void { &__textarea { .text-control(); - height: 270px; - min-height: 270px; - padding: 10px 18px 24px; - border-color: @demand-line; + height: 160px; + min-height: 160px; + padding: @spacing-base; + border-color: @border-color; border-radius: @radius-sm; - font-size: 20px; + font-size: @font-size-base; color: @demand-ink; - line-height: 29px; + line-height: 1.5; resize: vertical; &::placeholder { font-weight: 400; - color: @demand-line; + color: @text-color-disabled; } } &__count { position: absolute; - right: @spacing-lg; + right: @spacing-base; bottom: @spacing-sm; - font-size: 16px; + font-size: @font-size-sm; color: @text-color-disabled; } &__budgets { .flex(row, flex-start, stretch); - gap: 17px; + gap: @spacing-base; } &__budget { flex: 1; min-width: 0; - height: 49px; + height: 40px; padding: 0 @spacing-sm; - border: 1px solid @demand-line; - border-radius: @radius-sm; + border: 1px solid @border-color; + border-radius: @radius-base; background: @white; - font-size: 20px; + font-size: @font-size-base; font-weight: 400; font-family: inherit; - color: @demand-line; + color: @text-color; text-align: center; cursor: pointer; transition: all 0.2s; @@ -287,8 +287,8 @@ function onBudgetManualBlur(event: Event): void { &.is-active { border-color: @demand-accent; - background: @demand-selected-bg; - color: @white; + background: @filter-selected-bg; + color: @demand-accent; font-weight: 500; } } @@ -298,7 +298,7 @@ function onBudgetManualBlur(event: Event): void { &::placeholder { font-weight: 400; - color: @demand-line; + color: @text-color-disabled; } } } diff --git a/src/views/demand/index.vue b/src/views/demand/index.vue index d3c269a..9764aec 100644 --- a/src/views/demand/index.vue +++ b/src/views/demand/index.vue @@ -120,7 +120,9 @@ onMounted(() => { diff --git a/src/views/finance/bill-detail.vue b/src/views/finance/bill-detail.vue index 3c1d054..357a545 100644 --- a/src/views/finance/bill-detail.vue +++ b/src/views/finance/bill-detail.vue @@ -150,16 +150,17 @@ onMounted(() => { diff --git a/src/views/home/cpns/HomeWelcome.vue b/src/views/home/cpns/HomeWelcome.vue index b3b167b..0f6aed8 100644 --- a/src/views/home/cpns/HomeWelcome.vue +++ b/src/views/home/cpns/HomeWelcome.vue @@ -37,24 +37,24 @@ const greeting = computed(() => { &__greeting { .flex(row, flex-start); gap: @spacing-sm; - font-size: 52px; - font-weight: 700; + font-size: @font-size-title; + font-weight: 600; color: @home-welcome; } &__wave { .flex(row, center); - width: 44px; - height: 44px; + width: 32px; + height: 32px; border-radius: @radius-round; background: fade(@black, 4%); - font-size: @font-size-xl; + font-size: @font-size-lg; } &__summary { - font-size: 24px; + font-size: @font-size-base; font-weight: 400; - color: @home-welcome; + color: @text-color-secondary; } } diff --git a/src/views/home/detail.vue b/src/views/home/detail.vue index 11351a8..aa2c34b 100644 --- a/src/views/home/detail.vue +++ b/src/views/home/detail.vue @@ -58,14 +58,16 @@ onMounted(load) diff --git a/src/views/message/cpns/MessageTabs.vue b/src/views/message/cpns/MessageTabs.vue index b14fd45..48f73ba 100644 --- a/src/views/message/cpns/MessageTabs.vue +++ b/src/views/message/cpns/MessageTabs.vue @@ -41,9 +41,9 @@ function countOf(value: MessageType | 'all', counts: MessageTabCounts): number {