v1.3.2 — 日历同步批量查询+弹窗结果展示

- /api/calendar-sync-all 批量查询过去15天~未来15天
- 弹窗展示：加载动画 → 统计摘要 → 按日期分组日程列表
- 自动填充今日日程到早间立志
- 批量查询约需10秒，首次查询后同步写入缓存

app.py

@@ -6,10 +6,11 @@ from datetime import timedelta
 from functools import wraps
 from flask import Flask, render_template, request, jsonify, session, redirect, url_for
 from werkzeug.security import generate_password_hash, check_password_hash
-from database import init_db, get_checkin, save_checkin, delete_checkin, get_all_checkins
+from database import init_db, get_checkin, save_checkin, delete_checkin, get_all_checkins, get_wishes, save_wish, update_wish, delete_wish, reorder_wishes
 
 app = Flask(__name__)
-app.secret_key = os.urandom(24)
+# 固定密钥确保 gunicorn 多 worker 下 session 可互通
+app.secret_key = os.environ.get('SECRET_KEY', 'ziwei-power-secret-2026')
 
 # 会话持久化：30 天
 app.config['PERMANENT_SESSION_LIFETIME'] = timedelta(days=30)
@@ -114,9 +115,11 @@ def compute_stats():
 def index():
     import json
     stats = compute_stats()
+    wishes = [dict(w) for w in get_wishes()]
     return render_template('index.html',
                            username=session.get('display_name', session.get('username', '')),
-                           initial_stats=json.dumps(stats, ensure_ascii=False))
+                           initial_stats=json.dumps(stats, ensure_ascii=False),
+                           initial_wishes=json.dumps(wishes, ensure_ascii=False))
 
 
 # ── API ──────────────────────────────────────────────
@@ -174,6 +177,154 @@ def api_user():
     })
 
 
+# ── 心愿清单 API ──────────────────────────────
+
+@app.route('/api/wishes', methods=['GET'])
+@login_required
+def api_get_wishes():
+    wishes = [dict(w) for w in get_wishes()]
+    return jsonify({'ok': True, 'data': wishes})
+
+
+@app.route('/api/wishes', methods=['POST'])
+@login_required
+def api_create_wish():
+    body = request.get_json(force=True)
+    name = body.get('name', '').strip()
+    if not name:
+        return jsonify({'ok': False, 'error': '名称不能为空'}), 400
+    quadrant = body.get('quadrant', '重要不紧急')
+    deadline = body.get('deadline', '')
+    wid = save_wish(name, quadrant, deadline)
+    return jsonify({'ok': True, 'id': wid})
+
+
+@app.route('/api/wishes/<int:wish_id>', methods=['PUT'])
+@login_required
+def api_update_wish(wish_id):
+    body = request.get_json(force=True)
+    update_wish(wish_id, **body)
+    return jsonify({'ok': True})
+
+
+@app.route('/api/wishes/<int:wish_id>', methods=['DELETE'])
+@login_required
+def api_delete_wish(wish_id):
+    delete_wish(wish_id)
+    return jsonify({'ok': True})
+
+
+@app.route('/api/wishes/reorder', methods=['PUT'])
+@login_required
+def api_reorder_wishes():
+    body = request.get_json(force=True)
+    order = body.get('order', [])
+    if not isinstance(order, list):
+        return jsonify({'ok': False, 'error': 'order 必须是列表'}), 400
+    reorder_wishes(order)
+    return jsonify({'ok': True})
+
+
+# ── 日历同步 API ────────────────────────────
+
+CALENDAR_CACHE = os.path.join(os.path.expanduser('~'), '.workbuddy', 'data', 'ziwei-power', 'calendar_cache.json')
+DING_MCP_URL = 'https://mcp-gw.dingtalk.com/server/95959163f85d8b58a167f65cd8bd3d22690b16c75ebacd0fa095016396a10e0d?key=0993e4d4e44c50ea25a0db840cc5815e'
+
+
+def _fetch_dingtalk_events(date_str):
+    """调用钉钉 MCP 实时查询指定日期的日程"""
+    import json as _json, urllib.request as _ur
+    from datetime import datetime, timezone, timedelta
+    tz = timezone(timedelta(hours=8))
+    try:
+        d = datetime.strptime(date_str, '%Y-%m-%d').replace(tzinfo=tz)
+    except ValueError:
+        return []
+    start_ts = int(d.replace(hour=0, minute=0, second=0).timestamp() * 1000)
+    end_ts = int(d.replace(hour=23, minute=59, second=59).timestamp() * 1000)
+    body = _json.dumps({
+        'jsonrpc': '2.0', 'method': 'tools/call', 'id': 1,
+        'params': {'name': 'list_calendar_events', 'arguments': {
+            'calendarId': 'primary', 'startTime': start_ts, 'endTime': end_ts, 'limit': 20
+        }}
+    }).encode('utf-8')
+    req = _ur.Request(DING_MCP_URL, data=body, headers={
+        'Content-Type': 'application/json', 'Accept': 'application/json'
+    })
+    try:
+        with _ur.urlopen(req, timeout=10) as resp:
+            data = _json.loads(resp.read())
+        events = data.get('result', {}).get('structuredContent', {}).get('result', {}).get('events', [])
+    except Exception:
+        return None  # 网络错误返回 None，调用方回退缓存
+    results = []
+    for e in events:
+        summary = (e.get('summary') or '').strip()
+        if not summary:
+            continue
+        start = e.get('start', {}).get('dateTime', '')
+        end = e.get('end', {}).get('dateTime', '')
+        time_str = ''
+        if start and end:
+            time_str = start[11:16] + '-' + end[11:16]
+        results.append({
+            'date': date_str, 'summary': summary,
+            'time': time_str, 'location': e.get('location') or ''
+        })
+    # 写入缓存
+    try:
+        all_cached = []
+        try:
+            with open(CALENDAR_CACHE, 'r') as f:
+                all_cached = _json.load(f)
+        except (FileNotFoundError, _json.JSONDecodeError):
+            pass
+        # 替换同一天的旧缓存
+        all_cached = [c for c in all_cached if c.get('date') != date_str] + results
+        with open(CALENDAR_CACHE, 'w') as f:
+            _json.dump(all_cached, f, ensure_ascii=False, indent=2)
+    except Exception:
+        pass
+    return results
+
+
+@app.route('/api/calendar-sync', methods=['GET'])
+@login_required
+def api_calendar_sync():
+    import json as _json
+    date = request.args.get('date', '')
+    if not date:
+        return jsonify({'ok': False, 'error': '缺少 date 参数'}), 400
+    # 优先实时查询钉钉 MCP
+    events = _fetch_dingtalk_events(date)
+    if events is None:
+        # MCP 不可用，回退缓存
+        try:
+            with open(CALENDAR_CACHE, 'r') as f:
+                all_cached = _json.load(f)
+            events = [e for e in all_cached if e.get('date') == date]
+        except (FileNotFoundError, _json.JSONDecodeError):
+            events = []
+    return jsonify({'ok': True, 'data': events})
+
+
+@app.route('/api/calendar-sync-all', methods=['GET'])
+@login_required
+def api_calendar_sync_all():
+    """批量查询过去15天~未来15天的钉钉日程，按日期分组返回"""
+    import json as _json
+    from datetime import datetime, timedelta
+    today = datetime.now().replace(hour=0, minute=0, second=0, microsecond=0)
+    results = []
+    for delta in range(-15, 16):
+        d = today + timedelta(days=delta)
+        ds = d.strftime('%Y-%m-%d')
+        events = _fetch_dingtalk_events(ds)
+        if events:
+            results.append({'date': ds, 'events': events})
+    return jsonify({'ok': True, 'data': results})
+
+
 # ── 启动 ──────────────────────────────────────────────
 
 if __name__ == '__main__':

database.py

@@ -10,6 +10,9 @@ DB_DIR = os.path.join(os.path.expanduser('~'), '.workbuddy', 'data', 'ziwei-powe
 os.makedirs(DB_DIR, exist_ok=True)
 DB_PATH = os.path.join(DB_DIR, 'ziwei_power.db')
 
+# 当前数据库 schema 版本 —— 改表结构时必须 +1 并补迁移逻辑
+CURRENT_SCHEMA_VERSION = 3
+
 
 def get_conn():
     conn = sqlite3.connect(DB_PATH)
@@ -17,18 +20,68 @@ def get_conn():
     return conn
 
 
-def init_db():
-    """初始化数据库表"""
-    conn = get_conn()
+def _get_schema_version(conn):
+    """读取当前数据库的 schema 版本，无表时返回 0"""
     conn.execute('''
-        CREATE TABLE IF NOT EXISTS checkins (
-            id INTEGER PRIMARY KEY AUTOINCREMENT,
-            date TEXT UNIQUE NOT NULL,
-            data TEXT NOT NULL,
-            created_at TEXT NOT NULL,
-            updated_at TEXT NOT NULL
+        CREATE TABLE IF NOT EXISTS schema_version (
+            version INTEGER NOT NULL
         )
     ''')
+    row = conn.execute('SELECT version FROM schema_version').fetchone()
+    return row['version'] if row else 0
+
+
+def _set_schema_version(conn, version):
+    """写入 schema 版本"""
+    conn.execute('DELETE FROM schema_version')
+    conn.execute('INSERT INTO schema_version (version) VALUES (?)', (version,))
+
+
+def init_db():
+    """初始化数据库表 & 自动迁移"""
+    conn = get_conn()
+    current = _get_schema_version(conn)
+
+    # ── 迁移步骤（按版本号递增）────────────────────────
+    if current < 1:
+        # v1: 初始表结构
+        conn.execute('''
+            CREATE TABLE IF NOT EXISTS checkins (
+                id INTEGER PRIMARY KEY AUTOINCREMENT,
+                date TEXT UNIQUE NOT NULL,
+                data TEXT NOT NULL,
+                created_at TEXT NOT NULL,
+                updated_at TEXT NOT NULL
+            )
+        ''')
+
+    if current < 2:
+        # v2: 心愿清单
+        conn.execute('''
+            CREATE TABLE IF NOT EXISTS wishes (
+                id INTEGER PRIMARY KEY AUTOINCREMENT,
+                name TEXT NOT NULL,
+                priority TEXT NOT NULL DEFAULT '中',
+                deadline TEXT NOT NULL DEFAULT '',
+                done INTEGER NOT NULL DEFAULT 0,
+                sort_order INTEGER NOT NULL DEFAULT 0,
+                created_at TEXT NOT NULL
+            )
+        ''')
+
+    if current < 3:
+        # v3: 优先级改为四象限
+        conn.execute("ALTER TABLE wishes ADD COLUMN quadrant TEXT NOT NULL DEFAULT '重要不紧急'")
+        conn.execute("UPDATE wishes SET quadrant = CASE priority WHEN '高' THEN '重要紧急' WHEN '中' THEN '重要不紧急' WHEN '低' THEN '不紧急不重要' ELSE '重要不紧急' END WHERE quadrant = '重要不紧急'")
+
+    # ── 将来加字段/改表在此扩展 ──
+    # if current < 2:
+    #     conn.execute('ALTER TABLE checkins ADD COLUMN tags TEXT DEFAULT ""')
+    #     # 可选：对已有行做数据补全
+    #     conn.execute("UPDATE checkins SET tags = '[]' WHERE tags IS NULL")
+
+    # ── 写入最新版本号 ──
+    _set_schema_version(conn, CURRENT_SCHEMA_VERSION)
     conn.commit()
     conn.close()
 
@@ -92,3 +145,59 @@ def get_all_checkins():
             'updated_at': row['updated_at']
         })
     return results
+
+
+# ── 心愿清单 CRUD ──────────────────────────────────
+
+def get_wishes():
+    """获取所有心愿，按 sort_order 排序"""
+    conn = get_conn()
+    rows = conn.execute('SELECT * FROM wishes ORDER BY sort_order').fetchall()
+    conn.close()
+    return [dict(row) for row in rows]
+
+
+def save_wish(name, quadrant, deadline):
+    """新增一条心愿"""
+    now = datetime.now().isoformat()
+    conn = get_conn()
+    max_order = conn.execute('SELECT COALESCE(MAX(sort_order), -1) + 1 AS n FROM wishes').fetchone()['n']
+    conn.execute(
+        'INSERT INTO wishes (name, quadrant, deadline, done, sort_order, created_at) VALUES (?, ?, ?, 0, ?, ?)',
+        (name, quadrant, deadline, max_order, now)
+    )
+    conn.commit()
+    wish_id = conn.execute('SELECT last_insert_rowid()').fetchone()[0]
+    conn.close()
+    return wish_id
+
+
+def update_wish(wish_id, **kwargs):
+    """更新心愿字段"""
+    allowed = ['name', 'quadrant', 'deadline', 'done']
+    updates = {k: v for k, v in kwargs.items() if k in allowed}
+    if not updates:
+        return
+    conn = get_conn()
+    sets = ', '.join(f'{k} = ?' for k in updates)
+    vals = list(updates.values()) + [wish_id]
+    conn.execute(f'UPDATE wishes SET {sets} WHERE id = ?', vals)
+    conn.commit()
+    conn.close()
+
+
+def delete_wish(wish_id):
+    """删除心愿"""
+    conn = get_conn()
+    conn.execute('DELETE FROM wishes WHERE id = ?', (wish_id,))
+    conn.commit()
+    conn.close()
+
+
+def reorder_wishes(order_list):
+    """批量更新排序：order_list = [id1, id2, ...]"""
+    conn = get_conn()
+    for idx, wid in enumerate(order_list):
+        conn.execute('UPDATE wishes SET sort_order = ? WHERE id = ?', (idx, wid))
+    conn.commit()
+    conn.close()

deploy.sh

@@ -1,6 +1,9 @@
 #!/bin/bash
 # ziwei-power 一键部署脚本
 # 用法: bash deploy.sh [port]
+#
+# 首次运行: 自动生成 .env (SECRET_KEY)，之后不变
+# 多 worker 安全: 所有 worker 共享同一密钥
 
 set -e
 
@@ -30,7 +33,15 @@ fi
 echo "安装依赖..."
 venv/bin/pip install -q -r requirements.txt
 
-# 3. 自动建表（首次运行）
+# 3. 生成/读取固定 SECRET_KEY（多 worker 共享）
+if [ ! -f ".env" ]; then
+    echo "生成 SECRET_KEY..."
+    python3 -c "import os; print('SECRET_KEY=' + os.urandom(24).hex())" > .env
+fi
+set -a; source .env; set +a
+export SECRET_KEY
+
+# 4. 自动建表（首次运行）
 echo "初始化数据库..."
 venv/bin/python -c "
 from database import init_db

static/app.js

@@ -105,6 +105,7 @@
 
     if (name === 'weekly') loadWeekly();
     if (name === 'history') loadHistory();
+    if (name === 'wishes') loadWishes();
   };
 
   /* ================================================================
@@ -236,9 +237,9 @@
     var eveningItems = [];
     var eRows = document.querySelectorAll('#evening-list .evening-row');
     for (var j=0; j<eRows.length; j++) {
-      var cols = eRows[j].querySelectorAll('.col input');
-      var mistake = cols[0] ? cols[0].value.trim() : '';
-      var improve = cols[1] ? cols[1].value.trim() : '';
+      var inputs = eRows[j].querySelectorAll('input[type="text"]');
+      var mistake = inputs[0] ? inputs[0].value.trim() : '';
+      var improve = inputs[1] ? inputs[1].value.trim() : '';
       if (mistake || improve) eveningItems.push({ mistake: mistake, improvement: improve });
     }
 
@@ -318,30 +319,15 @@
 
   function addEveningRow(mistake, improve) {
     var container = document.getElementById('evening-list');
-    var idx = container.children.length;
     mistake = mistake || '';
     improve = improve || '';
     var div = document.createElement('div');
     div.className = 'evening-row';
     div.innerHTML =
-      '<div class="evening-header">' +
-        '<span class="idx">' + (idx+1) + '.</span>' +
-        '<button class="btn-del" onclick="this.parentElement.parentElement.remove();renumberEvening()"><svg class="icon-sm"><use href="#icon-x"/></svg></button>' +
-      '</div>' +
-      '<div class="mistake-row">' +
-        '<div class="col"><label>错误</label><input type="text" value="' + esc(mistake) + '" placeholder="今天犯的错…"></div>' +
-        '<div class="col"><label>改进方案</label><input type="text" value="' + esc(improve) + '" placeholder="下次怎么做…"></div>' +
-      '</div>';
+      '<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="改进方案…">';
     container.appendChild(div);
-    renumberEvening();
-  }
-
-  function renumberEvening() {
-    var rows = document.querySelectorAll('#evening-list .evening-row');
-    for (var i=0; i<rows.length; i++) {
-      var span = rows[i].querySelector('.idx');
-      if (span) span.textContent = (i+1) + '.';
-    }
   }
 
   /* ── 勤学预设项目 ── */
@@ -376,6 +362,97 @@
     }
   }
 
+  /* ── 日历同步 ── */
+
+  window.syncCalendar = function() {
+    var overlay = document.getElementById('sync-modal-overlay');
+    var loading = document.getElementById('sync-loading');
+    var resultsEl = document.getElementById('sync-results');
+    var summary = document.getElementById('sync-summary');
+    var list = document.getElementById('sync-list');
+    var btn = document.querySelector('.btn-cal-sync');
+    if (!overlay) return;
+
+    // 打开弹窗，显示加载中
+    overlay.style.display = 'flex';
+    loading.style.display = 'block';
+    resultsEl.style.display = 'none';
+    if (btn) { btn.style.opacity = '0.5'; btn.disabled = true; }
+
+    fetch('/api/calendar-sync-all')
+      .then(function(r){ return r.json(); })
+      .then(function(res){
+        loading.style.display = 'none';
+        resultsEl.style.display = 'block';
+        if (btn) { btn.style.opacity = '1'; btn.disabled = false; }
+        if (!res.ok) { summary.innerHTML = '<span style="color:var(--danger)">同步失败: ' + (res.error || '未知错误') + '</span>'; return; }
+        var data = res.data || [];
+        if (data.length === 0) {
+          summary.innerHTML = '未查询到任何日程';
+          return;
+        }
+        // 统计
+        var totalDays = data.length;
+        var totalEvents = 0;
+        data.forEach(function(d){ totalEvents += d.events.length; });
+        summary.innerHTML = '同步完成！共 <b>' + totalDays + '</b> 天有日程，合计 <b>' + totalEvents + '</b> 个会议';
+
+        // 渲染结果列表
+        var html = '';
+        data.forEach(function(day) {
+          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 + ')' : '';
+            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>' +
+            '</div>';
+          });
+          html += '</div>';
+        });
+        list.innerHTML = html;
+
+        // 自动填充今天到选中日期的日程
+        autoFillTodayEvents(data);
+      })
+      .catch(function(){
+        loading.style.display = 'none';
+        resultsEl.style.display = 'block';
+        summary.innerHTML = '<span style="color:var(--danger)">网络错误，请重试</span>';
+        if (btn) { btn.style.opacity = '1'; btn.disabled = false; }
+      });
+  };
+
+  function autoFillTodayEvents(data) {
+    var todayDate = document.getElementById('check-date').value;
+    var added = 0;
+    data.forEach(function(day) {
+      if (day.date !== todayDate) return;
+      day.events.forEach(function(e) {
+        var text = e.time ? '【' + e.time + '】' + e.summary : e.summary;
+        if (e.location) text += ' @' + e.location;
+        var existing = document.querySelectorAll('#morning-list input[type="text"]');
+        var already = false;
+        existing.forEach(function(inp){ if (inp.value.indexOf(e.summary) >= 0) already = true; });
+        if (already) return;
+        var count = document.querySelectorAll('#morning-list .item-row').length;
+        if (count >= 3) return;
+        addMorningRow(text);
+        added++;
+      });
+    });
+    if (added > 0) {
+      showToast('已自动填充 ' + added + ' 条今日日程', 'info');
+      triggerAutoSave();
+    }
+  }
+
+  window.closeSyncModal = function() {
+    var overlay = document.getElementById('sync-modal-overlay');
+    if (overlay) overlay.style.display = 'none';
+  };
+
   window.addMorning = function() {
     var count = document.querySelectorAll('#morning-list .item-row').length;
     if (count >= 3) { showToast('最多 3 条立志', 'error'); return; }
@@ -634,6 +711,278 @@
     });
   };
 
+  /* ================================================================
+     Wishes — 心愿清单（四象限）
+     ================================================================ */
+  var wishes = [];
+  var dragSourceId = null;
+  var dragSourceQuadrant = null;
+  var wishesLoaded = false;
+  var QUADRANTS = ['重要紧急', '重要不紧急', '紧急不重要', '不紧急不重要'];
+
+  function normalizeQuadrant(w) {
+    if (QUADRANTS.indexOf(w.quadrant) >= 0) return w.quadrant;
+    // 老数据回退: priority → quadrant
+    var map = {'高': '重要紧急', '中': '重要不紧急', '低': '不紧急不重要'};
+    return map[w.priority] || '重要不紧急';
+  }
+
+  function loadWishes() {
+    if (wishesLoaded) { renderWishes(); return; }
+    if (window.__INITIAL_WISHES__) {
+      wishes = window.__INITIAL_WISHES__;
+      // 规范化 quadrant
+      wishes.forEach(function(w){ w.quadrant = normalizeQuadrant(w); });
+      wishesLoaded = true;
+      renderWishes();
+      return;
+    }
+    fetch('/api/wishes')
+      .then(function(r){ return r.json(); })
+      .then(function(res){ if (res.ok) { wishes = res.data; wishesLoaded = true; renderWishes(); } });
+  }
+
+  function renderWishes() {
+    var emptyEl = document.getElementById('wishes-empty');
+    if (!wishes.length) {
+      QUADRANTS.forEach(function(q){ document.getElementById('quad-list-' + q).innerHTML = ''; });
+      if (emptyEl) emptyEl.style.display = 'block';
+      return;
+    }
+    if (emptyEl) emptyEl.style.display = 'none';
+
+    // 按象限分组渲染
+    QUADRANTS.forEach(function(quadrant) {
+      var list = document.getElementById('quad-list-' + quadrant);
+      if (!list) return;
+      var items = wishes.filter(function(w){ return normalizeQuadrant(w) === quadrant; });
+      var html = '';
+      for (var i = 0; i < items.length; i++) {
+        var w = items[i];
+        var doneCls = w.done ? ' done' : '';
+        var deadline = w.deadline ? w.deadline : '';
+        html += '<div class="wish-item' + doneCls + '" draggable="true" data-id="' + w.id + '" data-quadrant="' + quadrant + '">' +
+          '<span class="wish-drag-handle"><svg class="icon-xs"><use href="#icon-list-bullet"/></svg></span>' +
+          '<input type="checkbox" class="wish-check" ' + (w.done ? 'checked' : '') + ' onchange="toggleWish(' + w.id + ', this.checked)">' +
+          '<span class="wish-name" title="' + esc(w.name) + '">' + esc(w.name) + '</span>' +
+          (deadline ? '<span class="wish-deadline">' + esc(deadline) + '</span>' : '') +
+          '<button class="btn-del wish-del" onclick="deleteWishItem(' + w.id + ')"><svg class="icon-xs"><use href="#icon-x"/></svg></button>' +
+        '</div>';
+      }
+      list.innerHTML = html;
+    });
+
+    bindDragEvents();
+    bindEditClicks();
+  }
+
+  /* ── 点击编辑 ── */
+
+  function bindEditClicks() {
+    document.querySelectorAll('#panel-wishes .wish-item').forEach(function(item) {
+      // 只在点击名称或日期区域时触发编辑（排除 checkbox / 拖拽手柄 / 删除按钮）
+      item.addEventListener('click', function(e) {
+        if (e.target.closest('.wish-check') || e.target.closest('.wish-drag-handle') ||
+            e.target.closest('.wish-del') || e.target.closest('.wish-edit-form')) return;
+        var id = parseInt(this.dataset.id);
+        var w = wishes.find(function(x){ return x.id === id; });
+        if (w) startEditWish(this, w);
+      });
+    });
+  }
+
+  function startEditWish(el, w) {
+    if (el.querySelector('.wish-edit-form')) return; // 已在编辑中
+    el.classList.add('editing');
+    var deadline = w.deadline || '';
+    var quadOpts = QUADRANTS.map(function(q){
+      return '<option value="' + q + '"' + (q === normalizeQuadrant(w) ? ' selected' : '') + '>' + q + '</option>';
+    }).join('');
+    el.innerHTML =
+      '<div class="wish-edit-form">' +
+        '<input type="text" class="wish-edit-name" value="' + esc(w.name) + '" maxlength="50">' +
+        '<div class="wish-edit-row">' +
+          '<select class="wish-edit-quadrant">' + quadOpts + '</select>' +
+          '<input type="date" class="wish-edit-deadline" value="' + esc(deadline) + '">' +
+        '</div>' +
+        '<div class="wish-edit-actions">' +
+          '<button class="btn-wish-save" onclick="event.stopPropagation();saveEditWish(' + w.id + ', this)">保存</button>' +
+          '<button class="btn-wish-cancel" onclick="event.stopPropagation();window.renderWishes()">取消</button>' +
+        '</div>' +
+      '</div>';
+  }
+
+  window.saveEditWish = function(id, btn) {
+    var form = btn.closest('.wish-edit-form');
+    var name = form.querySelector('.wish-edit-name').value.trim();
+    if (!name) { showToast('名称不能为空', 'error'); return; }
+    var quadrant = form.querySelector('.wish-edit-quadrant').value;
+    var deadline = form.querySelector('.wish-edit-deadline').value;
+    fetch('/api/wishes/' + id, {
+      method: 'PUT',
+      headers: {'Content-Type': 'application/json'},
+      body: JSON.stringify({name: name, quadrant: quadrant, deadline: deadline})
+    }).then(function(r){ return r.json(); })
+      .then(function(res) {
+        if (!res.ok) { showToast(res.error, 'error'); return; }
+        var w = wishes.find(function(x){ return x.id === id; });
+        if (w) { w.name = name; w.quadrant = quadrant; w.deadline = deadline; }
+        renderWishes();
+      });
+  };
+
+  /* ── Drag & Drop (跨象限) ── */
+
+  function bindDragEvents() {
+    var items = document.querySelectorAll('#panel-wishes .wish-item');
+    items.forEach(function(item) {
+      item.addEventListener('dragstart', function(e) {
+        dragSourceId = parseInt(this.dataset.id);
+        dragSourceQuadrant = this.dataset.quadrant;
+        this.classList.add('dragging');
+        e.dataTransfer.effectAllowed = 'move';
+      });
+      item.addEventListener('dragend', function() {
+        this.classList.remove('dragging');
+        dragSourceId = null;
+        dragSourceQuadrant = null;
+        document.querySelectorAll('.quad-cell, .wish-item').forEach(function(el){ el.classList.remove('drag-over'); });
+      });
+      item.addEventListener('dragover', function(e) {
+        e.preventDefault();
+        e.dataTransfer.dropEffect = 'move';
+        this.classList.add('drag-over');
+      });
+      item.addEventListener('dragleave', function() {
+        this.classList.remove('drag-over');
+      });
+      item.addEventListener('drop', function(e) {
+        e.preventDefault();
+        e.stopPropagation();
+        this.classList.remove('drag-over');
+        var targetId = parseInt(this.dataset.id);
+        var targetQuadrant = this.dataset.quadrant;
+        if (dragSourceId === targetId) return;
+
+        var fromIdx = -1, toIdx = -1;
+        for (var j = 0; j < wishes.length; j++) {
+          if (wishes[j].id === dragSourceId) fromIdx = j;
+          if (wishes[j].id === targetId) toIdx = j;
+        }
+        if (fromIdx >= 0 && toIdx >= 0) {
+          var moved = wishes.splice(fromIdx, 1)[0];
+          wishes.splice(toIdx, 0, moved);
+          // 更新象限
+          if (dragSourceQuadrant !== targetQuadrant) {
+            moved.quadrant = targetQuadrant;
+            fetch('/api/wishes/' + moved.id, {
+              method: 'PUT',
+              headers: {'Content-Type': 'application/json'},
+              body: JSON.stringify({quadrant: targetQuadrant})
+            }).catch(function(){ showToast('保存失败', 'error'); });
+          }
+          renderWishes();
+          saveWishOrder();
+        }
+      });
+    });
+
+    // 象限空区域接受 drop
+    document.querySelectorAll('.quad-cell').forEach(function(cell) {
+      cell.addEventListener('dragover', function(e) {
+        if (this.querySelector('.wish-item')) return; // 有内容时让 item 处理
+        e.preventDefault();
+        this.classList.add('drag-over');
+      });
+      cell.addEventListener('dragleave', function() { this.classList.remove('drag-over'); });
+      cell.addEventListener('drop', function(e) {
+        this.classList.remove('drag-over');
+        if (this.querySelector('.wish-item')) return; // 已由 item 处理
+        e.preventDefault();
+        var q = this.dataset.quadrant;
+        var moved = wishes.find(function(w){ return w.id === dragSourceId; });
+        if (moved) {
+          moved.quadrant = q;
+          fetch('/api/wishes/' + moved.id, {
+            method: 'PUT',
+            headers: {'Content-Type': 'application/json'},
+            body: JSON.stringify({quadrant: q})
+          }).catch(function(){ showToast('保存失败', 'error'); });
+          renderWishes();
+        }
+      });
+    });
+  }
+
+  function saveWishOrder() {
+    var order = wishes.map(function(w){ return w.id; });
+    fetch('/api/wishes/reorder', {
+      method: 'PUT',
+      headers: {'Content-Type': 'application/json'},
+      body: JSON.stringify({order: order})
+    });
+  }
+
+  /* ── CRUD ── */
+
+  window.showWishForm = function() {
+    var form = document.getElementById('wish-form');
+    if (form) form.style.display = 'block';
+  };
+
+  window.hideWishForm = function() {
+    var form = document.getElementById('wish-form');
+    if (form) form.style.display = 'none';
+    document.getElementById('wish-name').value = '';
+    document.getElementById('wish-deadline').value = '';
+    var sel = document.getElementById('wish-quadrant');
+    if (sel) sel.value = '重要不紧急';
+  };
+
+  window.addWish = function() {
+    var name = document.getElementById('wish-name').value.trim();
+    if (!name) { showToast('请输入心愿名称', 'error'); return; }
+    var quadrant = document.getElementById('wish-quadrant').value;
+    var deadline = document.getElementById('wish-deadline').value;
+    fetch('/api/wishes', {
+      method: 'POST',
+      headers: {'Content-Type': 'application/json'},
+      body: JSON.stringify({name: name, quadrant: quadrant, deadline: deadline})
+    }).then(function(r){ return r.json(); })
+      .then(function(res){
+        if (!res.ok) { showToast(res.error, 'error'); return; }
+        hideWishForm();
+        wishes.push({id: res.id, name: name, quadrant: quadrant, deadline: deadline, done: 0});
+        renderWishes();
+      });
+  };
+
+  window.toggleWish = function(id, done) {
+    fetch('/api/wishes/' + id, {
+      method: 'PUT',
+      headers: {'Content-Type': 'application/json'},
+      body: JSON.stringify({done: done ? 1 : 0})
+    });
+    var w = wishes.find(function(x){ return x.id === id; });
+    if (w) w.done = done ? 1 : 0;
+    renderWishes();
+  };
+
+  window.deleteWishItem = function(id) {
+    fetch('/api/wishes/' + id, {method: 'DELETE'});
+    wishes = wishes.filter(function(w){ return w.id !== id; });
+    renderWishes();
+  };
+
+  window.toggleWishesEdit = function(btn) {
+    var panel = document.getElementById('panel-wishes');
+    if (!panel) return;
+    var editing = panel.classList.toggle('editing');
+    btn.classList.toggle('active', editing);
+  };
+
+  window.renderWishes = renderWishes;
+
   /* ================================================================
      Init
      ================================================================ */

static/style.css

@@ -535,6 +535,26 @@ body {
   color: var(--primary);
 }
 
+/* 日历同步按钮 */
+.btn-cal-sync {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 28px;
+  height: 28px;
+  border: none;
+  background: transparent;
+  color: var(--text-muted);
+  border-radius: 6px;
+  cursor: pointer;
+  transition: all 0.2s;
+  flex-shrink: 0;
+}
+.btn-cal-sync:hover {
+  background: var(--success-light);
+  color: var(--success);
+}
+
 /* 编辑模式下才显示的元素 */
 .edit-only { display: none; }
 .card.editing .edit-only { display: flex; }
@@ -615,9 +635,13 @@ body {
 .btn-del:hover { background: var(--danger-light); }
 .btn-del .icon-sm { width: 16px; height: 16px; }
 
-/* 责善改过 横排双输入 */
+/* 责善改过 — 简洁分割线风格 */
 
 .evening-row {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
   padding: 0 0 12px;
   margin-bottom: 12px;
   border-bottom: 1px solid var(--border);
@@ -626,42 +650,17 @@ body {
 .evening-row:last-child {
   border-bottom: none;
   margin-bottom: 0;
+  padding-bottom: 0;
 }
 
-.evening-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-bottom: 8px;
+.evening-row .btn-del {
+  position: absolute;
+  top: 0;
+  right: 0;
+  z-index: 1;
 }
 
-.evening-header .idx {
-  font-size: 12px;
-  color: var(--text-muted);
-  font-weight: 600;
-}
-
-.mistake-row {
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-  align-items: stretch;
-}
-
-.mistake-row .col {
-  display: flex;
-  flex-direction: column;
-  gap: 4px;
-}
-
-.mistake-row .col label {
-  font-size: 11px;
-  color: var(--text-muted);
-  font-weight: 500;
-  padding-left: 2px;
-}
-
-.mistake-row input[type="text"] {
+.evening-row input[type="text"] {
   width: 100%;
   padding: 9px 12px;
   border: 1.5px solid var(--border);
@@ -671,8 +670,10 @@ body {
   color: var(--text);
   background: var(--bg);
   transition: border-color 0.2s, background 0.2s;
+  box-sizing: border-box;
 }
-.mistake-row input[type="text"]:focus {
+
+.evening-row input[type="text"]:focus {
   outline: none;
   border-color: var(--primary);
   background: var(--card);
@@ -1080,6 +1081,304 @@ body {
 .toast.error   { background: var(--danger);   color: #FFF; }
 .toast.info    { background: var(--primary);  color: #FFF; }
 
+/* ═══════════════════════════════════════════
+   Sync Modal
+   ═══════════════════════════════════════════ */
+
+.sync-modal-overlay {
+  position: fixed;
+  inset: 0;
+  background: rgba(0,0,0,0.4);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 9998;
+  backdrop-filter: blur(2px);
+}
+.sync-modal {
+  background: var(--card);
+  border-radius: var(--radius);
+  width: 90%;
+  max-width: 560px;
+  max-height: 80vh;
+  display: flex;
+  flex-direction: column;
+  box-shadow: 0 8px 40px rgba(0,0,0,0.15);
+  overflow: hidden;
+}
+.sync-modal-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 16px 20px;
+  border-bottom: 1px solid var(--border);
+  flex-shrink: 0;
+}
+.sync-modal-header h3 {
+  font-size: 16px;
+  font-weight: 700;
+  margin: 0;
+}
+.sync-modal-close {
+  background: none;
+  border: none;
+  font-size: 22px;
+  color: var(--text-muted);
+  cursor: pointer;
+  padding: 0 4px;
+  line-height: 1;
+}
+.sync-modal-loading {
+  padding: 40px 20px;
+  text-align: center;
+  color: var(--text-dim);
+  font-size: 14px;
+}
+.sync-spinner {
+  width: 36px;
+  height: 36px;
+  border: 3px solid var(--border);
+  border-top-color: var(--primary);
+  border-radius: 50%;
+  animation: spin 0.8s linear infinite;
+  margin: 0 auto 14px;
+}
+@keyframes spin { to { transform: rotate(360deg); } }
+.sync-modal-results {
+  padding: 16px 20px;
+  overflow-y: auto;
+  flex: 1;
+}
+.sync-summary {
+  font-size: 14px;
+  color: var(--text);
+  margin-bottom: 14px;
+  padding: 10px 14px;
+  background: var(--primary-light);
+  border-radius: var(--radius-sm);
+}
+.sync-list {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+}
+.sync-day {
+  border: 1px solid var(--border);
+  border-radius: var(--radius-sm);
+  overflow: hidden;
+}
+.sync-day-header {
+  background: var(--bg);
+  padding: 6px 12px;
+  font-size: 12px;
+  font-weight: 600;
+  color: var(--text-dim);
+  border-bottom: 1px solid var(--border);
+}
+.sync-event {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 8px 12px;
+  font-size: 13px;
+  color: var(--text);
+}
+.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-modal-footer {
+  padding: 12px 20px;
+  border-top: 1px solid var(--border);
+  display: flex;
+  justify-content: flex-end;
+  flex-shrink: 0;
+}
+.sync-modal-footer .btn-wish-save {
+  width: auto;
+  padding: 8px 24px;
+}
+
+/* ═══════════════════════════════════════════
+   Wishes — 四象限
+   ═══════════════════════════════════════════ */
+
+#panel-wishes.editing .edit-only { display: inline-flex; }
+#panel-wishes.editing .wish-del { display: inline-flex; }
+
+.wish-form {
+  background: var(--bg);
+  border-radius: var(--radius-sm);
+  padding: 10px 12px;
+  margin-bottom: 12px;
+  max-width: 480px;
+}
+.wish-form input[type="text"],
+.wish-form input[type="date"],
+.wish-form select {
+  width: 100%;
+  padding: 8px 10px;
+  border: 1.5px solid var(--border);
+  border-radius: var(--radius-sm);
+  font-size: 13px;
+  font-family: inherit;
+  color: var(--text);
+  margin-bottom: 8px;
+  box-sizing: border-box;
+  background: var(--card);
+}
+.wish-form input:focus, .wish-form select:focus {
+  outline: none;
+  border-color: var(--primary);
+  box-shadow: 0 0 0 3px rgba(74,108,247,0.08);
+}
+.wish-form-row { display: flex; gap: 8px; }
+.wish-form-row select, .wish-form-row input { flex: 1; }
+.wish-form-actions { display: flex; gap: 8px; }
+.btn-wish-save {
+  flex: 1; padding: 8px; border: none; background: var(--primary); color: #FFF;
+  border-radius: var(--radius-sm); font-size: 13px; font-weight: 500;
+  cursor: pointer; font-family: inherit;
+}
+.btn-wish-save:hover { background: var(--primary-dark); }
+.btn-wish-cancel {
+  flex: 1; padding: 8px; border: 1.5px solid var(--border); background: var(--card);
+  color: var(--text-dim); border-radius: var(--radius-sm); font-size: 13px;
+  cursor: pointer; font-family: inherit;
+}
+
+/* 四象限网格 */
+.quad-grid {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  grid-template-rows: 1fr 1fr;
+  gap: 12px;
+  min-height: 400px;
+}
+
+.quad-cell {
+  background: var(--card);
+  border: 1.5px solid var(--border);
+  border-radius: var(--radius);
+  padding: 12px 14px;
+  display: flex;
+  flex-direction: column;
+  min-height: 180px;
+  transition: border-color 0.2s, box-shadow 0.2s;
+}
+.quad-cell.drag-over {
+  border-color: var(--primary);
+  box-shadow: 0 0 0 3px rgba(74,108,247,0.10);
+  background: var(--primary-light);
+}
+
+.quad-title {
+  font-size: 13px;
+  font-weight: 600;
+  color: var(--text);
+  margin-bottom: 10px;
+  padding-bottom: 8px;
+  border-bottom: 1px solid var(--border);
+  flex-shrink: 0;
+}
+
+.quad-list {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  min-height: 40px;
+}
+
+.wish-item {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 7px 10px;
+  border-radius: var(--radius-sm);
+  background: var(--bg);
+  transition: opacity 0.15s, box-shadow 0.15s;
+}
+.wish-item:hover { box-shadow: 0 1px 3px rgba(0,0,0,0.06); }
+.wish-item.dragging { opacity: 0.3; }
+.wish-item.drag-over {
+  box-shadow: inset 0 0 0 2px var(--primary);
+  background: var(--card);
+}
+
+.wish-drag-handle {
+  color: var(--text-muted); cursor: grab; flex-shrink: 0;
+  display: flex; align-items: center;
+}
+.wish-drag-handle:active { cursor: grabbing; }
+
+.wish-check {
+  width: 15px; height: 15px; accent-color: var(--success);
+  flex-shrink: 0; cursor: pointer;
+}
+
+.wish-name {
+  flex: 1; font-size: 13px; color: var(--text); min-width: 0;
+  overflow: hidden; text-overflow: ellipsis; white-space: nowrap;
+}
+.wish-item.done .wish-name { text-decoration: line-through; color: var(--text-muted); }
+
+.wish-deadline {
+  font-size: 11px; color: var(--text-dim); white-space: nowrap; flex-shrink: 0;
+}
+
+.wish-del { display: none; }
+.wish-del .icon-xs { width: 13px; height: 13px; }
+
+/* 内联编辑 */
+.wish-item.editing {
+  background: var(--card);
+  padding: 8px 10px;
+  flex-wrap: wrap;
+}
+.wish-edit-form {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+}
+.wish-edit-form input[type="text"],
+.wish-edit-form input[type="date"],
+.wish-edit-form select {
+  width: 100%;
+  padding: 6px 8px;
+  border: 1.5px solid var(--border);
+  border-radius: var(--radius-sm);
+  font-size: 12px;
+  font-family: inherit;
+  color: var(--text);
+  background: var(--card);
+  box-sizing: border-box;
+}
+.wish-edit-form input:focus,
+.wish-edit-form select:focus {
+  outline: none;
+  border-color: var(--primary);
+  box-shadow: 0 0 0 2px rgba(74,108,247,0.08);
+}
+.wish-edit-name { font-weight: 500; }
+.wish-edit-row { display: flex; gap: 6px; }
+.wish-edit-row select,
+.wish-edit-row input { flex: 1; }
+.wish-edit-actions { display: flex; gap: 6px; }
+.wish-edit-actions .btn-wish-save,
+.wish-edit-actions .btn-wish-cancel {
+  flex: 1; padding: 6px; font-size: 12px;
+}
+
+.wishes-empty {
+  font-size: 13px; color: var(--text-muted); text-align: center; padding: 32px 0;
+}
+
+@media (max-width: 900px) {
+  .quad-grid { grid-template-columns: 1fr; grid-template-rows: auto; }
+}
+
 /* ═══════════════════════════════════════════
    SVG icons helpers
    ═══════════════════════════════════════════ */

templates/icons.html

@@ -67,4 +67,8 @@
   <symbol id="icon-pencil" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">
     <path d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L6.832 19.82a4.5 4.5 0 0 1-1.897 1.13l-2.685.8.8-2.685a4.5 4.5 0 0 1 1.13-1.897L16.863 4.487Zm0 0L19.5 7.125"/>
   </symbol>
+  <!-- 星星 -->
+  <symbol id="icon-star" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">
+    <path d="M11.48 3.499a.562.562 0 0 1 1.04 0l2.125 5.111a.563.563 0 0 0 .475.345l5.518.442c.499.04.701.663.321.988l-4.204 3.602a.563.563 0 0 0-.182.557l1.285 5.385a.562.562 0 0 1-.84.61l-4.725-2.885a.563.563 0 0 0-.586 0L6.982 20.54a.562.562 0 0 1-.84-.61l1.285-5.386a.562.562 0 0 0-.182-.557l-4.204-3.602a.563.563 0 0 1 .321-.988l5.518-.442a.563.563 0 0 0 .475-.345L11.48 3.5Z"/>
+  </symbol>
 </svg>

templates/index.html

@@ -6,12 +6,34 @@
 <title>紫微 · 磁场管理</title>
 <link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}">
 <script>window.__INITIAL_STATS__ = {{ initial_stats | safe }};</script>
+<script>window.__INITIAL_WISHES__ = {{ initial_wishes | safe }};</script>
 </head>
 <body>
 {% include "icons.html" %}
 
 <div id="toast" class="toast"></div>
 
+<!-- 日历同步弹窗 -->
+<div class="sync-modal-overlay" id="sync-modal-overlay" style="display:none">
+  <div class="sync-modal">
+    <div class="sync-modal-header">
+      <h3>📅 日历同步</h3>
+      <button class="sync-modal-close" onclick="closeSyncModal()">&times;</button>
+    </div>
+    <div class="sync-modal-loading" id="sync-loading">
+      <div class="sync-spinner"></div>
+      <p>正在从钉钉同步过去15天~未来15天日程…</p>
+    </div>
+    <div class="sync-modal-results" id="sync-results" style="display:none">
+      <div class="sync-summary" id="sync-summary"></div>
+      <div class="sync-list" id="sync-list"></div>
+    </div>
+    <div class="sync-modal-footer">
+      <button class="btn-wish-save" onclick="closeSyncModal()">关闭</button>
+    </div>
+  </div>
+</div>
+
 <div class="app-layout">
 
   <!-- ═══ 左侧边栏 ═══ -->
@@ -77,6 +99,10 @@
         <svg class="icon-sm"><use href="#icon-chart-bar"/></svg>
         每周评分
       </a>
+      <a class="nav-item" data-panel="wishes" onclick="switchPanel('wishes')">
+        <svg class="icon-sm"><use href="#icon-star"/></svg>
+        心愿清单
+      </a>
       <a class="nav-item" data-panel="history" onclick="switchPanel('history')">
         <svg class="icon-sm"><use href="#icon-list-bullet"/></svg>
         历史记录
@@ -108,6 +134,9 @@
               <svg class="icon-h2"><use href="#icon-sun"/></svg>
               <h3>早间立志</h3>
             </div>
+            <button class="btn-cal-sync" onclick="syncCalendar()" title="同步钉钉日历">
+              <svg class="icon-sm"><use href="#icon-calendar"/></svg>
+            </button>
             <button class="btn-edit-toggle" onclick="toggleEditMode(this)" title="编辑">
               <svg class="icon-sm"><use href="#icon-pencil"/></svg>
             </button>
@@ -188,6 +217,56 @@
       <div id="history-grid" class="history-grid"></div>
     </section>
 
+    <!-- ── 心愿清单面板 ── -->
+    <section class="panel" id="panel-wishes">
+      <div class="panel-header">
+        <h2>心愿清单</h2>
+        <button class="btn-edit-toggle" id="wishes-edit-toggle" onclick="toggleWishesEdit(this)" title="编辑">
+          <svg class="icon-sm"><use href="#icon-pencil"/></svg>
+        </button>
+      </div>
+      <!-- 新增表单 -->
+      <div class="wish-form" id="wish-form" style="display:none">
+        <input type="text" id="wish-name" placeholder="心愿名称…" maxlength="50">
+        <div class="wish-form-row">
+          <select id="wish-quadrant">
+            <option value="重要紧急">重要紧急</option>
+            <option value="重要不紧急" selected>重要不紧急</option>
+            <option value="紧急不重要">紧急不重要</option>
+            <option value="不紧急不重要">不紧急不重要</option>
+          </select>
+          <input type="date" id="wish-deadline">
+        </div>
+        <div class="wish-form-actions">
+          <button class="btn-wish-save" onclick="addWish()">添加</button>
+          <button class="btn-wish-cancel" onclick="hideWishForm()">取消</button>
+        </div>
+      </div>
+      <button class="btn-add edit-only" id="wishes-add-btn" onclick="showWishForm()" style="margin-bottom:16px">
+        <svg class="icon-sm"><use href="#icon-plus"/></svg> 新增心愿
+      </button>
+      <!-- 四象限网格 -->
+      <div class="quad-grid">
+        <div class="quad-cell" data-quadrant="重要紧急" id="quad-重要紧急">
+          <div class="quad-title">重要 & 紧急</div>
+          <div class="quad-list" id="quad-list-重要紧急"></div>
+        </div>
+        <div class="quad-cell" data-quadrant="重要不紧急" id="quad-重要不紧急">
+          <div class="quad-title">重要 & 不紧急</div>
+          <div class="quad-list" id="quad-list-重要不紧急"></div>
+        </div>
+        <div class="quad-cell" data-quadrant="紧急不重要" id="quad-紧急不重要">
+          <div class="quad-title">紧急 & 不重要</div>
+          <div class="quad-list" id="quad-list-紧急不重要"></div>
+        </div>
+        <div class="quad-cell" data-quadrant="不紧急不重要" id="quad-不紧急不重要">
+          <div class="quad-title">不紧急 & 不重要</div>
+          <div class="quad-list" id="quad-list-不紧急不重要"></div>
+        </div>
+      </div>
+      <div class="wishes-empty" id="wishes-empty" style="display:none">暂无心愿，点击上方按钮添加</div>
+    </section>
+
   </main>
 </div>