v2.1.11 — 本周重点去3条限制 + 勤学改为卡片打卡按钮

v2.1.10 — 移除周列表强制4周填充逻辑，避免跨月虚周
v2.1.9 — 早间立志改为本周重点
2026-07-27 08:53:48 +08:00 · 2026-07-27 08:47:49 +08:00 · 2026-07-27 08:43:07 +08:00 · 2026-07-27 08:35:19 +08:00 · 2026-07-24 17:43:23 +08:00 · 2026-07-24 17:42:15 +08:00
4 changed files with 223 additions and 122 deletions
--- a/app.py
+++ b/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,
-                    'note': si.get('note', '') if isinstance(si, dict) else '',
+                    'count': si.get('count', 0) if isinstance(si, dict) else 0,
                    '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
--- a/static/app.js
+++ b/static/app.js
@@ -146,28 +146,18 @@
    renderCalendar();
  };

-  /** 选择月份 */
-  window.selectCalMonth = function(mIdx) {
-    calMonth = mIdx;
+  /** 切换月份 */
+  window.changeCalMonth = function(dir) {
+    calMonth += dir;
+    if (calMonth > 11) { calMonth = 0; calYear++; }
+    if (calMonth < 0) { calMonth = 11; calYear--; }
    renderCalendar();
  };

  /** 渲染年-月-周选择器 */
  function renderCalendar() {
    document.getElementById('cal-year-label').textContent = calYear + '年';
-
-    // 月份标签
-    var monthsList = ['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月'];
-    var today = new Date();
-    var todayMonth = today.getFullYear() === calYear ? today.getMonth() : -1;
-    var mHtml = '';
-    for (var i = 0; i < 12; i++) {
-      var mc = 'cal-month-btn';
-      if (i === calMonth) mc += ' active';
-      if (i === todayMonth) mc += ' today';
-      mHtml += '<button class="' + mc + '" onclick="selectCalMonth(' + i + ')">' + monthsList[i] + '</button>';
-    }
-    document.getElementById('cal-months').innerHTML = mHtml;
+    document.getElementById('cal-month-label').textContent = (calMonth + 1) + '月';

    // 计算该月包含的周
    var firstDay = new Date(calYear, calMonth, 1);
@@ -179,29 +169,35 @@
      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();
    var wHtml = '';
    for (var i2 = 0; i2 < weeks.length; i2++) {
      var w = weeks[i2];
-      var cls = 'cal-week-cell';
+      var cls = 'cal-week-row';
      var status = calendarStatus[w];
-      if (status) cls += ' ' + status;
      if (w === todayWk) cls += ' today';
      if (w === selectedWeek) cls += ' selected';
-      wHtml += '<div class="' + cls + '" data-week="' + w + '" title="' + w + '">' +
-        'W' + w.split('-W')[1].replace(/^0/, '') + '</div>';
+      // 计算日期范围
+      var monday = new Date(calYear, calMonth, 1);
+      while (fmtWeek(monday) !== w) monday.setDate(monday.getDate() + 7);
+      var sunday = new Date(monday);
+      sunday.setDate(sunday.getDate() + 6);
+      var dateRange = (monday.getMonth()+1) + '.' + monday.getDate() + ' - ' + sunday.getDate();
+      var statusLabel = status === 'pass' ? '达标' : (status === 'fail' ? '未达标' : '未打卡');
+      wHtml += '<div class="' + cls + '" data-week="' + w + '">' +
+        '<div class="cal-wk-info">' +
+          '<span class="cal-wk-label">第' + w.split('-W')[1].replace(/^0/, '') + '周</span>' +
+          '<span class="cal-wk-date">' + dateRange + '</span>' +
+        '</div>' +
+        '<span class="cal-wk-badge">' + statusLabel + '</span>' +
+      '</div>';
    }
    var we = document.getElementById('cal-weeks');
    we.innerHTML = wHtml;
-    we.querySelectorAll('.cal-week-cell').forEach(function(cell) {
-      cell.addEventListener('click', function() {
+    we.querySelectorAll('.cal-week-row').forEach(function(row) {
+      row.addEventListener('click', function() {
        var wk = this.dataset.week;
        if (wk) navigateToWeek(wk);
      });
@@ -261,17 +257,13 @@
    }

    var studyItems = [];
-    var pItems = document.querySelectorAll('#study-list .preset-item');
-    for (var k=0; k<pItems.length; k++) {
-      var cb = pItems[k].querySelector('input[type="checkbox"]');
-      var noteEl = pItems[k].querySelector('.preset-note');
-      var nameEl = pItems[k].querySelector('.preset-name');
-      var name = nameEl ? nameEl.textContent : '';
-      if (cb && cb.checked) {
-        studyItems.push({ name: name, done: true, note: noteEl ? noteEl.value.trim() : '' });
-      } else {
-        studyItems.push({ name: name, done: false, note: '' });
-      }
+    var sCards = document.querySelectorAll('#study-cards .study-card');
+    for (var k=0; k<sCards.length; k++) {
+      var nameEl = sCards[k].querySelector('.study-card-name');
+      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 });
    }

    return { morning: morningItems, evening: eveningItems, study: studyItems };
@@ -304,11 +296,11 @@
    for (var si=0; si<study.length; si++) {
      studyMap[study[si].name] = study[si];
    }
-    document.getElementById('study-list').innerHTML = '';
+    document.getElementById('study-cards').innerHTML = '';
    for (var sp=0; sp<PRESET_STUDY_ITEMS.length; sp++) {
      var sName = PRESET_STUDY_ITEMS[sp];
-      var saved = studyMap[sName] || { done: false, note: '' };
-      addPresetItem(sName, saved.done, saved.note || '');
+      var saved = studyMap[sName] || { count: 0 };
+      renderStudyCard(sName, saved.count || 0);
    }
  }

@@ -351,35 +343,34 @@
    container.appendChild(div);
  }

-  /* ── 勤学预设项目 ── */
+  /* ── 勤学打卡卡片 ── */

-  function addPresetItem(name, done, note) {
-    var container = document.getElementById('study-list');
+  function renderStudyCard(name, count) {
+    var container = document.getElementById('study-cards');
    var div = document.createElement('div');
-    div.className = 'preset-item' + (done ? ' active' : '');
-    var noteEsc = esc(note || '');
+    div.className = 'study-card' + (count > 0 ? ' checked' : '');
    div.innerHTML =
-      '<label class="preset-check">' +
-        '<input type="checkbox"' + (done ? ' checked' : '') + ' onchange="togglePresetNote(this)">' +
-        '<span class="preset-name">' + esc(name) + '</span>' +
-      '</label>' +
-      '<textarea class="preset-note" placeholder="一句话备注…">' + noteEsc + '</textarea>';
+      '<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>';
    container.appendChild(div);
  }

-  window.togglePresetNote = function(cb) {
-    var item = cb.closest('.preset-item');
-    if (item) {
-      if (cb.checked) item.classList.add('active');
-      else { item.classList.remove('active'); item.querySelector('.preset-note').value = ''; }
-    }
+  window.checkinStudy = function(btn) {
+    var card = btn.closest('.study-card');
+    var countEl = card.querySelector('.study-card-count');
+    var count = parseInt(countEl.textContent) + 1;
+    countEl.textContent = count;
+    if (count > 0) card.classList.add('checked');
    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);
    }
  }

@@ -451,8 +442,6 @@
  };

  window.addMorning = function() {
-    var count = document.querySelectorAll('#morning-list .item-row').length;
-    if (count >= 3) { showToast('最多 3 条立志', 'error'); return; }
    addMorningRow('');
  };
  window.addEvening = function() {
@@ -479,6 +468,17 @@
    if (card) card.classList.add('active');
  };

+  /* 头像菜单 */
+  window.toggleUserMenu = function(e) {
+    e.stopPropagation();
+    var dd = document.getElementById('user-dropdown');
+    if (dd) dd.style.display = dd.style.display === 'none' ? 'block' : 'none';
+  };
+  document.addEventListener('click', function() {
+    var dd = document.getElementById('user-dropdown');
+    if (dd) dd.style.display = 'none';
+  });
+
  /* ================================================================
     Load & Auto Save Checkin
     ================================================================ */
@@ -492,7 +492,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(){});
      }
@@ -1012,7 +1012,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) {
@@ -1030,7 +1030,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 +
--- a/static/style.css
+++ b/static/style.css
@@ -71,6 +71,41 @@ body {
  gap: 8px;
  padding: 24px 12px 16px;
  position: relative;
+  cursor: pointer;
+}
+
+.sidebar-user .user-avatar {
+  transition: transform 0.15s;
+}
+.sidebar-user:hover .user-avatar { transform: scale(1.05); }
+
+.user-dropdown {
+  position: absolute;
+  top: 100%;
+  left: 50%;
+  transform: translateX(-50%);
+  background: var(--card);
+  border: 1px solid var(--border);
+  border-radius: var(--radius-sm);
+  box-shadow: var(--shadow-hover);
+  z-index: 100;
+  min-width: 120px;
+  padding: 4px;
+}
+.user-dropdown-item {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 8px 12px;
+  font-size: 13px;
+  color: var(--text-dim);
+  text-decoration: none;
+  border-radius: 6px;
+  transition: all 0.15s;
+}
+.user-dropdown-item:hover {
+  background: var(--danger-light);
+  color: var(--danger);
 }

 .sidebar-user .user-name {
@@ -174,6 +209,45 @@ body {
  font-weight: 400;
 }

+/* ═══════════════════════════════════════════
+   Sidebar Dark Theme（左侧导航栏专属）
+   ═══════════════════════════════════════════ */
+.sidebar {
+  background: linear-gradient(180deg, #1E293B 0%, #0F172A 100%);
+  border-right: 1px solid #334155;
+}
+.sidebar .user-name {
+  color: #94A3B8;
+}
+.sidebar .user-avatar {
+  background: #4F46E5;
+  color: #FFF;
+}
+.sidebar .btn-logout-icon {
+  color: #64748B;
+}
+.sidebar .btn-logout-icon:hover {
+  background: rgba(248,113,113,0.15);
+  color: #FCA5A5;
+}
+.sidebar .nav-item {
+  color: #94A3B8;
+}
+.sidebar .nav-item:hover {
+  background: rgba(99,102,241,0.08);
+  color: #E2E8F0;
+}
+.sidebar .nav-item .icon-md {
+  color: #6366F1;
+}
+.sidebar .nav-item:hover .icon-md { color: #818CF8; }
+.sidebar .nav-item.active {
+  background: rgba(99,102,241,0.15);
+  color: #FFF;
+  border: 1px solid rgba(99,102,241,0.3);
+}
+.sidebar .nav-item.active .icon-md { color: #818CF8; }
+
 /* ═══════════════════════════════════════════
   Calendar Widget
   ═══════════════════════════════════════════ */
@@ -208,62 +282,70 @@ body {
  color: var(--text-dim);
 }
 .cal-nav:hover { background: var(--bg); color: var(--text); }
-/* 月份按钮 */
-.cal-months {
-  display: grid;
-  grid-template-columns: repeat(4, 1fr);
-  gap: 3px;
-  padding: 0 14px 8px;
+/* 月份翻页行 */
+.cal-month-header {
+  padding: 4px 14px 8px;
 }
-.cal-month-btn {
-  padding: 4px 0;
-  border: 1px solid transparent;
-  border-radius: 6px;
-  background: var(--card);
-  font-size: 11px;
-  font-weight: 500;
-  color: var(--text-dim);
-  cursor: pointer;
-  text-align: center;
-  transition: all 0.15s;
-  font-family: inherit;
+.cal-month-header .cal-month-label {
+  font-size: 14px;
+  font-weight: 600;
+  color: var(--text);
 }
-.cal-month-btn:hover { border-color: var(--border); color: var(--text); }
-.cal-month-btn.active { background: var(--primary); color: #FFF; }
-.cal-month-btn.today { border-color: var(--primary); }
-.cal-month-btn.today:not(.active) { color: var(--primary); }

-/* 周选择 */
-.cal-weeks {
+/* 周列表行 */
+.cal-week-rows {
  display: flex;
-  gap: 8px;
+  flex-direction: column;
+  gap: 6px;
  padding: 8px 14px 10px;
-  justify-content: center;
 }
-.cal-week-cell {
-  width: 44px;
-  height: 44px;
+.cal-week-row {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  padding: 8px 10px;
+  border: 0.5px solid var(--border);
+  border-radius: 8px;
+  background: var(--card);
+  cursor: pointer;
+  transition: all 0.15s;
+}
+.cal-week-row:hover { border-color: var(--primary); }
+.cal-week-row.today { border-color: var(--primary); }
+.cal-week-row.selected { background: var(--primary); color: #FFF; border-color: transparent; }
+.cal-week-row.selected .cal-wk-label,
+.cal-week-row.selected .cal-wk-date,
+.cal-week-row.selected .cal-wk-badge { color: #FFF; }
+.cal-week-row.selected .cal-wk-status { background: rgba(255,255,255,0.2); color: #FFF; }
+
+.cal-wk-status {
+  width: 28px;
+  height: 28px;
+  border-radius: 50%;
  display: flex;
  align-items: center;
  justify-content: center;
-  font-size: 13px;
+  font-size: 12px;
  font-weight: 600;
-  border-radius: 8px;
-  color: var(--text-dim);
-  cursor: pointer;
-  transition: all 0.15s;
-  border: 1.5px solid var(--border);
-  background: var(--card);
+  flex-shrink: 0;
 }
-.cal-week-cell:hover { border-color: var(--primary); color: var(--primary); }
-.cal-week-cell.pass { background: var(--success-light); border-color: var(--success); color: var(--success); }
-.cal-week-cell.fail { background: var(--danger-light); border-color: var(--danger); color: var(--danger); }
-.cal-week-cell.today { border-color: var(--primary); box-shadow: 0 0 0 2px var(--primary-light); }
-.cal-week-cell.selected { background: var(--primary); color: #FFF; border-color: var(--primary); }
+.cal-wk-status.pass { background: var(--success-light); color: var(--success); }
+.cal-wk-status.fail { background: var(--danger-light); color: var(--danger); }
+.cal-wk-status.empty { background: var(--bg); color: var(--text-muted); }

-/* 旧样式清理 */
-.cal-week-list { display: none; }
-.cal-week-cell .wk-num, .cal-week-cell .wk-dot { display: none; }
+.cal-wk-info {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  gap: 1px;
+}
+.cal-wk-label { font-size: 12px; font-weight: 600; color: var(--text); }
+.cal-wk-date { font-size: 10px; color: var(--text-muted); }
+.cal-wk-badge { font-size: 10px; color: var(--text-muted); }
+
+/* 旧样式隐藏 */
+.cal-weeks { display: none; }
+.cal-week-cell { display: none; }

 .cal-header {
  display: flex;
@@ -1701,3 +1783,13 @@ body {
@media (max-width: 900px) {
  .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; }
+.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.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:hover { background:var(--primary); color:#FFF; }
--- a/templates/index.html
+++ b/templates/index.html
@@ -40,12 +40,14 @@
  <aside class="sidebar">

    <!-- 用户信息 -->
-    <div class="sidebar-user">
+    <div class="sidebar-user" id="sidebar-user-menu" onclick="toggleUserMenu(event)">
      <div class="user-avatar">{{ username[0] }}</div>
      <span class="user-name">{{ username }}</span>
-      <a href="/logout" class="btn-logout-icon" title="退出登录" onclick="return confirm('确定退出登录？')">
-        <svg class="icon-sm"><use href="#icon-logout"/></svg>
-      </a>
+      <div class="user-dropdown" id="user-dropdown" style="display:none">
+        <a class="user-dropdown-item" href="/logout" onclick="return confirm('确定退出登录？')">
+          <svg class="icon-sm"><use href="#icon-logout"/></svg> 退出登录
+        </a>
+      </div>
    </div>

    <!-- 功能入口 -->
@@ -114,15 +116,23 @@
                <svg class="icon-sm"><use href="#icon-chevron-right"/></svg>
              </button>
            </div>
-            <div class="cal-months" id="cal-months"></div>
-            <div class="cal-weeks" id="cal-weeks"></div>
+            <div class="cal-header cal-month-header">
+              <button class="cal-nav" onclick="changeCalMonth(-1)">
+                <svg class="icon-sm"><use href="#icon-chevron-left"/></svg>
+              </button>
+              <span class="cal-month-label" id="cal-month-label">7月</span>
+              <button class="cal-nav" onclick="changeCalMonth(1)">
+                <svg class="icon-sm"><use href="#icon-chevron-right"/></svg>
+              </button>
+            </div>
+            <div class="cal-week-rows" id="cal-weeks"></div>
          </div>
        </div>
        <!-- 右侧：Tab + 内容 -->
        <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> 责善改过
@@ -136,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> 增加一条
@@ -170,7 +180,7 @@
            <h3>勤学打卡</h3>
          </div>
          <p class="card-desc">本周修行清单</p>
-          <div id="study-list"></div>
+          <div id="study-cards"></div>
        </div>
      </div>
        </div><!-- /daily-main -->
Author	SHA1	Message	Date
mac	b48e95c800	v2.1.11 — 本周重点去3条限制 + 勤学改为卡片打卡按钮	2026-07-27 08:53:48 +08:00
mac	bf1be1aa9f	v2.1.10 — 移除周列表强制4周填充逻辑，避免跨月虚周	2026-07-27 08:47:49 +08:00
mac	083935f2da	v2.1.9 — 早间立志改为本周重点	2026-07-27 08:43:07 +08:00
mac	e6ae7f2eb4	v2.1.8 — 周列表移除圆形状态icon，只保留文字标签	2026-07-27 08:35:19 +08:00
mac	24561e1f59	v2.1.7 — 修复周列表点击事件变量名错误	2026-07-24 17:43:23 +08:00
mac	9fad18733e	v2.1.6 — 日历改为周列表式：每行显示周号+日期范围+状态	2026-07-24 17:42:15 +08:00
mac	5e97f6d6d8	v2.1.5 — 退出改为点击头像弹出下拉菜单	2026-07-24 17:39:40 +08:00
mac	99bc6d3c6c	v2.1.4 — 侧边栏深色主题：深蓝渐变背景+蓝色图标+浅灰文字	2026-07-24 17:38:42 +08:00
mac	5d3192dfaf	v2.1.3 — 周标签从W27改为第27周	2026-07-24 17:37:25 +08:00
mac	9c9511e817	v2.1.2 — 周选择改为2列一行grid布局	2026-07-24 17:36:50 +08:00
mac	b5dbb13956	v2.1.1 — 月份改成左右翻页选择器	2026-07-24 17:35:56 +08:00