diff --git a/components/GenealogyCard.vue b/components/GenealogyCard.vue index ee41de9..9b8f417 100644 --- a/components/GenealogyCard.vue +++ b/components/GenealogyCard.vue @@ -198,16 +198,18 @@ defineEmits(["select"]); margin-right: 6rpx; } .card-meta { - color: $ink-muted; + color: #62584c; font-size: 26rpx; + font-weight: 500; } .card-updated { display: flex; flex: 0 0 auto; align-items: center; margin-left: 10rpx; - color: $ink-muted; - font-size: 22rpx; + color: #62584c; + font-size: 24rpx; + font-weight: 500; white-space: nowrap; } @@ -224,8 +226,9 @@ defineEmits(["select"]); } .card-role { - color: $ink-muted; - font-size: 24rpx; + color: #62584c; + font-size: 26rpx; + font-weight: 500; white-space: nowrap; } .card-chevron { diff --git a/components/ModulePage.vue b/components/ModulePage.vue index 2f2829e..cfb4fe7 100644 --- a/components/ModulePage.vue +++ b/components/ModulePage.vue @@ -9,9 +9,8 @@ 'module-state--error': moduleState === 'error' } ]"> - - - + + @@ -28,7 +27,7 @@ {{ field }} {{ normalizedNote }} - {{ page.action }} + @@ -37,7 +36,7 @@ {{ item[0] }}{{ item[1] }}点按查看详情 - {{ page.action }} + @@ -49,7 +48,7 @@ {{ item[0] }}{{ item[1] }} - {{ page.action }} + @@ -58,7 +57,7 @@ 第 {{ index + 1 }} 则{{ item[0] }}{{ item[1] }} - {{ page.action }} + @@ -68,7 +67,7 @@ {{ item[0] }}{{ item[1] }}查看 - {{ page.action }} + @@ -76,7 +75,7 @@ {{ page.badge }} · 服务说明{{ page.lead }}{{ normalizedNote }} - {{ page.action }} + @@ -86,27 +85,35 @@ {{ stateCopy.eyebrow }}{{ stateCopy.title }}{{ stateCopy.copy }} - {{ stateCopy.action }} + + diff --git a/components/PageHeader.vue b/components/PageHeader.vue index f0a6716..3f6e6a6 100644 --- a/components/PageHeader.vue +++ b/components/PageHeader.vue @@ -8,7 +8,9 @@ - {{ backLabel }} + + + {{ title }} @@ -27,7 +29,6 @@ const props = defineProps({ title: { type: String, required: true }, action: { type: String, default: '' }, - backLabel: { type: String, default: '返回' }, root: { type: Boolean, default: false }, unreadCount: { type: Number, default: 0 } }) @@ -114,13 +115,14 @@ const goBack = () => uni.navigateBack() background: #fff9ed; } -.header-back, .header-action { width: 100%; font-size: 27rpx; } -.header-back { text-align: left; } +.header-back { display: flex; width: 88rpx; height: 88rpx; align-items: center; justify-content: flex-start; } +.header-back__icon { width: 42rpx; height: 42rpx; filter: brightness(0) invert(1); transform: scaleX(-1); } +.header-back--pressed { opacity: .62; } .header-action { color: #ffe3a7; text-align: right; } .header-title { diff --git a/components/tree/TreeMemberForm.vue b/components/tree/TreeMemberForm.vue index 7ce6d8d..c5967cc 100644 --- a/components/tree/TreeMemberForm.vue +++ b/components/tree/TreeMemberForm.vue @@ -6,7 +6,7 @@ 'form-state--conflict': formState === 'conflict', 'form-state--error': formState === 'error' }"> - + @@ -22,7 +22,7 @@ {{ config.note }} - {{ config.action }} + {{ config.action }} @@ -32,36 +32,33 @@ {{ resultCopy.copy }} - 返回核对 + 返回核对 - 查看冲突 + 查看冲突 - {{ formState === 'success' ? '继续完善' : '重新填写' }} + {{ formState === 'success' ? '继续完善' : '重新填写' }} - - - - - 关系校验规则 - 关系冲突说明 - 同一成员不能同时存在两个生父,也不能形成上下代循环。请返回世系树核对原关系后再调整。 - - 我知道了 - - - - +