diff --git a/mini/pages/home/home.js b/mini/pages/home/home.js index f6f9727..9b26571 100644 --- a/mini/pages/home/home.js +++ b/mini/pages/home/home.js @@ -97,7 +97,7 @@ Page({ const termTime = dayInfo.solarTerm ? (SOLAR_TERM_TIMES[dayInfo.solarTerm] || '') : ''; const isFirstOrFifteen = this.data.highlightLunar && (dayInfo.lunarDay === 1 || dayInfo.lunarDay === 15); const nextBuddhist = this.data.showBuddhist ? getNextBuddhistFestival(y, m, d) : null; - const upcoming = getUpcomingFestivals(5, y, m, d); + const upcoming = getUpcomingFestivals(10, y, m, d); return { key: fmt(y, m, d), dayInfo, almanac, legalHoliday, workday, termTime, diff --git a/mini/pages/home/home.wxml b/mini/pages/home/home.wxml index 574d37a..955c789 100644 --- a/mini/pages/home/home.wxml +++ b/mini/pages/home/home.wxml @@ -123,14 +123,14 @@ - + 节日速查 更多 >> - - + + {{item.name}} {{item.solarMonth}}月{{item.solarDay}}日 {{item.daysLeft === 0 ? '今天' : item.daysLeft + '天后'}} diff --git a/mini/pages/home/home.wxss b/mini/pages/home/home.wxss index 5d70718..20e07fd 100644 --- a/mini/pages/home/home.wxss +++ b/mini/pages/home/home.wxss @@ -491,6 +491,9 @@ font-size: 24rpx; color: #C41E3A; font-weight: 500; + flex-shrink: 0; + min-width: 100rpx; + text-align: right; } .fest-left.is-today {