v2.1.3 — 周标签从W27改为第27周

static/app.js

@@ -6,7 +6,8 @@
      State
      ================================================================ */
   var calendarStatus = {};    // { "2026-W30": "pass", ... }
-  var calYear;               // 日历显示的年
+  var calYear;
+  var calMonth = new Date().getMonth(); // 月份索引 0-11
   var activePanel = 'daily';
   var weekOffset = 0;
   var lastSavedData = null;
@@ -145,45 +146,51 @@
     renderCalendar();
   };
 
-  /** 渲染周历（4周一行 + 月份分组） */
+  /** 切换月份 */
+  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 yearStart = new Date(calYear, 0, 1);
-    var yearEnd = new Date(calYear, 11, 31);
+    document.getElementById('cal-month-label').textContent = (calMonth + 1) + '月';
+
+    // 计算该月包含的周
+    var firstDay = new Date(calYear, calMonth, 1);
+    var lastDay = new Date(calYear, calMonth + 1, 0);
+    var monday = new Date(firstDay);
+    monday.setDate(monday.getDate() - monday.getDay() + (monday.getDay() === 0 ? -6 : 1));
     var weeks = [];
-    var d = new Date(yearStart);
-    d.setDate(d.getDate() - d.getDay() + (d.getDay() === 0 ? -6 : 1));
-    var lastMonth = -1;
-    var monthsList = ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec'];
-    while (d <= yearEnd) {
-      var wk = fmtWeek(d);
-      var mon = new Date(d);
-      var mIdx = mon.getMonth();
-      var isMonthStart = (mIdx !== lastMonth && mon.getDate() <= 7);
-      weeks.push({ wk: wk, monthLabel: isMonthStart ? monthsList[mIdx] : '' });
-      lastMonth = mIdx;
-      d.setDate(d.getDate() + 7);
+    while (monday <= lastDay) {
+      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 el = document.getElementById('cal-week-list');
-    var html = '';
-    for (var i = 0; i < weeks.length; i++) {
-      var we = weeks[i];
-      var w = we.wk;
+    var wHtml = '';
+    for (var i2 = 0; i2 < weeks.length; i2++) {
+      var w = weeks[i2];
       var cls = 'cal-week-cell';
       var status = calendarStatus[w];
       if (status) cls += ' ' + status;
       if (w === todayWk) cls += ' today';
       if (w === selectedWeek) cls += ' selected';
-      if (we.monthLabel) cls += ' month-start';
-      var wkNum = w.split('-W')[1].replace(/^0/, '');
-      html += '<div class="' + cls + '" data-week="' + w + '" data-month="' + we.monthLabel + '" title="' + w + '">' +
-        '<span class="wk-num">W' + wkNum + '</span>' +
-        '<span class="wk-dot"></span>' +
-      '</div>';
+      wHtml += '<div class="' + cls + '" data-week="' + w + '" title="' + w + '">' +
+        '第' + w.split('-W')[1].replace(/^0/, '') + '周</div>';
     }
-    el.innerHTML = html;
-    el.querySelectorAll('.cal-week-cell').forEach(function(cell) {
+    var we = document.getElementById('cal-weeks');
+    we.innerHTML = wHtml;
+    we.querySelectorAll('.cal-week-cell').forEach(function(cell) {
       cell.addEventListener('click', function() {
         var wk = this.dataset.week;
         if (wk) navigateToWeek(wk);
@@ -200,10 +207,11 @@
   }
 
   window.goToCurrentWeek = function() {
-    var now = fmtWeek(new Date());
-    calYear = new Date().getFullYear();
+    var now = new Date();
+    calYear = now.getFullYear();
+    calMonth = now.getMonth();
     renderCalendar();
-    navigateToWeek(now);
+    navigateToWeek(fmtWeek(now));
   };
 
   /* ================================================================

static/style.css

@@ -18,7 +18,7 @@
   --radius-sm: 8px;
   --shadow: 0 1px 2px rgba(0,0,0,0.04), 0 2px 8px rgba(74,108,247,0.05);
   --shadow-hover: 0 2px 6px rgba(0,0,0,0.04), 0 6px 18px rgba(74,108,247,0.08);
-  --sidebar-w: 280px;
+  --sidebar-w: 100px;
 }
 
 * { margin:0; padding:0; box-sizing:border-box; }
@@ -66,14 +66,29 @@ body {
 
 .sidebar-user {
   display: flex;
+  flex-direction: column;
   align-items: center;
-  gap: 12px;
-  padding: 20px 20px 16px;
+  gap: 8px;
+  padding: 24px 12px 16px;
+  position: relative;
+}
+
+.sidebar-user .user-name {
+  font-size: 12px;
+  text-align: center;
+}
+
+.sidebar-user .btn-logout-icon {
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  width: 22px;
+  height: 22px;
 }
 
 .user-avatar {
-  width: 38px;
-  height: 38px;
+  width: 44px;
+  height: 44px;
   border-radius: 50%;
   background: var(--primary);
   color: #FFF;
@@ -131,6 +146,10 @@ body {
   gap: 8px;
   padding: 0 20px 20px;
 }
+.daily-sidebar .sidebar-stats {
+  padding: 0;
+  margin-bottom: 16px;
+}
 
 .stat-item {
   background: var(--bg);
@@ -162,6 +181,73 @@ body {
 .calendar-widget {
   padding: 0 16px 12px;
 }
+.calendar-widget.inline {
+  margin: 0 0 16px;
+  padding: 12px 0;
+  border: 1.5px solid var(--border);
+  border-radius: var(--radius);
+  background: var(--card);
+}
+.calendar-widget.inline .cal-header {
+  padding: 0 14px 8px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.cal-nav-group { display: flex; gap: 4px; }
+.cal-nav {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 28px;
+  height: 28px;
+  border: 1px solid var(--border);
+  border-radius: 6px;
+  background: var(--card);
+  cursor: pointer;
+  color: var(--text-dim);
+}
+.cal-nav:hover { background: var(--bg); color: var(--text); }
+/* 月份翻页行 */
+.cal-month-header {
+  padding: 4px 14px 8px;
+}
+.cal-month-header .cal-month-label {
+  font-size: 14px;
+  font-weight: 600;
+  color: var(--text);
+}
+
+/* 周选择 */
+.cal-weeks {
+  display: grid;
+  grid-template-columns: repeat(2, 1fr);
+  gap: 8px;
+  padding: 8px 14px 10px;
+}
+.cal-week-cell {
+  height: 42px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 13px;
+  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);
+}
+.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-week-list { display: none; }
+.cal-week-cell .wk-num, .cal-week-cell .wk-dot { display: none; }
 
 .cal-header {
   display: flex;
@@ -359,34 +445,45 @@ body {
 
 .nav-item {
   display: flex;
+  flex-direction: column;
   align-items: center;
-  gap: 10px;
-  padding: 10px 14px;
-  border-radius: var(--radius-sm);
-  font-size: 13px;
+  gap: 4px;
+  padding: 10px 4px;
+  border-radius: var(--radius);
+  font-size: 11px;
   font-weight: 500;
   color: var(--text-dim);
   cursor: pointer;
   text-decoration: none;
   transition: all 0.15s;
+  margin-bottom: 4px;
+  text-align: center;
 }
 
+.nav-label { line-height: 1.2; }
+
 .nav-item:hover {
   background: var(--bg);
   color: var(--text);
 }
 
+.nav-item .icon-md {
+  flex-shrink: 0;
+  width: 22px;
+  height: 22px;
+  color: var(--text-muted);
+  transition: color 0.15s;
+}
+.nav-item:hover .icon-md { color: var(--primary); }
+
 .nav-item.active {
   background: var(--primary-light);
   color: var(--primary);
   font-weight: 600;
 }
+.nav-item.active .icon-md { color: var(--primary); }
 
-.nav-item .icon-sm {
-  flex-shrink: 0;
-  width: 16px;
-  height: 16px;
-}
+.icon-md { width: 20px; height: 20px; flex-shrink: 0; }
 
 /* ── Sidebar Footer ── */
 
@@ -479,27 +576,61 @@ body {
 }
 
 /* ═══════════════════════════════════════════
-   Daily Grid — 三栏
+   Daily Panel — 左右两栏布局
    ═══════════════════════════════════════════ */
 
-.daily-grid {
-  display: block;
+.daily-layout {
+  display: flex;
+  gap: 24px;
+  align-items: stretch;
+}
+
+/* 左侧栏 */
+.daily-sidebar {
+  width: 200px;
+  flex-shrink: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 0;
+}
+
+.daily-sidebar .sidebar-stats {
+  padding: 0;
+  margin-bottom: 16px;
+}
+
+.daily-sidebar .stat-item {
+  background: var(--card);
+  border: 1px solid var(--border);
+}
+
+.daily-sidebar .calendar-widget.inline {
+  margin: 0;
+  padding: 14px;
+  border: 1px solid var(--border);
+  border-radius: var(--radius);
+  background: var(--card);
+}
+
+/* 右侧主区 */
+.daily-main {
+  flex: 1;
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
 }
-.card.daily-card { display: none; }
-.card.daily-card.active { display: flex; }
 
-/* 每周打卡 Tab */
 .daily-tabs {
   display: flex;
-  gap: 4px;
-  margin-bottom: 16px;
+  gap: 0;
   border-bottom: 1.5px solid var(--border);
 }
 .daily-tab {
   display: inline-flex;
   align-items: center;
-  gap: 5px;
-  padding: 8px 16px;
+  gap: 6px;
+  padding: 8px 18px;
   border: none;
   background: none;
   font-size: 13px;
@@ -511,10 +642,12 @@ body {
   transition: all 0.15s;
   font-family: inherit;
 }
-.daily-tab .icon-sm { opacity: 0.6; }
 .daily-tab:hover { color: var(--text); }
 .daily-tab.active { color: var(--primary); border-bottom-color: var(--primary); }
-.daily-tab.active .icon-sm { opacity: 1; }
+
+.daily-grid { display: block; }
+.card.daily-card { display: none; }
+.card.daily-card.active { display: flex; }
 
 /* ── Cards ── */
 
@@ -1437,7 +1570,6 @@ body {
    ═══════════════════════════════════════════ */
 
 @media (max-width: 900px) {
-  .sidebar { width: 240px; min-width: 240px; }
   :root { --sidebar-w: 240px; }
   .main-content { padding: 20px 24px; }
   .daily-grid { grid-template-columns: 1fr; }

templates/index.html

@@ -42,81 +42,35 @@
     <!-- 用户信息 -->
     <div class="sidebar-user">
       <div class="user-avatar">{{ username[0] }}</div>
-      <div class="user-info">
-        <span class="user-name">{{ username }}</span>
-        <span class="user-tag">道阁 · 紫微</span>
-      </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>
 
-    <!-- 统计信息 -->
-    <div class="sidebar-stats" id="sidebar-stats">
-      <div class="stat-item">
-        <span class="stat-num" id="stat-days">--</span>
-        <span class="stat-label">打卡周</span>
-      </div>
-      <div class="stat-item">
-        <span class="stat-num" id="stat-morning">--</span>
-        <span class="stat-label">立志</span>
-      </div>
-      <div class="stat-item">
-        <span class="stat-num" id="stat-study">--</span>
-        <span class="stat-label">勤学</span>
-      </div>
-    </div>
-
-    <!-- 日历（周视图） -->
-    <div class="calendar-widget">
-      <div class="cal-header">
-        <button class="cal-nav" onclick="changeCalYear(-1)">
-          <svg class="icon-sm"><use href="#icon-chevron-left"/></svg>
-        </button>
-        <span class="cal-month-label" id="cal-year-label">2026年</span>
-        <button class="cal-nav" onclick="changeCalYear(1)">
-          <svg class="icon-sm"><use href="#icon-chevron-right"/></svg>
-        </button>
-      </div>
-      <div class="cal-week-list" id="cal-week-list"></div>
-      <div class="cal-legend">
-        <span class="legend-dot pass"></span> 达标
-        <span class="legend-dot fail"></span> 未达标
-        <span class="legend-dot empty"></span> 未打卡
-      </div>
-    </div>
-
     <!-- 功能入口 -->
     <nav class="sidebar-nav">
       <a class="nav-item active" data-panel="daily" onclick="switchPanel('daily')">
-        <svg class="icon-sm"><use href="#icon-calendar"/></svg>
-        每周打卡
+        <svg class="icon-md"><use href="#icon-calendar"/></svg>
+        <span class="nav-label">打卡</span>
       </a>
       <a class="nav-item" data-panel="weekly" onclick="switchPanel('weekly')">
-        <svg class="icon-sm"><use href="#icon-chart-bar"/></svg>
-        每周评分
+        <svg class="icon-md"><use href="#icon-chart-bar"/></svg>
+        <span class="nav-label">评分</span>
       </a>
       <a class="nav-item" data-panel="wishes" onclick="switchPanel('wishes')">
-        <svg class="icon-sm"><use href="#icon-star"/></svg>
-        心愿清单
+        <svg class="icon-md"><use href="#icon-star"/></svg>
+        <span class="nav-label">心愿</span>
       </a>
       <a class="nav-item" data-panel="history" onclick="switchPanel('history')">
-        <svg class="icon-sm"><use href="#icon-list-bullet"/></svg>
-        历史记录
+        <svg class="icon-md"><use href="#icon-list-bullet"/></svg>
+        <span class="nav-label">记录</span>
       </a>
       <a class="nav-item" data-panel="blueprint" onclick="switchPanel('blueprint')">
-        <svg class="icon-sm"><use href="#icon-sun"/></svg>
-        人生蓝图
+        <svg class="icon-md"><use href="#icon-sun"/></svg>
+        <span class="nav-label">蓝图</span>
       </a>
     </nav>
-
-    <!-- 底部新建按钮 -->
-    <div class="sidebar-footer">
-      <button class="btn-new-day" onclick="goToCurrentWeek()">
-        <svg class="icon-sm"><use href="#icon-sun"/></svg>
-        回到本周
-      </button>
-    </div>
   </aside>
 
   <!-- ═══ 右侧主内容区 ═══ -->
@@ -133,18 +87,59 @@
           </button>
         </div>
       </div>
-      <div class="daily-tabs">
-        <button class="daily-tab active" data-tab="morning" onclick="switchDailyTab(this)">
-          <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> 责善改过
-        </button>
-        <button class="daily-tab" data-tab="study" onclick="switchDailyTab(this)">
-          <svg class="icon-sm"><use href="#icon-book-open"/></svg> 勤学打卡
-        </button>
-      </div>
-      <div class="daily-grid">
+      <div class="daily-layout">
+        <!-- 左侧：统计 + 日历 -->
+        <div class="daily-sidebar">
+          <div class="sidebar-stats" id="sidebar-stats">
+            <div class="stat-item">
+              <span class="stat-num" id="stat-days">--</span>
+              <span class="stat-label">打卡周</span>
+            </div>
+            <div class="stat-item">
+              <span class="stat-num" id="stat-morning">--</span>
+              <span class="stat-label">立志</span>
+            </div>
+            <div class="stat-item">
+              <span class="stat-num" id="stat-study">--</span>
+              <span class="stat-label">勤学</span>
+            </div>
+          </div>
+          <div class="calendar-widget inline">
+            <div class="cal-header">
+              <button class="cal-nav" onclick="changeCalYear(-1)">
+                <svg class="icon-sm"><use href="#icon-chevron-left"/></svg>
+              </button>
+              <span class="cal-month-label" id="cal-year-label">2026年</span>
+              <button class="cal-nav" onclick="changeCalYear(1)">
+                <svg class="icon-sm"><use href="#icon-chevron-right"/></svg>
+              </button>
+            </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-weeks" 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> 早间立志
+            </button>
+            <button class="daily-tab" data-tab="evening" onclick="switchDailyTab(this)">
+              <svg class="icon-sm"><use href="#icon-magnifying-glass"/></svg> 责善改过
+            </button>
+            <button class="daily-tab" data-tab="study" onclick="switchDailyTab(this)">
+              <svg class="icon-sm"><use href="#icon-book-open"/></svg> 勤学打卡
+            </button>
+          </div>
+          <div class="daily-grid">
         <div class="card card-morning daily-card active" data-card="morning">
           <div class="card-head">
             <div class="card-head-left">
@@ -186,6 +181,8 @@
           <div id="study-list"></div>
         </div>
       </div>
+        </div><!-- /daily-main -->
+      </div><!-- /daily-layout -->
     </section>
 
     <!-- ── 每周评分面板 ── -->