diff --git a/src/components/family-card/index.module.scss b/src/components/family-card/index.module.scss index a9a0249..dc9b38a 100644 --- a/src/components/family-card/index.module.scss +++ b/src/components/family-card/index.module.scss @@ -2,6 +2,7 @@ .card { position: relative; overflow: hidden; + margin-bottom: 24px; background: $color-primary-light-bg; border: 1px solid $color-primary-light-border; border-radius: $radius-lg; @@ -77,11 +78,17 @@ color: $color-primary-deep; } +// 信息行:浅绿卡身上用更淡的绿分割线区分,不用灰白 $color-border .rows { display: flex; align-items: center; justify-content: space-between; - min-height: 56px; + min-height: 60px; + border-top: 1px solid $color-primary-light-border; +} + +.rows:first-of-type { + border-top: none; } .rowLabel { @@ -92,6 +99,7 @@ .rowValue { margin-left: 24px; font-size: 26px; + font-weight: 500; color: $color-text; overflow: hidden; text-overflow: ellipsis; diff --git a/src/pages/family/contact/add.module.scss b/src/pages/family/contact/add.module.scss index d2e2a88..111df8f 100644 --- a/src/pages/family/contact/add.module.scss +++ b/src/pages/family/contact/add.module.scss @@ -93,6 +93,20 @@ z-index: 1; } +// 删除钮命中区 64px 内收成浅红圆底,给出可点视觉 +.contactDelPressed .contactDelInner { + background: $color-danger-light-bg; + border-radius: $radius-circle; +} + +.contactDelInner { + width: 44px; + height: 44px; + display: flex; + align-items: center; + justify-content: center; +} + .contactDelText { font-size: 36px; color: $color-danger; @@ -108,6 +122,15 @@ justify-content: center; } +.submitPressed { + opacity: 0.85; +} + +// 提交中防重复点击的视觉降级 +.submitDisabled { + opacity: 0.6; +} + .submitText { font-size: 32px; font-weight: 600; diff --git a/src/pages/family/contact/add.tsx b/src/pages/family/contact/add.tsx index 40f49bc..5b43343 100644 --- a/src/pages/family/contact/add.tsx +++ b/src/pages/family/contact/add.tsx @@ -108,8 +108,10 @@ export default function ContactAdd() { {contacts.map((c) => ( - removeContact(c.id)}> - × + removeContact(c.id)}> + + × + 姓名 @@ -143,7 +145,11 @@ export default function ContactAdd() { ))} - + {submitting ? '提交中...' : '确认添加'} diff --git a/src/pages/family/detail.module.scss b/src/pages/family/detail.module.scss index eab13b5..78ba981 100644 --- a/src/pages/family/detail.module.scss +++ b/src/pages/family/detail.module.scss @@ -17,7 +17,7 @@ // 添加关爱对象虚线卡:与列表页底部加号卡同款式 .addCared { - margin-top: 24px; + margin-top: 0; padding: 48px 32px; background: $color-bg-white; border: 1px dashed $color-primary-light-border; @@ -27,28 +27,49 @@ align-items: center; } +// 达上限态:灰化降级,明确"不可点" +.addCaredDisabled { + border-color: $color-border; +} + .addCaredIcon { width: 96px; height: 96px; border-radius: $radius-circle; - background: $color-primary; + background: $color-primary-grad; display: flex; align-items: center; justify-content: center; margin-bottom: 16px; } +.addCaredIconDisabled { + background: $color-bg-disabled; +} + .addCaredIconText { font-size: 48px; font-weight: 300; color: #ffffff; } +.addCaredIconTextDisabled { + color: $color-text-tertiary; +} + .addCaredText { font-size: 26px; color: $color-text-secondary; } +.addCaredTextDisabled { + color: $color-text-tertiary; +} + +.addCaredPressed { + opacity: 0.85; +} + .section { margin-top: 24px; } diff --git a/src/pages/family/detail.tsx b/src/pages/family/detail.tsx index 87bbd84..c92571c 100644 --- a/src/pages/family/detail.tsx +++ b/src/pages/family/detail.tsx @@ -82,15 +82,20 @@ export default function FamilyDetail() { - {/* 添加关爱对象卡:达上限后静态 */} + {/* 添加关爱对象卡:达上限后灰化静态 */} - - + + + + + + - + {canAdd ? `+ 最多可添加 ${MAX_CARED_PER_FAMILY} 人` : '已达上限'} diff --git a/src/pages/family/index.module.scss b/src/pages/family/index.module.scss index 9babef5..b9a42c9 100644 --- a/src/pages/family/index.module.scss +++ b/src/pages/family/index.module.scss @@ -9,7 +9,6 @@ } .addCard { - margin-top: 24px; padding: 48px 32px; background: $color-bg-white; border: 1px dashed $color-primary-light-border; @@ -23,7 +22,7 @@ width: 96px; height: 96px; border-radius: $radius-circle; - background: $color-primary; + background: $color-primary-grad; display: flex; align-items: center; justify-content: center; @@ -66,6 +65,10 @@ color: #ffffff; } +.btnPressed { + opacity: 0.85; +} + .modalBtnPlain { height: 88px; border: 1px solid $color-primary-light-border; @@ -75,6 +78,10 @@ justify-content: center; } +.btnPlainPressed { + background: $color-primary-light-bg; +} + .modalBtnPlainText { font-size: 30px; color: $color-primary-deep; diff --git a/src/pages/family/index.tsx b/src/pages/family/index.tsx index e1fe8c0..d261bcd 100644 --- a/src/pages/family/index.tsx +++ b/src/pages/family/index.tsx @@ -96,10 +96,10 @@ export default function Family() { setShowCreateModal(false)}> 添加家庭圈 - + 新建家庭 - + 加入家庭