diff --git a/weapp/pages/index/index.wxml b/weapp/pages/index/index.wxml index e2d3bdf..75c45d6 100644 --- a/weapp/pages/index/index.wxml +++ b/weapp/pages/index/index.wxml @@ -24,11 +24,8 @@ TA{{partner2Location}} - 🎂 今天是你们的生日 - - 🎂 {{partner1Birthday === '今天!' ? '今天是你的生日' : '距你的生日还有 ' + partner1Birthday}} - 🎂 {{partner2Birthday === '今天!' ? '今天是TA的生日' : '距TA的生日还有 ' + partner2Birthday}} - + 🎂 我的生日{{partner1Birthday === '今天!' ? '今天' : partner1Birthday}} + 🎂 TA的生日{{partner2Birthday === '今天!' ? '今天' : partner2Birthday}} diff --git a/weapp/pages/index/index.wxss b/weapp/pages/index/index.wxss index 93afe8d..2afc3d0 100644 --- a/weapp/pages/index/index.wxss +++ b/weapp/pages/index/index.wxss @@ -31,7 +31,7 @@ .home-location-partner { color:#526B57; background:#E4EBE3; } .home-location-text { flex:1; min-width:0; padding-top:2rpx; font-size:23rpx; line-height:1.6; color:#85776D; overflow-wrap:break-word; word-break:break-all; } .home-distance-pill { display:inline-block; flex-shrink:0; white-space:nowrap; padding:8rpx 14rpx; border-radius:24rpx; background:#FBE4ED; color:#B74768; font-size:22rpx; line-height:1.5; } -.home-birthday-row { display:flex; flex-direction:column; align-items:flex-start; gap:10rpx; margin-top:18rpx; color:#A65A73; font-size:22rpx; line-height:1.6; } +.home-birthday-row { display:flex; flex-wrap:wrap; align-items:center; gap:8rpx 28rpx; margin-top:18rpx; color:#A65A73; font-size:22rpx; line-height:1.6; } @import '../../styles/button-theme.wxss';