1943fd5c1a
1. 删除纪念日不同步云端:storage.deleteAnniversary 只删本地,后端记录仍是
remindEnabled=1,定时任务会继续推已删除的纪念日,换设备恢复时还会被拉回来。
补上 _syncAnniversary('delete')。
2. 农历纪念日日期计算三处口径不一:date.js 新增 getOccurrenceInYear /
getNextOccurrenceOf,首页、详情页、日历页统一复用。
顺带修掉一个隐藏更深的坑——老实现把公历年当农历年传给 lunarToSolar,
农历腊月会整整错一年(农历2026腊月十五 = 公历2027-01-22,老算法给 2028-01-11)。
新实现同时试 year-1 / year 两个农历年,取真正落在该公历年内的那次。
删除已无调用方的旧 getNextOccurrence(month, day),它正是首页 bug 的来源。
3. 详情页倒计时永远显示「已过 N 天」:原先按录入年份算 daysUntil,
改为按下一次发生算;「日期」一行仍展示原始录入日期。
4. 日历页切 tab 后不刷新:渲染从 onLoad 挪到 onShow(tabBar 页面实例常驻),
不重置当前年月,保留用户翻到的月份。
5. 清空数据后重启会复活:只清本地的话 pullFromCloudIfEmpty 会把云端整份拉回来。
新增 storage.clearCloudData()(sync 传空数组),设置页改为先清云端、
成功才清本地;云端失败则中止并提示,本地数据保留。
均为小程序侧改动,server/ 未改动,无需重新部署。
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
215 lines
5.8 KiB
JavaScript
215 lines
5.8 KiB
JavaScript
// 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)
|
|
// 具体的公历/农历分支逻辑统一在 utils/date.js 的 getOccurrenceInYear 里,这里只做取值
|
|
function getAnniversaryDateInYear(a, year) {
|
|
const date = dateUtils.getOccurrenceInYear(a, year)
|
|
return { month: date.getMonth() + 1, day: date.getDate() }
|
|
}
|
|
|
|
Page({
|
|
data: {
|
|
currentYear: new Date().getFullYear(),
|
|
currentMonth: new Date().getMonth() + 1,
|
|
calendarDays: [],
|
|
monthEvents: []
|
|
},
|
|
|
|
onLoad() {
|
|
const today = new Date()
|
|
this.setData({
|
|
currentYear: today.getFullYear(),
|
|
currentMonth: today.getMonth() + 1
|
|
})
|
|
},
|
|
|
|
// 渲染放在 onShow:日历是 tabBar 页面,实例常驻,
|
|
// 只在 onLoad 渲染会导致新增/删除纪念日后切回来看不到变化。
|
|
// 这里不重置 currentYear/currentMonth,保留用户当前翻到的月份。
|
|
onShow() {
|
|
this.renderCalendar()
|
|
this.loadMonthEvents()
|
|
},
|
|
|
|
/**
|
|
* 构建当月事件索引 { "day": [anniversary, ...] }
|
|
*/
|
|
buildEventIndex(anniversaries, year, month) {
|
|
const index = {}
|
|
for (const a of anniversaries) {
|
|
const { month: m, day: d } = getAnniversaryDateInYear(a, year)
|
|
if (m === month) {
|
|
const key = String(d)
|
|
if (!index[key]) index[key] = []
|
|
index[key].push(a)
|
|
}
|
|
}
|
|
return index
|
|
},
|
|
|
|
/**
|
|
* 渲染日历
|
|
*/
|
|
renderCalendar() {
|
|
const { currentYear, currentMonth } = this.data
|
|
const anniversaries = storage.getAnniversaries()
|
|
|
|
// 预建事件索引,避免 O(n×m) 过滤
|
|
const eventIndex = this.buildEventIndex(anniversaries, currentYear, currentMonth)
|
|
|
|
const firstDay = new Date(currentYear, currentMonth - 1, 1)
|
|
const startWeekday = firstDay.getDay()
|
|
const daysInMonth = new Date(currentYear, currentMonth, 0).getDate()
|
|
const prevMonthDays = new Date(currentYear, currentMonth - 1, 0).getDate()
|
|
|
|
const calendarDays = []
|
|
|
|
// 填充上个月的日期
|
|
for (let i = startWeekday - 1; i >= 0; i--) {
|
|
const day = prevMonthDays - i
|
|
calendarDays.push({ day, isToday: false, isOtherMonth: true, events: [], hasMore: false })
|
|
}
|
|
|
|
// 填充本月的日期
|
|
for (let day = 1; day <= daysInMonth; day++) {
|
|
const date = new Date(currentYear, currentMonth - 1, day)
|
|
const isToday = dateUtils.isToday(date)
|
|
const allEvents = eventIndex[String(day)] || []
|
|
const events = allEvents.slice(0, 3).map(a => ({ id: a.id, color: this.getEventColor(a) }))
|
|
|
|
calendarDays.push({
|
|
day,
|
|
isToday,
|
|
isOtherMonth: false,
|
|
events,
|
|
hasMore: allEvents.length > 3,
|
|
moreCount: allEvents.length - 3
|
|
})
|
|
}
|
|
|
|
// 填充下个月的日期(补全6行)
|
|
const remainingDays = 42 - calendarDays.length
|
|
for (let day = 1; day <= remainingDays; day++) {
|
|
calendarDays.push({ day, isToday: false, isOtherMonth: true, events: [], hasMore: false })
|
|
}
|
|
|
|
this.setData({ calendarDays })
|
|
},
|
|
|
|
/**
|
|
* 获取事件颜色
|
|
*/
|
|
getEventColor(anniversary) {
|
|
return IMPORTANCE_COLORS[anniversary.importance] || '#07c160'
|
|
},
|
|
|
|
/**
|
|
* 加载本月事件
|
|
*/
|
|
loadMonthEvents() {
|
|
const { currentYear, currentMonth } = this.data
|
|
const persons = storage.getPersons()
|
|
const anniversaries = storage.getAnniversaries()
|
|
|
|
const monthEvents = anniversaries
|
|
.map(a => {
|
|
const { month: m, day: d } = getAnniversaryDateInYear(a, currentYear)
|
|
return { ...a, _displayMonth: m, _displayDay: d }
|
|
})
|
|
.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 {
|
|
...x,
|
|
personName: person ? person.name : '未知',
|
|
typeIcon: this.getTypeIcon(x.type),
|
|
typeName: x.customTypeName || this.getTypeName(x.type),
|
|
dateText: dateUtils.formatDate(date, 'MM月DD日'),
|
|
lunarMD: ld.lunarText,
|
|
daysUntil: dateUtils.getDaysUntil(date)
|
|
}
|
|
})
|
|
.sort((a, b) => a._displayDay - b._displayDay)
|
|
|
|
this.setData({ monthEvents })
|
|
},
|
|
|
|
/**
|
|
* 获取类型图标
|
|
*/
|
|
getTypeIcon(type) {
|
|
return TYPE_ICONS[type] || '📅'
|
|
},
|
|
|
|
/**
|
|
* 获取类型名称
|
|
*/
|
|
getTypeName(type) {
|
|
return TYPE_NAMES[type] || '其他'
|
|
},
|
|
|
|
/**
|
|
* 上一个月
|
|
*/
|
|
onPrevMonth() {
|
|
let { currentYear, currentMonth } = this.data
|
|
if (currentMonth === 1) {
|
|
currentYear--
|
|
currentMonth = 12
|
|
} else {
|
|
currentMonth--
|
|
}
|
|
this.setData({ currentYear, currentMonth })
|
|
this.renderCalendar()
|
|
this.loadMonthEvents()
|
|
},
|
|
|
|
/**
|
|
* 下一个月
|
|
*/
|
|
onNextMonth() {
|
|
let { currentYear, currentMonth } = this.data
|
|
if (currentMonth === 12) {
|
|
currentYear++
|
|
currentMonth = 1
|
|
} else {
|
|
currentMonth++
|
|
}
|
|
this.setData({ currentYear, currentMonth })
|
|
this.renderCalendar()
|
|
this.loadMonthEvents()
|
|
},
|
|
|
|
/**
|
|
* 回到今天
|
|
*/
|
|
onGoToday() {
|
|
const today = new Date()
|
|
this.setData({
|
|
currentYear: today.getFullYear(),
|
|
currentMonth: today.getMonth() + 1
|
|
})
|
|
this.renderCalendar()
|
|
this.loadMonthEvents()
|
|
},
|
|
|
|
/**
|
|
* 点击事件
|
|
*/
|
|
onEventTap(e) {
|
|
const id = e.currentTarget.dataset.id
|
|
const anniversary = storage.getAnniversaries().find(a => a.id === id)
|
|
if (anniversary) {
|
|
wx.navigateTo({
|
|
url: `/pages/person-detail/person-detail?id=${anniversary.personId}`
|
|
})
|
|
}
|
|
}
|
|
})
|