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>
172 lines
5.0 KiB
JavaScript
172 lines
5.0 KiB
JavaScript
// index.js
|
|
const storage = require('../../utils/storage')
|
|
const dateUtils = require('../../utils/date')
|
|
const fmt = require('../../utils/format')
|
|
|
|
Page({
|
|
data: {
|
|
persons: [],
|
|
originalPersons: [],
|
|
searchKeyword: '',
|
|
currentFilter: 'all',
|
|
totalCount: 0,
|
|
upcomingCount: 0,
|
|
todayText: ''
|
|
},
|
|
|
|
onLoad() {
|
|
this.loadPersons()
|
|
},
|
|
|
|
onShow() {
|
|
this.loadPersons()
|
|
},
|
|
|
|
/**
|
|
* 加载人员列表
|
|
*/
|
|
loadPersons() {
|
|
const persons = storage.getPersons()
|
|
const anniversaries = storage.getAnniversaries()
|
|
|
|
const personsWithAnniversaries = persons.map(person => {
|
|
const personAnniversaries = anniversaries.filter(a => a.personId === person.id)
|
|
|
|
let nextAnniversary = null
|
|
if (personAnniversaries.length > 0) {
|
|
const upcoming = personAnniversaries
|
|
.map(a => {
|
|
// 农历纪念日的公历日期每年都不同,必须走 getNextOccurrenceOf 而不是直接用 solarMonth/solarDay
|
|
const { date, daysUntil } = dateUtils.getNextOccurrenceOf(a)
|
|
return { ...a, date, daysUntil }
|
|
})
|
|
.sort((a, b) => a.daysUntil - b.daysUntil)
|
|
|
|
if (upcoming.length > 0) {
|
|
const next = upcoming[0]
|
|
nextAnniversary = {
|
|
type: next.type,
|
|
typeName: fmt.getTypeName(next.type, next.customTypeName),
|
|
dateText: dateUtils.formatDate(next.date, 'MM月DD日'),
|
|
daysUntil: next.daysUntil,
|
|
daysUntilText: fmt.formatDaysUntil(next.daysUntil)
|
|
}
|
|
}
|
|
}
|
|
|
|
return { ...person, anniversaryCount: personAnniversaries.length, nextAnniversary }
|
|
})
|
|
|
|
const sorted = personsWithAnniversaries.sort((a, b) => {
|
|
if (!a.nextAnniversary && !b.nextAnniversary) return 0
|
|
if (!a.nextAnniversary) return 1
|
|
if (!b.nextAnniversary) return -1
|
|
return a.nextAnniversary.daysUntil - b.nextAnniversary.daysUntil
|
|
})
|
|
|
|
const today = new Date()
|
|
const weekdays = ['日', '一', '二', '三', '四', '五', '六']
|
|
const todayText = `${today.getMonth() + 1}月${today.getDate()}日 周${weekdays[today.getDay()]}`
|
|
const upcomingCount = sorted.filter(p => p.nextAnniversary && p.nextAnniversary.daysUntil <= 7).length
|
|
|
|
this.setData({ originalPersons: sorted, totalCount: sorted.length, upcomingCount, todayText })
|
|
|
|
if (this.data.currentFilter === 'all' && !this.data.searchKeyword) {
|
|
this.setData({ persons: sorted })
|
|
} else {
|
|
this.filterPersons()
|
|
}
|
|
},
|
|
|
|
/**
|
|
* 搜索输入
|
|
*/
|
|
onSearchInput(e) {
|
|
const keyword = e.detail.value
|
|
this.setData({ searchKeyword: keyword })
|
|
this.filterPersons()
|
|
},
|
|
|
|
/**
|
|
* 筛选切换
|
|
*/
|
|
onFilterTap(e) {
|
|
const filter = e.currentTarget.dataset.filter
|
|
this.setData({ currentFilter: filter }, () => {
|
|
this.filterPersons()
|
|
})
|
|
},
|
|
|
|
/**
|
|
* 筛选人员
|
|
*/
|
|
filterPersons() {
|
|
const { originalPersons, searchKeyword, currentFilter } = this.data
|
|
const anniversaries = storage.getAnniversaries()
|
|
|
|
let filtered = [...originalPersons]
|
|
|
|
// 关键词搜索
|
|
if (searchKeyword) {
|
|
filtered = filtered.filter(p =>
|
|
p.name.includes(searchKeyword) ||
|
|
(p.nickname && p.nickname.includes(searchKeyword))
|
|
)
|
|
}
|
|
|
|
// 类型筛选
|
|
if (currentFilter !== 'all') {
|
|
filtered = filtered.filter(person => {
|
|
const personAnniversaries = anniversaries.filter(a => a.personId === person.id)
|
|
|
|
if (currentFilter === 'birthday') {
|
|
// 生日筛选:只显示有生日类型的人(公历生日或农历生日)
|
|
return personAnniversaries.some(a =>
|
|
a.type === 'birthday' || a.type === 'lunar_birthday'
|
|
)
|
|
} else if (currentFilter === 'anniversary') {
|
|
// 纪念日筛选:只显示有纪念日类型的人(结婚、订婚、其他)
|
|
return personAnniversaries.some(a =>
|
|
a.type === 'wedding' || a.type === 'engagement' || a.type === 'other'
|
|
)
|
|
} else if (currentFilter === 'upcoming') {
|
|
// 即将到来:只显示7天内有纪念日的人
|
|
return person.nextAnniversary && person.nextAnniversary.daysUntil <= 7
|
|
}
|
|
|
|
return true
|
|
})
|
|
}
|
|
|
|
// 排序:与 loadPersons() 保持一致,按最近的纪念日排序
|
|
const sorted = filtered.sort((a, b) => {
|
|
if (!a.nextAnniversary && !b.nextAnniversary) return 0
|
|
if (!a.nextAnniversary) return 1
|
|
if (!b.nextAnniversary) return -1
|
|
return a.nextAnniversary.daysUntil - b.nextAnniversary.daysUntil
|
|
})
|
|
|
|
this.setData({ persons: sorted })
|
|
},
|
|
|
|
/**
|
|
* 点击人员
|
|
*/
|
|
onPersonTap(e) {
|
|
const id = e.currentTarget.dataset.id
|
|
wx.navigateTo({
|
|
url: `/pages/person-detail/person-detail?id=${id}`
|
|
})
|
|
},
|
|
|
|
/**
|
|
* 点击添加按钮:直接进添加纪念日(方案 B:流程合并,姓名不存在自动建人)
|
|
*/
|
|
onAddTap() {
|
|
wx.navigateTo({
|
|
url: '/pages/add-anniversary/add-anniversary'
|
|
})
|
|
}
|
|
})
|
|
|