v2.1.16 — 勤学打卡优化样式：默认隐藏×，编辑模式才显示

app.py

@@ -136,8 +136,7 @@ def compute_stats():
                     pillar = classify_auto(name)
                 all_study_items.append({
                     'name': name.strip(),
-                    'done': si.get('done', False) if isinstance(si, dict) else False,
+                    'count': si.get('count', 0) if isinstance(si, dict) else 0,
-                    'note': si.get('note', '') if isinstance(si, dict) else '',
                     'pillar': pillar
                 })
 
@@ -149,7 +148,7 @@ def compute_stats():
             isinstance(x, str) and x.strip() or
             isinstance(x, dict) and (x.get('mistake', '') or '').strip()
         ))
-        study_count = sum(1 for x in study if x.get('done'))
+        study_count = sum(1 for x in study if x.get('count', 0) > 0)
 
         total_morning += morning_count
         total_evening += evening_count

static/app.js

@@ -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>' +
@@ -265,17 +257,13 @@
     }
 
     var studyItems = [];
-    var pItems = document.querySelectorAll('#study-list .preset-item');
+    var sCards = document.querySelectorAll('#study-cards .study-card');
-    for (var k=0; k<pItems.length; k++) {
+    for (var k=0; k<sCards.length; k++) {
-      var cb = pItems[k].querySelector('input[type="checkbox"]');
+      var nameEl = sCards[k].querySelector('.study-card-name');
-      var noteEl = pItems[k].querySelector('.preset-note');
+      var countEl = sCards[k].querySelector('.study-card-count');
-      var nameEl = pItems[k].querySelector('.preset-name');
+      var name = nameEl ? nameEl.textContent.trim() : '';
-      var name = nameEl ? nameEl.textContent : '';
+      var count = parseInt(countEl ? countEl.textContent : '0') || 0;
-      if (cb && cb.checked) {
+      studyItems.push({ name: name, count: count, last_checkin_date: sCards[k].dataset.lastDate || '' });
-        studyItems.push({ name: name, done: true, note: noteEl ? noteEl.value.trim() : '' });
-      } else {
-        studyItems.push({ name: name, done: false, note: '' });
-      }
     }
 
     return { morning: morningItems, evening: eveningItems, study: studyItems };
@@ -303,16 +291,25 @@
       addEveningRow(item.mistake || '', item.improvement || '');
     }
 
-    // 勤学 — 渲染预设项目并回填状态
+    // 勤学 — 渲染已保存习惯 + 未渲染预设
     var studyMap = {};
     for (var si=0; si<study.length; si++) {
       studyMap[study[si].name] = study[si];
     }
-    document.getElementById('study-list').innerHTML = '';
+    var rendered = {};
+    document.getElementById('study-cards').innerHTML = '';
+    for (var sk=0; sk<study.length; sk++) {
+      var item = study[sk];
+      if (item.name) {
+        renderStudyCard(item.name, item.count || 0, item.last_checkin_date || '');
+        rendered[item.name] = true;
+      }
+    }
     for (var sp=0; sp<PRESET_STUDY_ITEMS.length; sp++) {
       var sName = PRESET_STUDY_ITEMS[sp];
-      var saved = studyMap[sName] || { done: false, note: '' };
+      if (!rendered[sName]) {
-      addPresetItem(sName, saved.done, saved.note || '');
+        renderStudyCard(sName, 0, '');
+      }
     }
   }
 
@@ -355,35 +352,68 @@
     container.appendChild(div);
   }
 
-  /* ── 勤学预设项目 ── */
+  /* ── 勤学打卡卡片 ── */
 
-  function addPresetItem(name, done, note) {
+  function renderStudyCard(name, count, lastDate) {
-    var container = document.getElementById('study-list');
+    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 = 'preset-item' + (done ? ' active' : '');
+    div.className = 'study-card' + (checked ? ' checked' : '');
-    var noteEsc = esc(note || '');
+    div.setAttribute('data-last-date', lastDate || '');
     div.innerHTML =
-      '<label class="preset-check">' +
+      '<button class="study-card-del" onclick="deleteStudyItem(this)" title="删除">×</button>' +
-        '<input type="checkbox"' + (done ? ' checked' : '') + ' onchange="togglePresetNote(this)">' +
+      '<div class="study-card-info">' +
-        '<span class="preset-name">' + esc(name) + '</span>' +
+        '<span class="study-card-name">' + esc(name) + '</span>' +
-      '</label>' +
+        '<span class="study-card-count">' + count + '</span>' +
-      '<textarea class="preset-note" placeholder="一句话备注…">' + noteEsc + '</textarea>';
+      '</div>' +
+      '<button class="study-card-btn' + (checkedToday ? ' done' : '') + '" onclick="checkinStudy(this)">' + btnText + '</button>';
     container.appendChild(div);
   }
 
-  window.togglePresetNote = function(cb) {
+  window.toggleStudyEdit = function() {
-    var item = cb.closest('.preset-item');
+    var panel = document.getElementById('panel-daily');
-    if (item) {
+    var btn = document.getElementById('study-edit-toggle');
-      if (cb.checked) item.classList.add('active');
+    if (!panel || !btn) return;
-      else { item.classList.remove('active'); item.querySelector('.preset-note').value = ''; }
+    var editing = panel.classList.toggle('editing-study');
-    }
+    btn.classList.toggle('active', editing);
+  };
+
+  window.addStudyItem = function() {
+    var name = prompt('请输入新习惯名称：');
+    if (!name || !name.trim()) return;
+    renderStudyCard(name.trim(), 0, '');
+    triggerAutoSave();
+  };
+
+  window.deleteStudyItem = function(btn) {
+    var card = btn.closest('.study-card');
+    var nameEl = card.querySelector('.study-card-name');
+    if (nameEl && !confirm('确定删除「' + nameEl.textContent + '」？')) return;
+    card.remove();
+    triggerAutoSave();
+  };
+
+  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;
+    card.dataset.lastDate = today;
+    card.classList.add('checked');
+    btn.classList.add('done');
+    btn.textContent = '已打卡';
     triggerAutoSave();
   };
 
   function initStudyPresets() {
-    document.getElementById('study-list').innerHTML = '';
+    document.getElementById('study-cards').innerHTML = '';
     for (var i=0; i<PRESET_STUDY_ITEMS.length; i++) {
-      addPresetItem(PRESET_STUDY_ITEMS[i], false, '');
+      renderStudyCard(PRESET_STUDY_ITEMS[i], 0, '');
     }
   }
 
@@ -455,8 +485,6 @@
   };
 
   window.addMorning = function() {
-    var count = document.querySelectorAll('#morning-list .item-row').length;
-    if (count >= 3) { showToast('最多 3 条立志', 'error'); return; }
     addMorningRow('');
   };
   window.addEvening = function() {
@@ -507,7 +535,7 @@
     if (lastSavedWeek && lastSavedData !== null && currentStr !== lastSavedData) {
       var hasContent = currentData.morning.some(function(x){return x && x.trim();}) ||
                        currentData.evening.some(function(x){return (x.mistake||'').trim() || (x.improvement||'').trim();}) ||
-                       currentData.study.some(function(x){return x.done;});
+                       currentData.study.some(function(x){return x.count > 0;});
       if (hasContent) {
         apiSaveCheckin(lastSavedWeek, currentData, function(){});
       }
@@ -1027,7 +1055,7 @@
         (info.evening_items || []).forEach(function(ei){ items.push({pillar: p, text: ei.mistake || ei.improvement, improvement: ei.improvement, type: 'evening'}); });
       }
       if (blueprintFilter === 'all' || blueprintFilter === 'study') {
-        (info.study_items || []).forEach(function(si){ items.push({pillar: p, text: si.name, type: 'study', done: si.done, note: si.note}); });
+        (info.study_items || []).forEach(function(si){ items.push({pillar: p, text: si.name, type: 'study', count: si.count}); });
       }
     });
     if (items.length === 0) {
@@ -1045,7 +1073,7 @@
     items.forEach(function(item){
       var dot = '<span class="bp-pillar-dot" style="background:' + (pillarColors[item.pillar.name] || '#94A3B8') + '"></span>';
       var extra = '';
-      if (item.type === 'study' && item.note) extra = '<span class="bp-item-note">' + esc(item.note) + '</span>';
+      if (item.type === 'study' && item.count > 0) extra = '<span class="bp-item-note">打卡 ' + item.count + ' 次</span>';
       if (item.type === 'evening' && item.improvement) extra = '<span class="bp-item-note evening">→ ' + esc(item.improvement) + '</span>';
       html += '<div class="bp-list-item">' +
         dot +

static/style.css

@@ -832,9 +832,8 @@ body {
 }
 
 /* 编辑模式下才显示的元素 */
-.edit-only { display: none; }
+.edit-only { display: flex; }
-.card.editing .edit-only { display: flex; }
+.btn-edit-toggle:not(#study-edit-toggle) { display: none; }
-.card.editing .btn-del { display: inline-flex; }
 
 /* 默认隐藏删除按钮 */
 .btn-del { display: none; }
@@ -1783,3 +1782,29 @@ body {
 @media (max-width: 900px) {
   .quad-grid { grid-template-columns: 1fr; grid-template-rows: auto; }
 }
+
+/* 勤学打卡卡片 - 3×3网格 */
+#study-cards { display: grid; grid-template-columns: repeat(3, 1fr); gap: 12px; }
+.study-card { position:relative; display:flex; flex-direction:column; align-items:center; gap:10px; padding:18px 12px 14px; border:1px solid var(--border); border-radius:var(--radius); background:var(--card); transition:all 0.2s; text-align:center; }
+.study-card:hover { border-color:var(--primary); box-shadow:var(--shadow); }
+.study-card.checked { border-color:var(--success); background:var(--success-light); }
+.study-card-info { display:flex; flex-direction:column; align-items:center; gap:6px; flex:1; }
+.study-card-name { font-size:13px; color:var(--text); font-weight:500; line-height:1.4; min-height:36px; display:flex; align-items:center; }
+.study-card-count { font-size:24px; color:var(--text-muted); font-weight:600; background:var(--bg); border-radius:50%; width:40px; height:40px; display:flex; align-items:center; justify-content:center; }
+.study-card.checked .study-card-count { background:var(--success); color:#FFF; }
+.study-card-btn { padding:5px 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; }
+.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; }
+.study-card-del { display:none; }
+#panel-daily.editing-study .study-card-del { display:flex; align-items:center; justify-content:center; position:absolute; top:6px; right:6px; border:none; background:var(--danger-light); color:var(--danger); cursor:pointer; font-size:14px; width:22px; height:22px; border-radius:50%; line-height:1; }
+#panel-daily.editing-study .study-card-del:hover { background:var(--danger); color:#FFF; }
+.study-card.checked { border-color:var(--success); background:var(--success-light); }
+.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: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; }
+.edit-only-study { display: none; }
+#panel-daily.editing-study .edit-only-study { display: flex; }

templates/index.html

@@ -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,13 +146,13 @@
           <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>
             </button>
           </div>
-          <p class="card-desc">本周最重要的 1~3 件事</p>
+          <p class="card-desc">本周最重要的事</p>
           <div id="morning-list"></div>
           <button class="btn-add edit-only" onclick="addMorning()">
             <svg class="icon-sm"><use href="#icon-plus"/></svg> 增加一条
@@ -176,11 +176,19 @@
         </div>
         <div class="card card-study daily-card" data-card="study">
           <div class="card-head">
+            <div class="card-head-left">
               <svg class="icon-h2"><use href="#icon-book-open"/></svg>
               <h3>勤学打卡</h3>
             </div>
+            <button class="btn-edit-toggle" id="study-edit-toggle" onclick="toggleStudyEdit()" title="编辑">
+              <svg class="icon-sm"><use href="#icon-pencil"/></svg>
+            </button>
+          </div>
           <p class="card-desc">本周修行清单</p>
-          <div id="study-list"></div>
+          <div id="study-cards"></div>
+          <button class="btn-add edit-only-study" onclick="addStudyItem()" style="margin-top:10px">
+            <svg class="icon-sm"><use href="#icon-plus"/></svg> 增加习惯
+          </button>
         </div>
       </div>
         </div><!-- /daily-main -->