版本号显示 v2.1.5 → v2.1.6

带农历日期显示的版本，重新上传体验版。

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

pages/calendar/calendar.js

@@ -1,8 +1,20 @@
 // calendar.js
 const storage = require('../../utils/storage')
 const dateUtils = require('../../utils/date')
+const lunar = require('../../utils/lunar')
 const { TYPE_NAMES, TYPE_ICONS, IMPORTANCE_COLORS } = require('../../utils/constants')
 
+// 算出某条纪念日在指定年份的公历 (month, day)
+// 公历纪念日：每年同月同日，直接用录入时的 solarMonth/solarDay
+// 农历纪念日：把农历月日转回当年公历，因为农历对应的公历日期每年都不同
+function getAnniversaryDateInYear(a, year) {
+  if (a.isLunar && a.lunarMonth && a.lunarDay) {
+    const date = lunar.lunarToSolar(year, a.lunarMonth, a.lunarDay, !!a.isLeapMonth)
+    return { month: date.getMonth() + 1, day: date.getDate() }
+  }
+  return { month: a.solarMonth, day: a.solarDay }
+}
+
 Page({
   data: {
     currentYear: new Date().getFullYear(),
@@ -27,8 +39,9 @@ Page({
   buildEventIndex(anniversaries, year, month) {
     const index = {}
     for (const a of anniversaries) {
-      if (a.solarYear === year && a.solarMonth === month) {
+      const { month: m, day: d } = getAnniversaryDateInYear(a, year)
-        const key = String(a.solarDay)
+      if (m === month) {
+        const key = String(d)
         if (!index[key]) index[key] = []
         index[key].push(a)
       }
@@ -100,24 +113,27 @@ Page({
     const persons = storage.getPersons()
     const anniversaries = storage.getAnniversaries()
 
-    // 筛选本月纪念日
     const monthEvents = anniversaries
-      .filter(a => a.solarYear === currentYear && a.solarMonth === currentMonth)
       .map(a => {
-        const person = persons.find(p => p.id === a.personId)
+        const { month: m, day: d } = getAnniversaryDateInYear(a, currentYear)
-        const date = new Date(currentYear, currentMonth - 1, a.solarDay)
+        return { ...a, _displayMonth: m, _displayDay: d }
-        const daysUntil = dateUtils.getDaysUntil(date)
+      })
-        
+      .filter(x => x._displayMonth === currentMonth)
+      .map(x => {
+        const person = persons.find(p => p.id === x.personId)
+        const date = new Date(currentYear, x._displayMonth - 1, x._displayDay)
+        const ld = lunar.solarToLunar(date)
         return {
-          ...a,
+          ...x,
           personName: person ? person.name : '未知',
-          typeIcon: this.getTypeIcon(a.type),
+          typeIcon: this.getTypeIcon(x.type),
-          typeName: a.customTypeName || this.getTypeName(a.type),
+          typeName: x.customTypeName || this.getTypeName(x.type),
           dateText: dateUtils.formatDate(date, 'MM月DD日'),
-          daysUntil
+          lunarMD: ld.lunarText,
+          daysUntil: dateUtils.getDaysUntil(date)
         }
       })
-      .sort((a, b) => a.solarDay - b.solarDay)
+      .sort((a, b) => a._displayDay - b._displayDay)
 
     this.setData({ monthEvents })
   },

pages/calendar/calendar.wxml

@@ -40,7 +40,10 @@
         <view class="event-header">
           <text class="event-icon">{{item.typeIcon}}</text>
           <text class="event-title">{{item.personName}} - {{item.typeName}}</text>
+          <view class="event-date-group">
             <text class="event-date">{{item.dateText}}</text>
+            <text class="event-lunar">{{item.lunarMD}}</text>
+          </view>
         </view>
         <view class="event-info">
           <text wx:if="{{item.isLunar}}" class="lunar-badge">农历</text>

pages/calendar/calendar.wxss

@@ -249,11 +249,23 @@
   white-space: nowrap;
 }
 
+.event-date-group {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+  flex-shrink: 0;
+  margin-left: 12rpx;
+  gap: 2rpx;
+}
+
 .event-date {
   font-size: 24rpx;
   color: #8A8278;
-  flex-shrink: 0;
+}
-  margin-left: 12rpx;
+
+.event-lunar {
+  font-size: 20rpx;
+  color: #A9A096;
 }
 
 .event-info {

pages/person-detail/person-detail.js

@@ -1,6 +1,7 @@
 // person-detail.js
 const storage = require('../../utils/storage')
 const dateUtils = require('../../utils/date')
+const lunar = require('../../utils/lunar')
 const fmt = require('../../utils/format')
 
 Page({
@@ -52,11 +53,13 @@ Page({
     const formatted = anniversaries.map(a => {
       const date = new Date(a.solarYear, a.solarMonth - 1, a.solarDay)
       const daysUntil = dateUtils.getDaysUntil(date)
+      const ld = lunar.solarToLunar(date)
 
       return {
         ...a,
         date,
         dateText: dateUtils.formatDate(date, 'YYYY年MM月DD日'),
+        lunarText: `农历 ${ld.year}年 ${ld.lunarText}`,
         daysUntil,
         daysUntilAbs: Math.abs(daysUntil),
         typeIcon: fmt.getTypeIcon(a.type),

pages/person-detail/person-detail.wxml

@@ -44,6 +44,11 @@
         <text wx:if="{{item.isLunar}}" class="lunar-badge">农历</text>
       </view>
 
+      <view class="anniversary-lunar">
+        <text class="lunar-icon">🌙</text>
+        <text class="lunar-text">{{item.lunarText}}</text>
+      </view>
+
       <view wx:if="{{item.daysUntil !== undefined}}" class="days-info">
         <text wx:if="{{item.daysUntil === 0}}" class="days-text urgent">今天</text>
         <text wx:elif="{{item.daysUntil === 1}}" class="days-text warning">明天</text>

pages/person-detail/person-detail.wxss

@@ -193,11 +193,25 @@
 }
 
 .anniversary-date {
-  margin-bottom: 12rpx;
+  margin-bottom: 8rpx;
   font-size: 24rpx;
   color: #5A5247;
 }
 
+.anniversary-lunar {
+  display: flex;
+  align-items: center;
+  gap: 8rpx;
+  margin-bottom: 12rpx;
+  font-size: 22rpx;
+  color: #8A8278;
+}
+
+.lunar-icon {
+  font-size: 20rpx;
+  opacity: 0.7;
+}
+
 .date-label {
   color: #8A8278;
 }

pages/settings/settings.js

@@ -19,7 +19,7 @@ Page({
     personsCount: 0,
     anniversariesCount: 0,
     lastBackupText: '从未备份',
-    version: 'v2.1.3'
+    version: 'v2.1.6'
   },
 
   onLoad() {