- 人员详情页:日期下方显示完整农历「农历 YYYY年 X月X日」 - 日历页本月纪念日列表:日期下方显示农历月日「X月X日」 - 公历事件用 solarToLunar 算当年对应农历 - 农历事件按当年公历落点反算农历(与原始农历一致) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -122,12 +122,14 @@ Page({
|
||||
.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)
|
||||
}
|
||||
})
|
||||
|
||||
@@ -40,7 +40,10 @@
|
||||
<view class="event-header">
|
||||
<text class="event-icon">{{item.typeIcon}}</text>
|
||||
<text class="event-title">{{item.personName}} - {{item.typeName}}</text>
|
||||
<text class="event-date">{{item.dateText}}</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>
|
||||
|
||||
@@ -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 {
|
||||
|
||||
Reference in New Issue
Block a user