From 92f211fc3bea1de967093c76c2389bf01fb1c946 Mon Sep 17 00:00:00 2001
From: Blizzard <blizzardzhang@icloud.com>
Date: Sun, 11 Oct 2026 08:59:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8C=E6=AD=A5=E8=A6=86?=
 =?UTF-8?q?=E7=9B=96=E7=9A=84=E9=A6=96=E9=A1=B5=E7=94=9F=E6=97=A5=E6=8E=92?=
 =?UTF-8?q?=E7=89=88=E4=B8=8E=E5=BD=93=E5=A4=A9=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 weapp/pages/index/index.wxml | 7 +++++--
 weapp/pages/index/index.wxss | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/weapp/pages/index/index.wxml b/weapp/pages/index/index.wxml
index 75c45d6..e2d3bdf 100644
--- a/weapp/pages/index/index.wxml
+++ b/weapp/pages/index/index.wxml
@@ -24,8 +24,11 @@
     <view class="home-location-row" wx:if="{{partner2Location && coupleId}}"><text class="home-location-label home-location-partner">TA</text><text class="home-location-text">{{partner2Location}}</text></view>
   </view>
   <view class="home-birthday-row" wx:if="{{partner1Birthday || partner2Birthday}}">
-    <text class="home-birthday-item" wx:if="{{partner1Birthday}}">🎂 我的生日{{partner1Birthday === '今天！' ? '今天' : partner1Birthday}}</text>
-    <text class="home-birthday-item" wx:if="{{partner2Birthday}}">🎂 TA的生日{{partner2Birthday === '今天！' ? '今天' : partner2Birthday}}</text>
+    <text class="home-birthday-item" wx:if="{{partner1Birthday === '今天！' && partner2Birthday === '今天！'}}">🎂 今天是你们的生日</text>
+    <block wx:else>
+      <text class="home-birthday-item" wx:if="{{partner1Birthday}}">🎂 {{partner1Birthday === '今天！' ? '今天是你的生日' : '距你的生日还有 ' + partner1Birthday}}</text>
+      <text class="home-birthday-item" wx:if="{{partner2Birthday}}">🎂 {{partner2Birthday === '今天！' ? '今天是TA的生日' : '距TA的生日还有 ' + partner2Birthday}}</text>
+    </block>
   </view>
 </view>
 </view>
diff --git a/weapp/pages/index/index.wxss b/weapp/pages/index/index.wxss
index 2afc3d0..93afe8d 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-wrap:wrap; align-items:center; gap:8rpx 28rpx; margin-top:18rpx; color:#A65A73; font-size:22rpx; line-height:1.6; }
+.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; }
 
 @import '../../styles/button-theme.wxss';