v2.1.14 — 勤学打卡改为3×3网格卡片布局

static/app.js

@@ -263,7 +263,7 @@
       var countEl = sCards[k].querySelector('.study-card-count');
       var name = nameEl ? nameEl.textContent.trim() : '';
       var count = parseInt(countEl ? countEl.textContent : '0') || 0;
-      studyItems.push({ name: name, count: count });
+      studyItems.push({ name: name, count: count, last_checkin_date: sCards[k].dataset.lastDate || '' });
     }
 
     return { morning: morningItems, evening: eveningItems, study: studyItems };
@@ -300,7 +300,7 @@
     for (var sp=0; sp<PRESET_STUDY_ITEMS.length; sp++) {
       var sName = PRESET_STUDY_ITEMS[sp];
       var saved = studyMap[sName] || { count: 0 };
-      renderStudyCard(sName, saved.count || 0);
+      renderStudyCard(sName, saved.count || 0, saved.last_checkin_date || '');
     }
   }
 
@@ -345,32 +345,42 @@
 
   /* ── 勤学打卡卡片 ── */
 
-  function renderStudyCard(name, count) {
+  function renderStudyCard(name, count, lastDate) {
     var container = document.getElementById('study-cards');
+    var today = fmtDate(new Date());
+    var checked = count > 0;
+    var checkedToday = lastDate === today;
+    var btnText = checkedToday ? '已打卡' : '打卡';
     var div = document.createElement('div');
-    div.className = 'study-card' + (count > 0 ? ' checked' : '');
+    div.className = 'study-card' + (checked ? ' checked' : '');
+    div.setAttribute('data-last-date', lastDate || '');
     div.innerHTML =
       '<div class="study-card-info">' +
         '<span class="study-card-name">' + esc(name) + '</span>' +
         '<span class="study-card-count">' + count + '</span>' +
       '</div>' +
-      '<button class="study-card-btn" onclick="checkinStudy(this)">打卡</button>';
+      '<button class="study-card-btn' + (checkedToday ? ' done' : '') + '" onclick="checkinStudy(this)">' + btnText + '</button>';
     container.appendChild(div);
   }
 
   window.checkinStudy = function(btn) {
     var card = btn.closest('.study-card');
+    var today = fmtDate(new Date());
+    if (card.dataset.lastDate === today) { showToast('今天已打卡', 'info'); return; }
     var countEl = card.querySelector('.study-card-count');
     var count = parseInt(countEl.textContent) + 1;
     countEl.textContent = count;
-    if (count > 0) card.classList.add('checked');
+    card.dataset.lastDate = today;
+    card.classList.add('checked');
+    btn.classList.add('done');
+    btn.textContent = '已打卡';
     triggerAutoSave();
   };
 
   function initStudyPresets() {
     document.getElementById('study-cards').innerHTML = '';
     for (var i=0; i<PRESET_STUDY_ITEMS.length; i++) {
-      renderStudyCard(PRESET_STUDY_ITEMS[i], 0);
+      renderStudyCard(PRESET_STUDY_ITEMS[i], 0, '');
     }
   }
 

static/style.css

@@ -832,9 +832,8 @@ body {
 }
 
 /* 编辑模式下才显示的元素 */
-.edit-only { display: none; }
-.card.editing .edit-only { display: flex; }
-.card.editing .btn-del { display: inline-flex; }
+.edit-only { display: flex; }
+.btn-edit-toggle { display: none; }
 
 /* 默认隐藏删除按钮 */
 .btn-del { display: none; }
@@ -1784,12 +1783,14 @@ body {
   .quad-grid { grid-template-columns: 1fr; grid-template-rows: auto; }
 }
 
-/* 勤学打卡卡片 */
-.study-card { display:flex; align-items:center; gap:12px; padding:10px 14px; border:1px solid var(--border); border-radius:var(--radius-sm); background:var(--card); margin-bottom:8px; transition:all 0.15s; }
+/* 勤学打卡卡片 - 3×3网格 */
+#study-cards { display: grid; grid-template-columns: repeat(3, 1fr); gap: 10px; }
+.study-card { display:flex; flex-direction:column; align-items:center; gap:8px; padding:14px 10px; border:1px solid var(--border); border-radius:var(--radius-sm); background:var(--card); transition:all 0.15s; text-align:center; }
 .study-card.checked { border-color:var(--success); background:var(--success-light); }
-.study-card-info { flex:1; display:flex; align-items:center; justify-content:space-between; gap:8px; }
-.study-card-name { font-size:13px; color:var(--text); font-weight:500; }
-.study-card-count { font-size:12px; color:var(--text-muted); font-weight:600; background:var(--bg); border-radius:50%; width:24px; height:24px; display:flex; align-items:center; justify-content:center; }
+.study-card-info { display:flex; flex-direction:column; align-items:center; gap:4px; }
+.study-card-name { font-size:12px; color:var(--text); font-weight:500; line-height:1.3; }
+.study-card-count { font-size:18px; color:var(--text-muted); font-weight:700; background:var(--bg); border-radius:50%; width:32px; height:32px; display:flex; align-items:center; justify-content:center; }
 .study-card.checked .study-card-count { background:var(--success); color:#FFF; }
-.study-card-btn { padding:6px 14px; border:1px solid var(--primary); border-radius:var(--radius-sm); background:transparent; color:var(--primary); font-size:12px; font-weight:500; cursor:pointer; transition:all 0.15s; font-family:inherit; white-space:nowrap; }
+.study-card-btn { padding:5px 12px; border:1px solid var(--primary); border-radius:var(--radius-sm); background:transparent; color:var(--primary); font-size:12px; font-weight:500; cursor:pointer; transition:all 0.15s; font-family:inherit; }
 .study-card-btn:hover { background:var(--primary); color:#FFF; }
+.study-card-btn.done { background:var(--success-light); color:var(--success); border-color:var(--success); cursor:default; }