Compare commits

...

3 Commits

2 changed files with 2 additions and 10 deletions

View File

@@ -169,12 +169,6 @@
weeks.push(fmtWeek(monday));
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 today = new Date();
@@ -191,10 +185,8 @@
var sunday = new Date(monday);
sunday.setDate(sunday.getDate() + 6);
var dateRange = (monday.getMonth()+1) + '.' + monday.getDate() + ' - ' + sunday.getDate();
var statusIcon = status === 'pass' ? '✓' : (status === 'fail' ? '✗' : '○');
var statusLabel = status === 'pass' ? '达标' : (status === 'fail' ? '未达标' : '未打卡');
wHtml += '<div class="' + cls + '" data-week="' + w + '">' +
'<span class="cal-wk-status ' + (status || 'empty') + '">' + statusIcon + '</span>' +
'<div class="cal-wk-info">' +
'<span class="cal-wk-label">第' + w.split('-W')[1].replace(/^0/, '') + '周</span>' +
'<span class="cal-wk-date">' + dateRange + '</span>' +

View File

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