v2.1.28 — 备注按钮常规模式也显示

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
@@ -428,7 +427,20 @@ def api_calendar_sync_all():
                 summary = (evt.get('summary') or '').strip()
                 if not summary:
                     continue
-                text = f"【{evt['time']}】{summary}" if evt.get('time') else summary
+                date_str = evt.get('date', '')
+                if date_str:
+                    try:
+                        parts = date_str.split('-')
+                        date_label = f"{int(parts[1])}月{int(parts[2])}日"
+                    except:
+                        date_label = date_str
+                else:
+                    date_label = ''
+                time_str = evt.get('time', '')
+                prefix = f"【{date_label} {time_str}】" if date_label and time_str else \
+                         (f"【{date_label}】" if date_label else \
+                          (f"【{time_str}】" if time_str else ''))
+                text = f"{prefix}{summary}" if prefix else summary
                 loc = evt.get('location', '')
                 if loc:
                     text += f" @{loc}"

static/app.js

@@ -169,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.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) {
+    we.querySelectorAll('.cal-week-row').forEach(function(row) {
-      cell.addEventListener('click', function() {
+      row.addEventListener('click', function() {
         var wk = this.dataset.week;
         if (wk) navigateToWeek(wk);
       });
@@ -235,10 +241,19 @@
 
   function buildData() {
     var morningItems = [];
-    var mEls = document.querySelectorAll('#morning-list .item-row input');
+    var mRows = document.querySelectorAll('#morning-list .item-row');
-    for (var i=0; i<mEls.length; i++) {
+    for (var i=0; i<mRows.length; i++) {
-      var v = mEls[i].value.trim();
+      var input = mRows[i].querySelector('input[type="text"]');
-      if (v) morningItems.push(v);
+      var noteEl = mRows[i].querySelector('.item-note-val');
+      var v = input ? input.value.trim() : '';
+      var n = noteEl ? noteEl.value.trim() : '';
+      if (v) morningItems.push(n ? {text: v, note: n} : v);
+    }
+    // 收集日历日程
+    var calEls = document.querySelectorAll('#morning-calendar-list .cal-task-item span:last-child');
+    for (var ci=0; ci<calEls.length; ci++) {
+      var txt = calEls[ci].textContent.trim();
+      if (txt) { morningItems.push(txt); }
     }
 
     var eveningItems = [];
@@ -251,17 +266,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 };
@@ -273,12 +284,29 @@
     var evening = data.evening || [];
     var study = data.study || [];
 
-    // 早间立志
+    // 本周重点：拆分手动任务 vs 日历日程
     document.getElementById('morning-list').innerHTML = '';
+    document.getElementById('morning-calendar-list').innerHTML = '';
+    var manualItems = [];
+    var calItems = [];
     if (morning.length === 0) morning = [''];
     for (var m=0; m<morning.length; m++) {
       var txt = typeof morning[m] === 'string' ? morning[m] : (morning[m].text || '');
-      addMorningRow(txt);
+      if (txt && txt.trim().startsWith('【')) { calItems.push(txt); }
+      else { manualItems.push(txt); }
+    }
+    if (manualItems.length === 0) manualItems = [''];
+    for (var a=0; a<manualItems.length; a++) { addMorningRow(manualItems[a]); }
+    if (calItems.length > 0) {
+      document.getElementById('morning-calendar').style.display = 'block';
+      for (var b=0; b<calItems.length; b++) {
+        var div = document.createElement('div');
+        div.className = 'cal-task-item';
+        div.innerHTML = '<span class="cal-task-dot">&#128197;</span><span>' + esc(calItems[b]) + '</span>';
+        document.getElementById('morning-calendar-list').appendChild(div);
+      }
+    } else {
+      document.getElementById('morning-calendar').style.display = 'none';
     }
 
     // 责善改过
@@ -289,16 +317,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, '');
+      }
     }
   }
 
@@ -311,15 +348,57 @@
     var idx = container.children.length;
     var text = typeof val === 'string' ? val : (val && val.text ? val.text : '');
     text = text || '';
+    var note = (val && val.note) ? val.note : '';
+    var hasNote = !!note;
     var div = document.createElement('div');
     div.className = 'item-row';
-    div.innerHTML = '<span class="idx">' + (idx+1) + '.</span>' +
+    div.draggable = true;
+    div.innerHTML = '<span class="drag-handle" title="拖动排序">⋮⋮</span>' +
+      '<span class="idx">' + (idx+1) + '.</span>' +
       '<input type="text" value="' + esc(text) + '" placeholder="本周最重要的一件事…">' +
+      '<button class="btn-note-toggle' + (hasNote ? ' has-note' : '') + '" onclick="openNoteModal(this)" title="备注">💬</button>' +
       '<button class="btn-del" onclick="this.parentElement.remove();renumberMorning()"><svg class="icon-sm"><use href="#icon-x"/></svg></button>';
+    // 隐藏存储备注
+    var noteHidden = document.createElement('input');
+    noteHidden.type = 'hidden';
+    noteHidden.className = 'item-note-val';
+    noteHidden.value = note;
+    div.appendChild(noteHidden);
+    div.addEventListener('dragstart', dragStart);
+    div.addEventListener('dragover', dragOver);
+    div.addEventListener('drop', function(e){ dragDrop.call(this, e, 'morning-list'); });
+    div.addEventListener('dragend', dragEnd);
     container.appendChild(div);
     renumberMorning();
   }
 
+  window.openNoteModal = function(btn) {
+    var row = btn.closest('.item-row');
+    var noteEl = row.querySelector('.item-note-val');
+    var input = row.querySelector('input[type="text"]');
+    var title = input ? input.value.trim() || '未命名任务' : '备注';
+    document.getElementById('note-modal-title').textContent = title;
+    document.getElementById('note-modal-textarea').value = noteEl ? noteEl.value : '';
+    document.getElementById('note-modal').style.display = 'flex';
+    document.getElementById('note-modal').dataset.rowIndex = Array.prototype.indexOf.call(row.parentElement.children, row);
+  };
+
+  window.saveNoteModal = function() {
+    var modal = document.getElementById('note-modal');
+    var row = document.querySelectorAll('#morning-list .item-row')[parseInt(modal.dataset.rowIndex)];
+    var noteEl = row.querySelector('.item-note-val');
+    var btn = row.querySelector('.btn-note-toggle');
+    var val = document.getElementById('note-modal-textarea').value.trim();
+    if (noteEl) noteEl.value = val;
+    if (val) { btn.classList.add('has-note'); } else { btn.classList.remove('has-note'); }
+    modal.style.display = 'none';
+    triggerAutoSave();
+  };
+
+  window.closeNoteModal = function() {
+    document.getElementById('note-modal').style.display = 'none';
+  };
+
   function renumberMorning() {
     var rows = document.querySelectorAll('#morning-list .item-row');
     for (var i=0; i<rows.length; i++) {
@@ -334,42 +413,116 @@
     improve = improve || '';
     var div = document.createElement('div');
     div.className = 'evening-row';
+    div.draggable = true;
     div.innerHTML =
+      '<span class="drag-handle evening-drag" title="拖动排序">⋮⋮</span>' +
       '<button class="btn-del" onclick="this.parentElement.remove()"><svg class="icon-sm"><use href="#icon-x"/></svg></button>' +
       '<input type="text" value="' + esc(mistake) + '" placeholder="犯的错误…">' +
       '<input type="text" value="' + esc(improve) + '" placeholder="改进方案…">';
+    div.addEventListener('dragstart', dragStart);
+    div.addEventListener('dragover', dragOver);
+    div.addEventListener('drop', function(e){ dragDrop.call(this, e, 'evening-list'); });
+    div.addEventListener('dragend', dragEnd);
     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);
+  };
+
+  /* ── 拖拽排序 ── */
+  var dragSrc = null;
+
+  function dragStart(e) {
+    dragSrc = this;
+    this.classList.add('dragging');
+    e.dataTransfer.effectAllowed = 'move';
+  }
+
+  function dragOver(e) {
+    e.preventDefault();
+    e.dataTransfer.dropEffect = 'move';
+    if (this !== dragSrc) this.classList.add('drag-over');
+  }
+
+  function dragDrop(e, listId) {
+    e.preventDefault();
+    this.classList.remove('drag-over');
+    if (dragSrc === this) return;
+    var container = document.getElementById(listId);
+    var items = container.querySelectorAll('.' + (dragSrc.classList.contains('evening-row') ? 'evening-row' : 'item-row'));
+    var from = Array.prototype.indexOf.call(items, dragSrc);
+    var to = Array.prototype.indexOf.call(items, this);
+    if (from < to) { container.insertBefore(dragSrc, this.nextSibling); }
+    else { container.insertBefore(dragSrc, this); }
+    if (listId === 'morning-list') renumberMorning();
+    triggerAutoSave();
+  }
+
+  function dragEnd() {
+    this.classList.remove('dragging');
+    document.querySelectorAll('.drag-over').forEach(function(el){ el.classList.remove('drag-over'); });
+    dragSrc = null;
+  }
+
+  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, '');
     }
   }
 
@@ -414,10 +567,12 @@
           html += '<div class="sync-day">';
           html += '<div class="sync-day-header"><span>' + day.date + '</span></div>';
           day.events.forEach(function(e) {
-            var timeStr = e.time ? ' (' + e.time + ')' : '';
+            var timeStr = e.time ? e.time : '';
+            var dateStr = e.date || '';
             html += '<div class="sync-event">' +
               '<span class="sync-event-icon">📌</span>' +
-              '<span class="sync-event-text">' + esc(e.summary) + '<span class="sync-event-time">' + esc(timeStr) + '</span></span>' +
+              '<span class="sync-event-text">' + esc(e.summary) + '</span>' +
+              '<span class="sync-event-meta">' + esc(dateStr) + (timeStr ? ' ' + esc(timeStr) : '') + '</span>' +
             '</div>';
           });
           html += '</div>';
@@ -441,8 +596,6 @@
   };
 
   window.addMorning = function() {
-    var count = document.querySelectorAll('#morning-list .item-row').length;
-    if (count >= 3) { showToast('最多 3 条立志', 'error'); return; }
     addMorningRow('');
   };
   window.addEvening = function() {
@@ -469,6 +622,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
      ================================================================ */
@@ -482,7 +646,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(){});
       }
@@ -1002,7 +1166,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) {
@@ -1020,7 +1184,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

@@ -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
    ═══════════════════════════════════════════ */
@@ -218,36 +292,60 @@ body {
   color: var(--text);
 }
 
-/* 周选择 */
+/* 周列表行 */
-.cal-weeks {
+.cal-week-rows {
-  display: grid;
+  display: flex;
-  grid-template-columns: repeat(2, 1fr);
+  flex-direction: column;
-  gap: 8px;
+  gap: 6px;
   padding: 8px 14px 10px;
 }
-.cal-week-cell {
+.cal-week-row {
-  height: 42px;
+  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;
+  flex-shrink: 0;
-  color: var(--text-dim);
-  cursor: pointer;
-  transition: all 0.15s;
-  border: 1.5px solid var(--border);
-  background: var(--card);
 }
-.cal-week-cell:hover { border-color: var(--primary); color: var(--primary); }
+.cal-wk-status.pass { background: var(--success-light); color: var(--success); }
-.cal-week-cell.pass { background: var(--success-light); border-color: var(--success); color: var(--success); }
+.cal-wk-status.fail { background: var(--danger-light); color: var(--danger); }
-.cal-week-cell.fail { background: var(--danger-light); border-color: var(--danger); color: var(--danger); }
+.cal-wk-status.empty { background: var(--bg); color: var(--text-muted); }
-.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-info {
-.cal-week-list { display: none; }
+  flex: 1;
-.cal-week-cell .wk-num, .cal-week-cell .wk-dot { display: none; }
+  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;
@@ -734,9 +832,7 @@ body {
 }
 
 /* 编辑模式下才显示的元素 */
-.edit-only { display: none; }
+.edit-only { display: flex; }
-.card.editing .edit-only { display: flex; }
-.card.editing .btn-del { display: inline-flex; }
 
 /* 默认隐藏删除按钮 */
 .btn-del { display: none; }
@@ -932,7 +1028,7 @@ body {
   gap: 5px;
   width: 100%;
   padding: 9px;
-  margin-top: auto;
+  margin-top: 12px;
   border: 1.5px dashed var(--primary);
   background: var(--primary-light);
   color: var(--primary);
@@ -1364,7 +1460,7 @@ body {
 .sync-event + .sync-event { border-top: 1px solid var(--bg); }
 .sync-event-icon { flex-shrink: 0; }
 .sync-event-text { flex: 1; }
-.sync-event-time { font-size: 11px; color: var(--text-muted); margin-left: 6px; }
+.sync-event-meta { font-size: 11px; color: var(--text-muted); }
 .sync-modal-footer {
   padding: 12px 20px;
   border-top: 1px solid var(--border);
@@ -1685,3 +1781,47 @@ body {
 @media (max-width: 900px) {
   .quad-grid { grid-template-columns: 1fr; grid-template-rows: auto; }
 }
+
+/* 勤学打卡卡片 - 单行样式 */
+#study-cards { display: flex; flex-direction: column; gap: 8px; }
+.study-card { position:relative; display:flex; align-items:center; gap:12px; padding:10px 14px; border:1px solid var(--border); border-radius:var(--radius-sm); background:var(--card); transition:all 0.15s; }
+.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; align-items:center; gap:8px; flex:1; }
+.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; flex-shrink:0; }
+.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; white-space:nowrap; }
+.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:50%; transform:translateY(-50%); right:54px; 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; }
+.edit-only-study { display: none; }
+#panel-daily.editing-study .edit-only-study { display: flex; }
+
+/* 编辑模式下显示删除按钮 */
+.btn-del { display: none; }
+.card.editing .btn-del { display: inline-flex; }
+
+/* 本周日程 */
+.morning-calendar { margin-top: 14px; border-top: 1px solid var(--border); padding-top: 12px; }
+.morning-calendar-head { display: flex; align-items: center; gap: 6px; font-size: 12px; font-weight: 600; color: var(--text-muted); margin-bottom: 8px; }
+.cal-task-item { display: flex; align-items: flex-start; gap: 8px; padding: 6px 0; font-size: 13px; color: var(--text-dim); line-height: 1.5; border-bottom: 1px solid var(--bg); }
+.cal-task-item:last-child { border-bottom: none; }
+.cal-task-dot { flex-shrink: 0; font-size: 14px; margin-top: 1px; }
+
+/* 拖拽排序 */
+.drag-handle { display: none; cursor: grab; color: var(--text-muted); font-size: 14px; user-select: none; padding: 0 4px; line-height: 1; letter-spacing: -2px; }
+.card.editing .drag-handle { display: block; }
+.item-row.dragging, .evening-row.dragging { opacity: 0.5; }
+.item-row.drag-over, .evening-row.drag-over { border-color: var(--primary) !important; background: var(--primary-light); }
+.evening-drag { position: absolute; left: 6px; top: 8px; }
+
+/* 任务备注 */
+.btn-note-toggle { display: inline-flex; background: none; border: none; cursor: pointer; font-size: 14px; padding: 2px 4px; border-radius: 4px; transition: all 0.15s; flex-shrink: 0; }
+.btn-note-toggle:hover { background: var(--bg); }
+.btn-note-toggle.has-note { color: var(--primary); }
+.item-note { display: none; width: 100%; padding: 6px 10px; border: 1px solid var(--border); border-radius: 6px; font-size: 12px; font-family: inherit; color: var(--text); background: var(--bg); resize: vertical; min-height: 28px; box-sizing: border-box; margin-top: 6px; }
+.item-note:focus { outline: none; border-color: var(--primary); }
+.item-row { flex-wrap: wrap; }

templates/index.html

@@ -34,18 +34,37 @@
   </div>
 </div>
 
+<!-- 备注编辑弹窗 -->
+<div class="sync-modal-overlay" id="note-modal" style="display:none">
+  <div class="sync-modal" style="max-width:420px">
+    <div class="sync-modal-header">
+      <h3 id="note-modal-title">备注</h3>
+      <button class="sync-modal-close" onclick="closeNoteModal()">&times;</button>
+    </div>
+    <div style="padding:16px">
+      <textarea id="note-modal-textarea" style="width:100%; min-height:120px; padding:10px; border:1px solid var(--border); border-radius:8px; font-size:14px; font-family:inherit; resize:vertical; box-sizing:border-box" placeholder="写点备注…"></textarea>
+    </div>
+    <div class="sync-modal-footer">
+      <button class="btn-wish-cancel" onclick="closeNoteModal()">取消</button>
+      <button class="btn-wish-save" onclick="saveNoteModal()">保存</button>
+    </div>
+  </div>
+</div>
+
 <div class="app-layout">
 
   <!-- ═══ 左侧边栏 ═══ -->
   <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('确定退出登录？')">
+      <div class="user-dropdown" id="user-dropdown" style="display:none">
-        <svg class="icon-sm"><use href="#icon-logout"/></svg>
+        <a class="user-dropdown-item" href="/logout" onclick="return confirm('确定退出登录？')">
-      </a>
+          <svg class="icon-sm"><use href="#icon-logout"/></svg> 退出登录
+        </a>
+      </div>
     </div>
 
     <!-- 功能入口 -->
@@ -123,14 +142,14 @@
                 <svg class="icon-sm"><use href="#icon-chevron-right"/></svg>
               </button>
             </div>
-            <div class="cal-weeks" id="cal-weeks"></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> 责善改过
@@ -144,17 +163,24 @@
           <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> 增加一条
           </button>
+          <div class="morning-calendar" id="morning-calendar" style="display:none">
+            <div class="morning-calendar-head">
+              <svg class="icon-sm"><use href="#icon-calendar"/></svg>
+              <span>本周日程</span>
+            </div>
+            <div id="morning-calendar-list"></div>
+          </div>
         </div>
         <div class="card card-evening daily-card" data-card="evening">
           <div class="card-head">
@@ -174,11 +200,19 @@
         </div>
         <div class="card card-study daily-card" data-card="study">
           <div class="card-head">
-            <svg class="icon-h2"><use href="#icon-book-open"/></svg>
+            <div class="card-head-left">
-            <h3>勤学打卡</h3>
+              <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 -->