Compare commits

...

4 Commits

2 changed files with 3 additions and 11 deletions

View File

@@ -169,12 +169,6 @@
weeks.push(fmtWeek(monday)); weeks.push(fmtWeek(monday));
monday.setDate(monday.getDate() + 7); monday.setDate(monday.getDate() + 7);
} }
// 确保至少有4周显示
while (weeks.length < 4) {
var w = fmtWeek(monday);
if (weeks.indexOf(w) < 0) weeks.push(w);
monday.setDate(monday.getDate() + 7);
}
var todayWk = fmtWeek(new Date()); var todayWk = fmtWeek(new Date());
var today = new Date(); var today = new Date();
@@ -191,10 +185,8 @@
var sunday = new Date(monday); var sunday = new Date(monday);
sunday.setDate(sunday.getDate() + 6); sunday.setDate(sunday.getDate() + 6);
var dateRange = (monday.getMonth()+1) + '.' + monday.getDate() + ' - ' + sunday.getDate(); var dateRange = (monday.getMonth()+1) + '.' + monday.getDate() + ' - ' + sunday.getDate();
var statusIcon = status === 'pass' ? '✓' : (status === 'fail' ? '✗' : '○');
var statusLabel = status === 'pass' ? '达标' : (status === 'fail' ? '未达标' : '未打卡'); var statusLabel = status === 'pass' ? '达标' : (status === 'fail' ? '未达标' : '未打卡');
wHtml += '<div class="' + cls + '" data-week="' + w + '">' + wHtml += '<div class="' + cls + '" data-week="' + w + '">' +
'<span class="cal-wk-status ' + (status || 'empty') + '">' + statusIcon + '</span>' +
'<div class="cal-wk-info">' + '<div class="cal-wk-info">' +
'<span class="cal-wk-label">第' + w.split('-W')[1].replace(/^0/, '') + '周</span>' + '<span class="cal-wk-label">第' + w.split('-W')[1].replace(/^0/, '') + '周</span>' +
'<span class="cal-wk-date">' + dateRange + '</span>' + '<span class="cal-wk-date">' + dateRange + '</span>' +
@@ -205,7 +197,7 @@
var we = document.getElementById('cal-weeks'); var we = document.getElementById('cal-weeks');
we.innerHTML = wHtml; we.innerHTML = wHtml;
we.querySelectorAll('.cal-week-row').forEach(function(row) { we.querySelectorAll('.cal-week-row').forEach(function(row) {
cell.addEventListener('click', function() { row.addEventListener('click', function() {
var wk = this.dataset.week; var wk = this.dataset.week;
if (wk) navigateToWeek(wk); if (wk) navigateToWeek(wk);
}); });

View File

@@ -132,7 +132,7 @@
<div class="daily-main"> <div class="daily-main">
<div class="daily-tabs"> <div class="daily-tabs">
<button class="daily-tab active" data-tab="morning" onclick="switchDailyTab(this)"> <button class="daily-tab active" data-tab="morning" onclick="switchDailyTab(this)">
<svg class="icon-sm"><use href="#icon-sun"/></svg> 早间立志 <svg class="icon-sm"><use href="#icon-sun"/></svg> 本周重点
</button> </button>
<button class="daily-tab" data-tab="evening" onclick="switchDailyTab(this)"> <button class="daily-tab" data-tab="evening" onclick="switchDailyTab(this)">
<svg class="icon-sm"><use href="#icon-magnifying-glass"/></svg> 责善改过 <svg class="icon-sm"><use href="#icon-magnifying-glass"/></svg> 责善改过
@@ -146,7 +146,7 @@
<div class="card-head"> <div class="card-head">
<div class="card-head-left"> <div class="card-head-left">
<svg class="icon-h2"><use href="#icon-sun"/></svg> <svg class="icon-h2"><use href="#icon-sun"/></svg>
<h3>早间立志</h3> <h3>本周重点</h3>
</div> </div>
<button class="btn-edit-toggle" onclick="toggleEditMode(this)" title="编辑"> <button class="btn-edit-toggle" onclick="toggleEditMode(this)" title="编辑">
<svg class="icon-sm"><use href="#icon-pencil"/></svg> <svg class="icon-sm"><use href="#icon-pencil"/></svg>