ci(v1.11.5-L): lite 分支纳入构建流水线

- .gitea/workflows/build.yml 的 on.push.branches 增加 lite
- 推送到 lite 会触发 vet → test → 交叉编译 windows/linux → 上传产物
- 其余触发条件不变（main/master、v* 标签、PR、手动执行）

.gitea/workflows/build.yml

@@ -1,9 +1,9 @@
 name: build
 
-# 触发：主干推送、版本标签、PR、手动执行
+# 触发：主干与 lite 分支推送、版本标签、PR、手动执行
 on:
   push:
-    branches: [main, master]
+    branches: [main, master, lite]
     tags: ['v*']
   pull_request:
   workflow_dispatch:

README.md

@@ -1,7 +1,11 @@
-# 代打台 · 代打管理平台
+# 代打台-L · 代打管理平台（lite 版）
 
-一个给代打工作室用的单文件管理程序：**套餐 → 订阅 → 追加时长 → 日历打卡 → 大屏**。
+一个给代打工作室用的单文件管理程序：**套餐 → 订阅 → 追加时长 → 日历打卡**。
-整个程序就是一个 `daili.exe` + 一个 `daili.ini`，数据存在同目录的 `daili.db` 里，局域网内手机、电视都能打开。
+整个程序就是一个 `daili.exe` + 一个 `daili.ini`，数据存在同目录的 `daili.db` 里，局域网内手机、电视都能打开。界面支持亮色 / 暗色切换，默认跟随系统。
+
+> **这是 lite 分支**：只保留「按日（包时）」一种套餐，去掉了大屏、客户自助查询、多管理员、触摸小键盘。
+> 版本号统一带 `-L` 后缀（当前 `1.11.5-L`），界面品牌为「代打台-L」，页脚署名 `Powered by Baka春秋`。
+> 与 `main` 分支的差异见文末「[10. 与 main 分支的差异](#10-与-main-分支的差异)」。
 
 ---
 
@@ -12,20 +16,18 @@
    - 首次运行会自动生成配置文件 `daili.ini`；
    - 弹出一个黑色窗口，打印访问地址（默认 **17777** 端口）；
    - 默认会自动打开浏览器；
-3. 浏览器打开 `http://127.0.0.1:17777` → 第一次会让你**创建管理员账号**；
+3. 浏览器打开 `http://127.0.0.1:17777` → 第一次会让你**创建管理员账号**（这是唯一的账号，之后不能再添加）；
 4. 之后按「套餐 → 客户 → 订阅」的顺序录入即可。
 
 ```
   ┌───────────────────────────────────────────────┐
-  │            代 打 台 · 代打管理平台             │
+  │        代 打 台 - L · 代打管理平台            │
   └───────────────────────────────────────────────┘
-   版本 1.1.0   配置文件 daili.ini
+   版本 1.11.5-L   配置文件 daili.ini
    数据库 D:\代打台\daili.db
    访问地址：
      本机   http://127.0.0.1:17777
      局域网 http://192.168.1.23:17777
-     大屏   http://127.0.0.1:17777/screen（免登录）
-   注意：大屏免登录且监听所有网卡，同局域网内任何人都能打开 /screen
    按 Ctrl+C 停止服务
 ```
 
@@ -48,17 +50,19 @@
 | `backup_keep` | `14` | 备份保留份数（1–365），超出自动清理 |
 | `timezone` | 空 | 留空跟随系统；可固定 `Asia/Shanghai`。**影响所有“自然日”计算** |
 | `open_browser` | `true` | 启动后自动打开浏览器 |
-| `screen_public` | `true` | 大屏 `/screen` 免登录（投屏用）；改 `false` 则需登录 |
 | `log_enabled` | `true` | 运行日志写文件（控制台始终输出） |
 | `log_dir` | `logs` | 日志目录，按天切分 `daili-YYYY-MM-DD.log` |
 
+> `screen_public`（大屏）与 `portal_public`（客户自助）在 lite 版**已废弃**：仍然接受解析，但不起任何作用。
+> 保留它们只是为了让你从 `main` 升级时，旧 `daili.ini` 能直接启动，不会被「未知配置项」拦住。
+
 **行为约定**
 
 - 文件不存在 → 自动生成默认配置，照常启动；
 - 文件写错 → **报错退出并指出行号**，原文件不会被修改。例如：
 
 ```
-[代打台] 配置文件有问题，已停止启动：
+[代打台-L] 配置文件有问题，已停止启动：
 
 第 3 行: listen_port 必须在 1-65535 之间，当前是 99999
 修好后重新启动即可（原文件未被修改）
@@ -80,31 +84,31 @@
 
 示例：`daili.exe -addr 127.0.0.1:19000 -no-open`
 
-> 业务参数（到期预警天数、大屏刷新秒数）不在配置文件里，仍在网页「设置」中修改。
+> 业务参数（到期预警天数）不在配置文件里，仍在网页「设置」中修改。
 
 ---
 
 ## 3. 第一次使用（5 分钟走完）
 
 1. **建套餐**：`套餐 → 新增套餐`
-   - 「包月日常」按日 30 天，色签绿；
+   - 「包月日常」默认 30 天，色签绿；
-   - 「深渊十次」按次 10 次，色签紫。
+   - 只有「按日」一种计费方式：有开始日与结束日，每天一条待打任务。
    > 以后要加套餐 D/E/F，直接再加一行就行，**不会影响任何已有客户数据**。
 2. **建客户**：`客户 → 新建客户`，填手机尾号 + 客户名（这两项组合唯一）。
-3. **开通订阅**：进客户详情 → 选套餐、开始日、天数（按次则填次数）→ 开通订阅。
+3. **开通订阅**：进客户详情 → 选套餐、开始日、天数 → 开通订阅。
 4. **日常使用**：打开「日历」，今天那格里就是这个客户今天要打的单，点「完成」打卡。
 5. **续费**：客户转账后，点订阅上的「追加时长」→ 在日历上点新的终止日期 → 确认。
    面板会实时显示「计算起点 / 原结束日 / 新结束日 / 本次追加几天 / 追加后剩余几天」，并在客户页留下追加记录。
 
-> 想先看效果再录自己的数据？程序启动后运行 `powershell -ExecutionPolicy Bypass -File scripts\seed.ps1`，会写入 8 个演示客户和 4 个套餐（默认账号 `admin` / `daili123`）。
+> 想先看效果再录自己的数据？程序启动后运行 `powershell -ExecutionPolicy Bypass -File scripts\seed.ps1`，会写入演示客户与套餐（默认账号 `admin` / `daili123`）。
 
 ---
 
 ## 4. 业务规则（和 PRD 一致）
 
 **剩余时长**
-- 按日：`剩余天数 = 结束日 − 今天 + 1`，结束日当天仍算服务日；
+- `剩余天数 = 结束日 − 今天 + 1`，结束日当天仍算服务日；
-- 按次：`剩余次数 = 总次数 − 已用次数`；按次套餐的「有效期」可留空，留空就一直有效直到次数用完。
+- 没有次数、没有周期：一个订阅就是从开始日到结束日的一段连续服务期。
 
 **追加时长（核心）**
 - 打开追加面板，**在月历上点选新的终止日期**，系统自动反算；
@@ -114,21 +118,46 @@
 
 **暂停 / 恢复**
 - 暂停期间冻结剩余时长，日历上不出现待打任务；
-- 恢复时按日套餐的结束日**自动顺延**暂停的自然日天数，时间轴上是灰色斜纹段。
+- 恢复时结束日**自动顺延**暂停的自然日天数，时间轴上是灰色斜纹段。
 
 **打卡**
-- 按日套餐：每天一条「完成 / 跳过」，只做记录不扣天数（天数按自然日流逝）；
+- 每天一条「完成 / 跳过」，只做记录不扣天数（天数按自然日流逝）；
-- 按次套餐：打卡「完成」自动扣 1 次，撤销打卡返还 1 次；次数为 0 时不允许再打；
+- 撤销打卡会删掉这条记录，不影响结束日。
-- 按次套餐如果没设有效期，它不会出现在日历里 —— 直接在客户详情点订阅卡片上的「今日打卡」扣次。
 
 **预警**
-- 剩余 ≤3 天橙色、今天到期红色、已过期灰色；顶栏常驻「今日到期 / 3 天内」两个数字。
+- 剩余 ≤3 天橙色、今天到期红色、已过期灰色；顶栏常驻「今日到期 / 3 天内 / 7 天内」三个数字。
 
 **查询**
 - 顶栏搜索框输入手机尾号即可定位客户（也支持姓名、游戏名、联系方式），按 `/` 快速聚焦。
 
 ---
 
+## 4.1 工作台速用
+
+- **按尾号快速完成**：日历右侧「当日待完成」顶部输入手机尾号 → 回车。
+  - 只匹配到 1 项：直接完成并提示；
+  - 同一尾号有多个客户，或一个客户今天有多个服务：弹出勾选面板，默认全选，可多选后一次完成。
+- **加急**：每条任务右侧点「加急」，会加红色 `加急` 标签并排到最前；日历格子出现红点。再点一次取消。
+- **按套餐分日历**：套餐编辑页勾选「在日历中独立显示」后，工作台顶部会出现套餐标签（全部 / 每日任务 / …），可以只看某类委托的排单。
+- **日历格子**：只保留大字「已完成 / 总数」（如 1/2 = 2 单里做完 1 单）。
+- **按钮收纳**：任务行只露出「完成」，跳过 / 加急 / 追加收进「⋯」菜单，点空白处自动收起。
+- **停用客户**：客户详情页可「停用」（默认从列表与日历隐藏，订阅保留）或「彻底删除」（连订阅/打卡/追加记录一起删，需二次确认）；列表右上角可切换到「显示已停用」再恢复；
+- **7 天内到期**：顶栏徽标，固定统计未来 7 天内到期的订阅；
+- **抽屉时钟**：右侧当日面板顶部有时钟，24 小时制精确到秒，下面一行是当天日期；
+- **已完成折叠**：当日清单里已完成/已跳过的单子自动折叠成一行（尾号 + 姓名 + 套餐 + 状态），点这一行展开看剩余，以及撤销/加急/追加；未完成的行不受影响；
+- **主题**：顶栏右上角 ☾ / ☀ 切换亮 / 暗，偏好记在浏览器里；没选过时由页面在首屏按系统偏好自动决定。整套界面只认 `<html data-bs-theme>` 一个开关，不会出现「半亮半暗」。
+- **升级不缓存旧界面**：CSS/JS 链接带**内容指纹**（`app.css?v=<12 位哈希>`）。资源可以长缓存（一年、immutable），但样式或脚本一改、重新编译，URL 就会变，浏览器自动取新文件，不用手动清缓存；HTML 仍然 `no-store`。
+
+---
+
+## 4.2 套餐标签与批量开通
+
+- **套餐标签**：套餐编辑页可以填一个标签（如「包月」）。日历顶部页签会**按标签合并**：同标签的套餐合成一个页签；勾了「在日历中独立显示」的套餐**额外**再开一个自己的页签。
+- **批量开通**：`套餐 → 详情/批量`，勾选客户（表头有全选，已订阅该套餐的客户置灰），填开始日期与天数后一次开通；重复的会自动跳过并提示。
+- **客户月历**：客户详情页「当月排单」，显示该客户当月每天几单、完成几单，可翻月，点某天直接跳到日历那天。
+
+---
+
 ## 5. 数据、备份与导出
 
 | 文件 | 说明 |
@@ -140,7 +169,9 @@
 ### 迁移与重置（只说一次，很重要）
 
 - **迁移**：关闭程序 → 把 `daili.db` 复制到新电脑的新目录 → 放入 `daili.exe` 双击即可，账号、套餐、客户、订阅、追加记录、打卡、日志全部原样保留。
-- **重置**：关闭程序 → 删除 `daili.db` → 重新打开，会回到「创建第一个管理员」的全新状态。
+- **重置**：关闭程序 → 删除 `daili.db` → 重新打开，会回到「创建管理员」的全新状态。
+- 套餐标签是 `packages.tag`；客户停用是 `customers.archived`（0/1）；加急标记存在 `task_flags` 表；套餐的「独立日历」是 `packages.calendar_separate` 列，老版本数据库打开时会**自动加列**，不用手工迁移。
+- **从 main 升级**：lite 版启动时会自动把老库里的「按次 / 通行证 / 深渊」统一折算成按日（详见文末差异说明），老库直接打开即可，无需手工改数据。
 - `daili.ini`（监听/备份/日志配置）与 `backup/`、`logs/` 都是**独立于数据**的，迁移时可以不拷，程序会按默认值重新生成。
 
 - 手动备份：`设置 → 立即备份`（同样遵守保留份数），备份文件本身也是可直接打开的单文件库；
@@ -148,17 +179,7 @@
 
 ---
 
-## 6. 大屏
+## 6. 从源码构建
-
-- 地址：`http://<本机IP>:17777/screen`
-- 默认 `screen_public = true`：**免登录**，电视/副屏直接打开即可（仅建议局域网使用）；
-- 改成 `screen_public = false` 后大屏回到登录保护；
-- 深色「记分板」风格：客户数 / 活跃订阅 / 今日到期 / 7 天内到期、到期热力月历、即将到期 TOP10、今日待打、最近追加；
-- 默认 30 秒自动刷新（设置页可改），按 `F` 全屏。
-
----
-
-## 7. 从源码构建
 
 环境：Windows + Go 1.25（本项目在 `go1.25.6` 上验证）。
 
@@ -183,6 +204,12 @@ $env:GOFLAGS='-mod=mod'; $env:GOPROXY='off'; $env:GOCACHE="$PWD\.gocache"
 go test ./...
 ```
 
+页面级冒烟（起一个隔离实例，把所有页面渲染一遍，并校验水印/品牌/已移除入口）：
+
+```powershell
+powershell -ExecutionPolicy Bypass -File scripts\smoke-lite.ps1
+```
+
 目录结构：
 
 ```
@@ -194,10 +221,10 @@ internal/logx               控制台 + 按天切分的运行日志
 internal/pw                 口令散列（PBKDF2-SHA256，标准库实现）
 internal/web                路由、会话、模板渲染、处理器
 internal/web/templates      页面与布局（embed 进二进制）
-internal/web/static         app.css / screen.css / app.js / screen.js
+internal/web/static         app.css / app.js
-scripts/acceptance.ps1      冒烟清单执行器（119 条断言）
+scripts/smoke-lite.ps1      lite 版页面级冒烟（渲染 + 水印 + 已移除入口 404）
-scripts/config-test.ps1     配置文件专项测试（14 条断言）
+scripts/acceptance.ps1      冒烟清单执行器（main 分支遗留，部分条目已不适用）
-scripts/smoke.ps1           端到端冒烟（早期版本，保留）
+scripts/config-test.ps1     配置文件专项测试
 scripts/seed.ps1            写入演示数据
 scripts/dbtool.py           测试预处理（暂停回溯、批量造数、完整性检查）
 .gitea/workflows/build.yml   Gitea Actions：vet → test → 交叉编译 → 上传产物
@@ -223,7 +250,7 @@ daili.ini                   首次运行自动生成
 
 ---
 
-## 8. 常见问题
+## 7. 常见问题
 
 **Windows 提示「已保护你的电脑」**
 点「更多信息 → 仍要运行」。这是 Windows 对未签名 exe 的默认拦截。
@@ -241,20 +268,55 @@ daili.ini                   首次运行自动生成
 4. 用启动时打印的那个 `192.168.x.x` 地址，不要用 `127.0.0.1`。
 
 **忘记密码**
-让另一位管理员在 `设置 → 管理员` 里新增一个账户即可；如果只剩一个管理员且忘了密码，只能删掉 `daili.db` 重来。
+lite 版只有一个管理员，没有「新增管理员」可以绕过，只能二选一：删掉 `daili.db` 从零开始，或用任意 SQLite 工具把 `users` 表的 `password_hash` 清空后重新初始化。请务必记牢密码。
 
 **数据会不会因为程序崩溃丢？**
 单文件 SQLite + 每次操作即时落盘，正常使用不会丢；每天的自动备份是双保险。仍然建议定期把 `backup/` 拷到别的盘。
 
 **能放到公网吗？**
-不建议。程序按「局域网内可信环境」设计：会话 Cookie 有 HttpOnly / SameSite 保护，但没有 HTTPS、没有登录失败锁定，且大屏默认免登录。要放公网请套一层反向代理 + HTTPS + 访问控制，并把 `screen_public` 改成 `false`。
+不建议。程序按「局域网内可信环境」设计：会话 Cookie 有 HttpOnly / SameSite 保护，但没有 HTTPS、没有登录失败锁定。要放公网请套一层反向代理 + HTTPS + 访问控制。
 
 ---
 
-## 9. 安全说明
+## 8. 安全说明
 
+- lite 版**只有一个管理员**，就是首次启动时创建的那个账户（`users.id = 1`），不提供新增、停用或编辑他人账户的入口；
+- 改自己的密码用 `设置 → 修改我的密码`；
 - 口令使用 PBKDF2-HMAC-SHA256（12 万次迭代 + 随机盐）存储，不可逆；
 - 所有写操作记录操作人、时间、IP 与摘要，可在「操作日志」里查询；
 - 服务端模板全部走 `html/template` 自动转义；
 - 所有 POST 校验 `Origin`，会话 Cookie 使用 `SameSite=Lax` + `HttpOnly`；
 - 配置文件里的数据库/备份/日志路径请自行确保目录权限，程序不会覆盖已有文件（备份重名会跳过）。
+
+---
+
+## 9. 盲水印
+
+界面里带一处不可见的版权水印 `Powered by Baka春秋`：写在 `_layout.html` 里由 `.wm-blind` 样式隐藏（零尺寸、透明、`clip-path` 裁掉、不进入无障碍树），同时在 `app.css` 里留了同名注释。它不占位、不上色、不影响布局与打印，只用于源码/DOM 层面溯源，**请勿删除**。
+
+页脚另有一行可见署名 `Powered by Baka春秋`。
+
+---
+
+## 10. 与 main 分支的差异
+
+| 项目 | main | lite（本分支） |
+| --- | --- | --- |
+| 版本号 | `1.11.5` | `1.11.5-L`（`<title>`、启动横幅、日志前缀、页脚全站统一带 `-L`） |
+| 品牌 | 代打台 | 代打台-L |
+| 大屏 `/screen` | 有，`screen_public` 控制免登录 | **已移除**，路由返回 404 |
+| 客户自助 `/customer` | 有，`portal_public` 控制免登录 | **已移除**，路由返回 404 |
+| 套餐计费方式 | 按日 / 按次 / 通行证 / 深渊 | **只有按日** |
+| 管理员 | 可新增多个，为主管可编辑他人 | **只有首次启动创建的那一个** |
+| 打手归属 | 客户可指派打手，彩色竖条标识 | **已移除**（只剩一个人，颜色无意义） |
+| 触摸小键盘 | 3×4 小键盘 + 触控/PC 切换 | **已移除** |
+| 署名 | 无 | 页脚 + 盲水印 `Powered by Baka春秋` |
+
+**老数据怎么折算成按日**（启动时自动完成，可重复执行）：
+
+- **通行证**：当年就是 `unit='day'` 且起止日期完整，清掉 `season` 标记即可，服务区间原样保留；
+- **深渊**：同样已是 `unit='day'`，结束日 = 开始日 + 周期天数 × 周期数 − 1，清掉 `abyss/cycle_days` 标记，区间原样保留；
+- **按次**：按「1 次 = 1 天」折算。有总次数但没结束日的，结束日 = 开始日 + 总次数 − 1 天；仍缺结束日的退回开始日；
+- 折算只动数据，不删表、不删列：老库里的 `season / abyss / cycle_days / total_count / used_count` 等列会保留但不再使用，避免升级过程不可逆。
+
+`screen_public` 与 `portal_public` 两个配置项在 lite 版仍然被解析（不报错），但不再有任何作用。

internal/config/config.go

@@ -1,7 +1,7 @@
 // Package config 负责读取/生成与可执行文件同级的 daili.ini。
 //
 // 设计约定：
-//   - 只放「部署类」参数；业务默认值（预警天数、大屏刷新秒数）仍在设置页（数据库）。
+//   - 只放「部署类」参数；业务默认值（预警天数等）仍在设置页（数据库）。
 //   - 文件不存在时自动生成带注释的默认配置；文件写错时报错并保留原文件。
 //   - 相对路径一律相对于可执行文件所在目录，而不是当前工作目录。
 package config
@@ -33,7 +33,10 @@ type Config struct {
 	BackupKeep    int
 	Timezone      string
 	OpenBrowser   bool
+	// ScreenPublic / PortalPublic 在 lite 版已废弃：仍然解析，但不再有任何作用，
+	// 只为兼容旧版 daili.ini（否则旧文件会因“未知配置项”直接启动失败）。
 	ScreenPublic  bool
+	PortalPublic  bool
 	LogEnabled    bool
 	LogDir        string
 
@@ -57,6 +60,7 @@ func Defaults() *Config {
 		Timezone:      "",
 		OpenBrowser:   true,
 		ScreenPublic:  true,
+		PortalPublic:  true,
 		LogEnabled:    true,
 		LogDir:        "logs",
 	}
@@ -203,6 +207,12 @@ func (c *Config) set(key, val string) error {
 			return fmt.Errorf("screen_public %v", err)
 		}
 		c.ScreenPublic = b
+	case "portal_public":
+		b, err := parseBool(val)
+		if err != nil {
+			return fmt.Errorf("portal_public %v", err)
+		}
+		c.PortalPublic = b
 	case "log_enabled":
 		b, err := parseBool(val)
 		if err != nil {
@@ -271,7 +281,7 @@ func parseBool(v string) (bool, error) {
 
 func templateText(c *Config) string {
 	return fmt.Sprintf(`# ============================================================
-#  代打台 配置文件（daili.ini）
+#  代打台-L 配置文件（daili.ini）
 #  与 daili.exe 放在同一目录；修改后需要重启程序生效。
 #  写法：key = value；以 # 或 ; 开头的整行是注释；不支持分节。
 #  相对路径相对于 exe 所在目录，而不是当前工作目录。
@@ -304,9 +314,12 @@ timezone = %s
 # 启动后自动打开浏览器
 open_browser = %t
 
-# 大屏 /screen 是否免登录（默认 true：适合投屏；改成 false 则需要登录）
+# 以下两项在 lite 版已废弃（本版没有大屏 /screen 与客户自助 /customer）。
+# 保留是为了让旧版 daili.ini 仍能直接启动；写了也不报错、不生效。
 screen_public = %t
 
+portal_public = %t
+
 # ---------- 日志 ----------
 # 运行日志同时输出到控制台与 log_dir 下按天切分的文件
 log_enabled = %t
@@ -322,6 +335,7 @@ log_dir = %s
 		c.Timezone,
 		c.OpenBrowser,
 		c.ScreenPublic,
+		c.PortalPublic,
 		c.LogEnabled,
 		c.LogDir,
 	)

internal/config/config_test.go

@@ -46,7 +46,7 @@ func TestLoadCreatesDefaultFile(t *testing.T) {
 		t.Fatalf("默认配置文件未生成: %v", err)
 	}
 	text := string(data)
-	for _, want := range []string{"listen_ip = 0.0.0.0", "listen_port = 17777", "代打台 配置文件（daili.ini）", "timezone ="} {
+	for _, want := range []string{"listen_ip = 0.0.0.0", "listen_port = 17777", "代打台-L 配置文件（daili.ini）", "timezone ="} {
 		if !strings.Contains(text, want) {
 			t.Errorf("默认配置缺少 %q", want)
 		}

internal/domain/domain.go

@@ -1,4 +1,7 @@
 // Package domain 存放与存储无关的纯业务计算：日期、剩余时长、状态判定、追加换算。
+//
+// lite 版只支持「按日（包时）」一种套餐：订阅永远有开始日与结束日，
+// 剩余量永远是天数，因此这里不再有次数、周期、通行证等分支。
 package domain
 
 import "time"
@@ -68,19 +71,12 @@ const (
 	StatusClosed = "closed"
 )
 
-// 套餐类型
-const (
-	UnitDay   = "day"
-	UnitCount = "count"
-)
-
 // 派生展示状态
 const (
 	StateActive  = "active"  // 进行中
 	StatePending = "pending" // 未开始
 	StatePaused  = "paused"  // 暂停中
 	StateExpired = "expired" // 已到期
-	StateUsedUp  = "usedup"  // 次数用尽
 	StateClosed  = "closed"  // 已结束
 )
 
@@ -90,22 +86,20 @@ const (
 	LevelWarn    = "warn"
 	LevelToday   = "today"
 	LevelExpired = "expired"
-	LevelNone    = "none" // 无期限（按次且未设有效期）
+	LevelNone    = "none" // 无结束日（历史数据兜底）
 )
 
 // Eval 是订阅的计算结果。
 type Eval struct {
-	State          string
+	State         string
-	DaysLeft       int // 距结束日的天数：0=今天到期，>0=未来，-1=无结束日
+	DaysLeft      int // 距结束日的天数：0=今天到期，>0=未来，-1=无结束日
-	RemainingDays  int
+	RemainingDays int
-	RemainingCount int
+	Level         string
-	Level          string
 }
 
-// EvalSub 计算订阅的展示状态与剩余量。
+// EvalSub 计算订阅的展示状态与剩余天数。
-//   - unit=day：剩余天数 = end - today + 1（含当天）
+// 剩余天数 = end - today + 1（含当天）。
-//   - unit=count：剩余次数 = total - used；end 为可选有效期
+func EvalSub(status, startDate, endDate string, today time.Time, warnDays int) Eval {
-func EvalSub(unit, status, startDate, endDate string, total, used int, today time.Time, warnDays int) Eval {
 	e := Eval{Level: LevelNone, DaysLeft: -1}
 	if warnDays <= 0 {
 		warnDays = 3
@@ -119,27 +113,14 @@ func EvalSub(unit, status, startDate, endDate string, total, used int, today tim
 		}
 	}
 
-	if unit == UnitDay {
+	if hasEnd {
-		if hasEnd {
+		e.RemainingDays = e.DaysLeft + 1
-			e.RemainingDays = e.DaysLeft + 1
+	}
-		}
+	if e.RemainingDays < 0 {
-		if e.RemainingDays < 0 {
+		e.RemainingDays = 0
-			e.RemainingDays = 0
-		}
-	} else {
-		e.RemainingCount = total - used
-		if e.RemainingCount < 0 {
-			e.RemainingCount = 0
-		}
 	}
 
-	expired := false
+	expired := hasEnd && end.Before(today)
-	if hasEnd && end.Before(today) {
-		expired = true
-	}
-	if unit == UnitCount && e.RemainingCount <= 0 {
-		expired = true
-	}
 
 	switch {
 	case status == StatusClosed:
@@ -147,11 +128,7 @@ func EvalSub(unit, status, startDate, endDate string, total, used int, today tim
 	case status == StatusPaused:
 		e.State = StatePaused
 	case expired:
-		if unit == UnitCount && e.RemainingCount <= 0 {
+		e.State = StateExpired
-			e.State = StateUsedUp
-		} else {
-			e.State = StateExpired
-		}
 	case start.After(today):
 		e.State = StatePending
 	default:

internal/domain/domain_test.go

@@ -46,7 +46,7 @@ func TestEvalDay(t *testing.T) {
 		{"已结束", "closed", "2026-11-16", StateClosed, LevelNone, 30},
 	}
 	for _, c := range cases {
-		e := EvalSub(UnitDay, c.status, "2026-10-01", c.end, 0, 0, today, 3)
+		e := EvalSub(c.status, "2026-10-01", c.end, today, 3)
 		if e.State != c.wantState {
 			t.Errorf("%s: state=%s want %s", c.name, e.State, c.wantState)
 		}
@@ -61,7 +61,7 @@ func TestEvalDay(t *testing.T) {
 
 func TestEvalDayNotStarted(t *testing.T) {
 	today := d(2026, 10, 18)
-	e := EvalSub(UnitDay, "active", "2026-10-20", "2026-11-18", 0, 0, today, 3)
+	e := EvalSub("active", "2026-10-20", "2026-11-18", today, 3)
 	if e.State != StatePending {
 		t.Fatalf("state=%s want pending", e.State)
 	}
@@ -70,37 +70,16 @@ func TestEvalDayNotStarted(t *testing.T) {
 	}
 }
 
-func TestEvalCount(t *testing.T) {
+// TestEvalNoEndDate 覆盖历史数据里结束日为空的兜底分支（lite 版没有按次计费）。
+func TestEvalNoEndDate(t *testing.T) {
 	today := d(2026, 10, 18)
 
-	// 有次数、有有效期，10 天后到期 → 正常
+	e := EvalSub("active", "2026-10-01", "", today, 3)
-	e := EvalSub(UnitCount, "active", "2026-10-01", "2026-10-28", 10, 4, today, 3)
+	if e.Level != LevelNone || e.DaysLeft != -1 || e.RemainingDays != 0 {
-	if e.State != StateActive || e.Level != LevelOK || e.RemainingCount != 6 {
+		t.Fatalf("level=%s daysLeft=%d remain=%d", e.Level, e.DaysLeft, e.RemainingDays)
-		t.Fatalf("got state=%s level=%s remain=%d", e.State, e.Level, e.RemainingCount)
 	}
-
+	if e.State != StateActive {
-	// 有效期就是今天 → 今天到期（而不是误判成 warn/ok）
+		t.Fatalf("state=%s want active", e.State)
-	e = EvalSub(UnitCount, "active", "2026-10-01", "2026-10-18", 10, 4, today, 3)
-	if e.Level != LevelToday {
-		t.Fatalf("level=%s want today", e.Level)
-	}
-
-	// 只有次数，没有有效期 → 无预警等级
-	e = EvalSub(UnitCount, "active", "2026-10-01", "", 10, 4, today, 3)
-	if e.Level != LevelNone || e.DaysLeft != -1 {
-		t.Fatalf("level=%s daysLeft=%d", e.Level, e.DaysLeft)
-	}
-
-	// 次数用尽
-	e = EvalSub(UnitCount, "active", "2026-10-01", "", 10, 10, today, 3)
-	if e.State != StateUsedUp {
-		t.Fatalf("state=%s want usedup", e.State)
-	}
-
-	// 次数还有，但有效期已过
-	e = EvalSub(UnitCount, "active", "2026-10-01", "2026-10-10", 10, 4, today, 3)
-	if e.State != StateExpired {
-		t.Fatalf("state=%s want expired", e.State)
 	}
 }
 

internal/store/checkins.go

@@ -20,7 +20,7 @@ type Checkin struct {
 	UpdatedAt    string
 }
 
-// SaveCheckin 打卡（同订阅同日覆盖），按次套餐完成时扣次。
+// SaveCheckin 打卡（同订阅同日覆盖）。
 func (db *DB) SaveCheckin(subID int64, date, status, note string, operatorID int64) error {
 	if status != "done" && status != "skipped" {
 		return errors.New("打卡状态不正确")
@@ -36,91 +36,39 @@ func (db *DB) SaveCheckin(subID int64, date, status, note string, operatorID int
 		if s.Status == domain.StatusClosed {
 			return errors.New("订阅已结束，无法打卡")
 		}
-		var oldStatus string
+		now := nowStamp()
-		err = tx.QueryRow(`SELECT status FROM checkins WHERE sub_id=? AND service_date=?`, subID, date).Scan(&oldStatus)
+		res, err := tx.Exec(`UPDATE checkins SET status=?, note=?, operator_id=?, updated_at=? WHERE sub_id=? AND service_date=?`,
-		hasOld := err == nil
+			status, note, nullIfZero(operatorID), now, subID, date)
-		if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		if err != nil {
 			return err
 		}
-
+		if n, _ := res.RowsAffected(); n > 0 {
-		delta := 0
+			return nil
-		if s.Unit == domain.UnitCount {
-			oldDone := hasOld && oldStatus == "done"
-			newDone := status == "done"
-			switch {
-			case newDone && !oldDone:
-				if s.UsedCount+1 > s.TotalCount {
-					return errors.New("剩余次数不足，请先追加次数")
-				}
-				delta = 1
-			case !newDone && oldDone:
-				delta = -1
-			}
 		}
-
+		_, err = tx.Exec(`INSERT INTO checkins(sub_id,service_date,status,note,operator_id,created_at,updated_at)
-		now := nowStamp()
+			VALUES(?,?,?,?,?,?,?)`, subID, date, status, note, nullIfZero(operatorID), now, now)
-		if hasOld {
+		return err
-			if _, err := tx.Exec(`UPDATE checkins SET status=?, note=?, operator_id=?, updated_at=? WHERE sub_id=? AND service_date=?`,
-				status, note, nullIfZero(operatorID), now, subID, date); err != nil {
-				return err
-			}
-		} else {
-			if _, err := tx.Exec(`INSERT INTO checkins(sub_id,service_date,status,note,operator_id,created_at,updated_at)
-				VALUES(?,?,?,?,?,?,?)`, subID, date, status, note, nullIfZero(operatorID), now, now); err != nil {
-				return err
-			}
-		}
-		if delta != 0 {
-			newUsed := s.UsedCount + delta
-			if newUsed < 0 {
-				newUsed = 0
-			}
-			if _, err := tx.Exec(`UPDATE subscriptions SET used_count=?, updated_at=? WHERE id=?`, newUsed, now, subID); err != nil {
-				return err
-			}
-		}
-		return nil
 	})
 }
 
-// DeleteCheckin 撤销打卡（按次套餐返还次数），返回所属订阅 ID。
+// DeleteCheckin 撤销打卡，返回所属订阅 ID。
 func (db *DB) DeleteCheckin(id, operatorID int64) (int64, error) {
 	var subID int64
-	var status string
-	var date string
 	err := db.withTx(func(tx *sql.Tx) error {
-		if err := tx.QueryRow(`SELECT sub_id,status,service_date FROM checkins WHERE id=?`, id).
+		if err := tx.QueryRow(`SELECT sub_id FROM checkins WHERE id=?`, id).Scan(&subID); err != nil {
-			Scan(&subID, &status, &date); err != nil {
 			if errors.Is(err, sql.ErrNoRows) {
 				return ErrNotFound
 			}
 			return err
 		}
-		if _, err := tx.Exec(`DELETE FROM checkins WHERE id=?`, id); err != nil {
+		_, err := tx.Exec(`DELETE FROM checkins WHERE id=?`, id)
-			return err
+		return err
-		}
-		s, err := scanSub(tx.QueryRow(subSelect+` WHERE s.id=?`, subID))
-		if err != nil {
-			return err
-		}
-		if s.Unit == domain.UnitCount && status == "done" {
-			newUsed := s.UsedCount - 1
-			if newUsed < 0 {
-				newUsed = 0
-			}
-			if _, err := tx.Exec(`UPDATE subscriptions SET used_count=?, updated_at=? WHERE id=?`,
-				newUsed, nowStamp(), subID); err != nil {
-				return err
-			}
-		}
-		return nil
 	})
 	return subID, err
 }
 
 // CheckinsBetween 取区间内打卡，索引为 [subID][date]。
 func (db *DB) CheckinsBetween(from, to string) (map[int64]map[string]Checkin, error) {
-	out := map[int64]map[string]Checkin{}
 	rows, err := db.sql.Query(`SELECT c.id,c.sub_id,c.service_date,c.status,c.note,IFNULL(c.operator_id,0),
 		IFNULL(u.display_name,''),c.created_at,c.updated_at
 		FROM checkins c LEFT JOIN users u ON u.id=c.operator_id
@@ -128,6 +76,11 @@ func (db *DB) CheckinsBetween(from, to string) (map[int64]map[string]Checkin, er
 	if err != nil {
 		return nil, err
 	}
+	return scanCheckinMap(rows)
+}
+
+func scanCheckinMap(rows *sql.Rows) (map[int64]map[string]Checkin, error) {
+	out := map[int64]map[string]Checkin{}
 	defer rows.Close()
 	for rows.Next() {
 		var c Checkin

internal/store/customers.go

@@ -23,6 +23,9 @@ type Customer struct {
 	CreatedAt  string
 	UpdatedAt  string
 
+	// Archived 停用（软删除）：默认隐藏，订阅保留但不上日历
+	Archived bool
+
 	// 列表聚合
 	SubCount int
 	Summary  string
@@ -41,18 +44,20 @@ func (c *Customer) TagList() []string {
 	return out
 }
 
-const customerCols = `id,tail,name,game_name,game_server,contact,tags,source,note,created_at,updated_at`
+const customerCols = `id,tail,name,game_name,game_server,contact,tags,source,note,created_at,updated_at,IFNULL(archived,0)`
 
 func scanCustomer(row interface{ Scan(dest ...any) error }) (*Customer, error) {
 	var c Customer
+	var archived int
 	err := row.Scan(&c.ID, &c.Tail, &c.Name, &c.GameName, &c.GameServer, &c.Contact,
-		&c.Tags, &c.Source, &c.Note, &c.CreatedAt, &c.UpdatedAt)
+		&c.Tags, &c.Source, &c.Note, &c.CreatedAt, &c.UpdatedAt, &archived)
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
 			return nil, ErrNotFound
 		}
 		return nil, err
 	}
+	c.Archived = archived == 1
 	return &c, nil
 }
 
@@ -90,12 +95,19 @@ func (db *DB) Customer(id int64) (*Customer, error) {
 }
 
 // ListCustomers 分页查询客户，并聚合订阅摘要。
-func (db *DB) ListCustomers(q string, limit, offset int, today string, warnDays int) ([]Customer, int, error) {
+func (db *DB) ListCustomers(q string, limit, offset int, today string, warnDays int, includeArchived bool) ([]Customer, int, error) {
 	where := "1=1"
 	args := []any{}
+	if !includeArchived {
+		where = "IFNULL(archived,0)=0"
+	}
 	if q = strings.TrimSpace(q); q != "" {
 		like := "%" + q + "%"
-		where = "(tail LIKE ? OR name LIKE ? OR game_name LIKE ? OR contact LIKE ? OR tags LIKE ?)"
+		if includeArchived {
+			where = "(tail LIKE ? OR name LIKE ? OR game_name LIKE ? OR contact LIKE ? OR tags LIKE ?)"
+		} else {
+			where = "IFNULL(archived,0)=0 AND (tail LIKE ? OR name LIKE ? OR game_name LIKE ? OR contact LIKE ? OR tags LIKE ?)"
+		}
 		args = append(args, like, like, like, like, like)
 	}
 	var total int
@@ -139,7 +151,7 @@ func (db *DB) ListCustomers(q string, limit, offset int, today string, warnDays
 	return out, total, nil
 }
 
-// summarizeSubs 生成“包月日常 剩12天 · 深渊 剩3次”式的摘要与最紧急等级。
+// summarizeSubs 生成「包月日常 剩12天 · 深渊日常 今天到期」式的摘要与最紧急等级。
 func summarizeSubs(subs []Subscription, today string, warnDays int) (string, string) {
 	if len(subs) == 0 {
 		return "暂无订阅", domain.LevelNone
@@ -154,24 +166,13 @@ func summarizeSubs(subs []Subscription, today string, warnDays int) (string, str
 			continue
 		}
 		var text string
-		if s.Unit == domain.UnitDay {
+		switch {
-			switch {
+		case e.State == domain.StateExpired:
-			case e.State == domain.StateExpired:
+			text = s.PackageName + " 已过期"
-				text = s.PackageName + " 已过期"
+		case e.DaysLeft == 0:
-			case e.DaysLeft == 0:
+			text = s.PackageName + " 今天到期"
-				text = s.PackageName + " 今天到期"
+		default:
-			default:
+			text = fmt.Sprintf("%s 剩%d天", s.PackageName, e.RemainingDays)
-				text = fmt.Sprintf("%s 剩%d天", s.PackageName, e.RemainingDays)
-			}
-		} else {
-			switch {
-			case e.RemainingCount <= 0:
-				text = s.PackageName + " 已用尽"
-			case e.State == domain.StateExpired:
-				text = s.PackageName + " 已过期"
-			default:
-				text = fmt.Sprintf("%s 剩%d次", s.PackageName, e.RemainingCount)
-			}
 		}
 		parts = append(parts, text)
 		if rank[e.Level] > rank[worst] {
@@ -187,15 +188,77 @@ func summarizeSubs(subs []Subscription, today string, warnDays int) (string, str
 	return strings.Join(parts, " · "), worst
 }
 
-// FindCustomerByTailName 精确查找（用于查重提示）。
-func (db *DB) FindCustomerByTailName(tail, name string) (*Customer, error) {
-	return scanCustomer(db.sql.QueryRow(`SELECT `+customerCols+` FROM customers WHERE tail=? AND name=?`,
-		strings.TrimSpace(tail), strings.TrimSpace(name)))
-}
-
 // CustomerCount 客户总数。
 func (db *DB) CustomerCount() (int, error) {
 	var n int
-	err := db.sql.QueryRow(`SELECT COUNT(*) FROM customers`).Scan(&n)
+	err := db.sql.QueryRow(`SELECT COUNT(*) FROM customers WHERE IFNULL(archived,0)=0`).Scan(&n)
+	return n, err
+}
+
+// CustomersByTail 按手机尾号精确匹配客户；没有精确命中时退回模糊匹配。
+func (db *DB) CustomersByTail(tail string) ([]Customer, error) {
+	tail = strings.TrimSpace(tail)
+	if tail == "" {
+		return nil, nil
+	}
+	out, err := db.queryCustomers(`SELECT `+customerCols+` FROM customers WHERE IFNULL(archived,0)=0 AND tail = ? ORDER BY id`, tail)
+	if err != nil {
+		return nil, err
+	}
+	if len(out) > 0 {
+		return out, nil
+	}
+	return db.queryCustomers(`SELECT `+customerCols+` FROM customers WHERE IFNULL(archived,0)=0 AND tail LIKE ? ORDER BY id LIMIT 20`, "%"+tail+"%")
+}
+
+func (db *DB) queryCustomers(q string, args ...any) ([]Customer, error) {
+	rows, err := db.sql.Query(q, args...)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	out := []Customer{}
+	for rows.Next() {
+		c, err := scanCustomer(rows)
+		if err != nil {
+			return nil, err
+		}
+		out = append(out, *c)
+	}
+	return out, rows.Err()
+}
+
+// SetCustomerArchived 停用/恢复客户。停用后其订阅保留，但不再上日历。
+func (db *DB) SetCustomerArchived(id int64, archived bool) error {
+	v := 0
+	if archived {
+		v = 1
+	}
+	res, err := db.sql.Exec(`UPDATE customers SET archived=?, updated_at=? WHERE id=?`, v, nowStamp(), id)
+	if err != nil {
+		return err
+	}
+	if n, _ := res.RowsAffected(); n == 0 {
+		return ErrNotFound
+	}
+	return nil
+}
+
+// DeleteCustomer 彻底删除客户；订阅、打卡、暂停、追加记录随外键级联删除。
+func (db *DB) DeleteCustomer(id int64) error {
+	res, err := db.sql.Exec(`DELETE FROM customers WHERE id=?`, id)
+	if err != nil {
+		return err
+	}
+	if n, _ := res.RowsAffected(); n == 0 {
+		return ErrNotFound
+	}
+	return nil
+}
+
+// CountArchivedCustomers 统计已停用客户数。
+func (db *DB) CountArchivedCustomers() (int, error) {
+	var n int
+	err := db.sql.QueryRow(`SELECT COUNT(*) FROM customers WHERE IFNULL(archived,0)=1`).Scan(&n)
 	return n, err
 }

internal/store/db.go

@@ -102,13 +102,6 @@ func isUnique(err error) bool {
 	return err != nil && strings.Contains(err.Error(), "UNIQUE constraint failed")
 }
 
-func normalizeUnit(u string) string {
-	if u == domain.UnitCount {
-		return domain.UnitCount
-	}
-	return domain.UnitDay
-}
-
 // Migrate 幂等建表。
 func (db *DB) Migrate() error {
 	for _, stmt := range schemaStatements {
@@ -116,6 +109,108 @@ func (db *DB) Migrate() error {
 			return fmt.Errorf("迁移失败: %w\nSQL: %s", err, stmt)
 		}
 	}
+	// 增量列：老库升级时补上（SQLite 没有 ADD COLUMN IF NOT EXISTS）
+	if err := db.ensureColumn("packages", "calendar_separate",
+		"ALTER TABLE packages ADD COLUMN calendar_separate INTEGER NOT NULL DEFAULT 0"); err != nil {
+		return err
+	}
+	// v1.7：套餐标签（同标签的套餐在日历里合并成一个页签）
+	if err := db.ensureColumn("packages", "tag",
+		"ALTER TABLE packages ADD COLUMN tag TEXT NOT NULL DEFAULT ''"); err != nil {
+		return err
+	}
+	if err := db.ensureColumn("customers", "archived",
+		"ALTER TABLE customers ADD COLUMN archived INTEGER NOT NULL DEFAULT 0"); err != nil {
+		return err
+	}
+	// lite：把老库里按次 / 通行证 / 深渊的数据统一折算成按日
+	return db.normalizeLegacyData()
+}
+
+// normalizeLegacyData 把 main 分支遗留的三种套餐类型折算成按日。
+//
+//   - 通行证、深渊订阅当年就是 unit='day' 且起止日期完整，清掉标记即可；
+//   - 按次订阅按「1 次 = 1 天」折算成天：有 total_count 且没有结束日的，
+//     结束日 = 开始日 + total_count - 1；仍缺结束日的退回开始日。
+//
+// 老库缺少这些列时自动跳过，因此可以反复执行。
+func (db *DB) normalizeLegacyData() error {
+	// 套餐：一律按日
+	pkgSets := []string{"unit='day'"}
+	for _, col := range []string{"season", "abyss", "cycle_days", "default_validity_days"} {
+		if db.hasColumn("packages", col) {
+			pkgSets = append(pkgSets, col+"=0")
+		}
+	}
+	for _, col := range []string{"season_start", "season_end"} {
+		if db.hasColumn("packages", col) {
+			pkgSets = append(pkgSets, col+"=''")
+		}
+	}
+	if _, err := db.sql.Exec(`UPDATE packages SET ` + strings.Join(pkgSets, ",")); err != nil {
+		return fmt.Errorf("迁移套餐类型失败: %w", err)
+	}
+
+	// 订阅：按次先折算天数，再统一成按日
+	if db.hasColumn("subscriptions", "total_count") {
+		if _, err := db.sql.Exec(`UPDATE subscriptions
+			SET end_date = date(start_date, '+' || (total_count - 1) || ' days')
+			WHERE unit='count' AND IFNULL(total_count,0) > 0 AND IFNULL(end_date,'')=''`); err != nil {
+			return fmt.Errorf("迁移按次订阅失败: %w", err)
+		}
+	}
+	if _, err := db.sql.Exec(`UPDATE subscriptions
+		SET unit='day', end_date=IFNULL(NULLIF(end_date,''), start_date)
+		WHERE unit<>'day' OR IFNULL(end_date,'')=''`); err != nil {
+		return fmt.Errorf("迁移订阅计费方式失败: %w", err)
+	}
+	subSets := []string{}
+	for _, col := range []string{"season", "abyss", "cycle_days"} {
+		if db.hasColumn("subscriptions", col) {
+			subSets = append(subSets, col+"=0")
+		}
+	}
+	if db.hasColumn("subscriptions", "season_done") {
+		subSets = append(subSets, "season_done=''")
+	}
+	if len(subSets) > 0 {
+		if _, err := db.sql.Exec(`UPDATE subscriptions SET ` + strings.Join(subSets, ",")); err != nil {
+			return fmt.Errorf("迁移订阅标记失败: %w", err)
+		}
+	}
+	return nil
+}
+
+// hasColumn 判断表里是否有某一列。
+func (db *DB) hasColumn(table, column string) bool {
+	rows, err := db.sql.Query("PRAGMA table_info(" + table + ")")
+	if err != nil {
+		return false
+	}
+	defer rows.Close()
+	for rows.Next() {
+		var cid int
+		var name, ctype string
+		var notnull, pk int
+		var dflt any
+		if err := rows.Scan(&cid, &name, &ctype, &notnull, &dflt, &pk); err != nil {
+			return false
+		}
+		if strings.EqualFold(name, column) {
+			return true
+		}
+	}
+	return false
+}
+
+// ensureColumn 在列不存在时执行 ddl，保证迁移可重复执行。
+func (db *DB) ensureColumn(table, column, ddl string) error {
+	if db.hasColumn(table, column) {
+		return nil
+	}
+	if _, err := db.sql.Exec(ddl); err != nil {
+		return fmt.Errorf("迁移失败（%s.%s）: %w", table, column, err)
+	}
 	return nil
 }
 
@@ -139,13 +234,15 @@ var schemaStatements = []string{
 	`CREATE TABLE IF NOT EXISTS packages (
 		id INTEGER PRIMARY KEY AUTOINCREMENT,
 		name TEXT NOT NULL,
-		unit TEXT NOT NULL CHECK (unit IN ('day','count')),
+		unit TEXT NOT NULL DEFAULT 'day' CHECK (unit IN ('day')),
 		default_amount INTEGER NOT NULL DEFAULT 30,
 		price_cents INTEGER,
-		color TEXT NOT NULL DEFAULT '#2F5D50',
+		color TEXT NOT NULL DEFAULT '#3B6EA5',
 		note TEXT NOT NULL DEFAULT '',
 		archived INTEGER NOT NULL DEFAULT 0,
 		sort_order INTEGER NOT NULL DEFAULT 0,
+		calendar_separate INTEGER NOT NULL DEFAULT 0,
+		tag TEXT NOT NULL DEFAULT '',
 		created_at TEXT NOT NULL,
 		updated_at TEXT NOT NULL
 	)`,
@@ -159,6 +256,7 @@ var schemaStatements = []string{
 		tags TEXT NOT NULL DEFAULT '',
 		source TEXT NOT NULL DEFAULT '',
 		note TEXT NOT NULL DEFAULT '',
+		archived INTEGER NOT NULL DEFAULT 0,
 		created_at TEXT NOT NULL,
 		updated_at TEXT NOT NULL,
 		UNIQUE (tail, name)
@@ -167,12 +265,10 @@ var schemaStatements = []string{
 		id INTEGER PRIMARY KEY AUTOINCREMENT,
 		customer_id INTEGER NOT NULL REFERENCES customers(id) ON DELETE CASCADE,
 		package_id INTEGER NOT NULL REFERENCES packages(id),
-		unit TEXT NOT NULL CHECK (unit IN ('day','count')),
+		unit TEXT NOT NULL DEFAULT 'day' CHECK (unit IN ('day')),
 		status TEXT NOT NULL DEFAULT 'active' CHECK (status IN ('active','paused','closed')),
 		start_date TEXT NOT NULL,
 		end_date TEXT,
-		total_count INTEGER NOT NULL DEFAULT 0,
-		used_count INTEGER NOT NULL DEFAULT 0,
 		note TEXT NOT NULL DEFAULT '',
 		created_by INTEGER REFERENCES users(id),
 		created_at TEXT NOT NULL,
@@ -194,9 +290,6 @@ var schemaStatements = []string{
 		old_end_date TEXT,
 		new_end_date TEXT,
 		days_added INTEGER NOT NULL DEFAULT 0,
-		count_added INTEGER NOT NULL DEFAULT 0,
-		old_total INTEGER NOT NULL DEFAULT 0,
-		new_total INTEGER NOT NULL DEFAULT 0,
 		note TEXT NOT NULL DEFAULT '',
 		operator_id INTEGER REFERENCES users(id),
 		created_at TEXT NOT NULL
@@ -224,6 +317,16 @@ var schemaStatements = []string{
 		ip TEXT NOT NULL DEFAULT '',
 		created_at TEXT NOT NULL
 	)`,
+	`CREATE TABLE IF NOT EXISTS task_flags (
+		id INTEGER PRIMARY KEY AUTOINCREMENT,
+		sub_id INTEGER NOT NULL REFERENCES subscriptions(id) ON DELETE CASCADE,
+		service_date TEXT NOT NULL,
+		urgent INTEGER NOT NULL DEFAULT 0,
+		created_at TEXT NOT NULL,
+		updated_at TEXT NOT NULL,
+		UNIQUE (sub_id, service_date)
+	)`,
+	`CREATE INDEX IF NOT EXISTS idx_task_flags_date ON task_flags(service_date)`,
 	`CREATE TABLE IF NOT EXISTS settings (
 		key TEXT PRIMARY KEY,
 		value TEXT NOT NULL

internal/store/export.go

@@ -38,25 +38,19 @@ func (db *DB) ExportSubscriptions(today time.Time, warnDays int) (*ExportRowSet,
 	if err != nil {
 		return nil, err
 	}
-	out := &ExportRowSet{Header: []string{"订阅ID", "手机尾号", "客户名", "套餐", "类型", "状态", "开始日", "结束日/有效期",
+	out := &ExportRowSet{Header: []string{"订阅ID", "手机尾号", "客户名", "套餐", "类型", "状态", "开始日", "结束日",
-		"总次数", "已用", "剩余", "原文状态", "备注", "更新时间"}}
+		"剩余", "原文状态", "备注", "更新时间"}}
 	stateLabel := map[string]string{
 		domain.StateActive: "进行中", domain.StatePending: "未开始", domain.StatePaused: "暂停中",
-		domain.StateExpired: "已到期", domain.StateUsedUp: "次数用尽", domain.StateClosed: "已结束",
+		domain.StateExpired: "已到期", domain.StateClosed: "已结束",
 	}
 	for _, s := range subs {
 		e := s.Eval(today, warnDays)
-		remaining := ""
-		if s.Unit == domain.UnitDay {
-			remaining = fmt.Sprintf("%d 天", e.RemainingDays)
-		} else {
-			remaining = fmt.Sprintf("%d 次", e.RemainingCount)
-		}
 		out.Rows = append(out.Rows, []string{
 			fmt.Sprint(s.ID), s.CustomerTail, s.CustomerName, s.PackageName,
-			map[string]string{domain.UnitDay: "按日", domain.UnitCount: "按次"}[s.Unit],
+			"按日",
 			stateLabel[e.State], s.StartDate, s.EndDate,
-			fmt.Sprint(s.TotalCount), fmt.Sprint(s.UsedCount), remaining, s.Status, s.Note, s.UpdatedAt,
+			fmt.Sprintf("%d 天", e.RemainingDays), s.Status, s.Note, s.UpdatedAt,
 		})
 	}
 	return out, nil

internal/store/packages.go

@@ -3,43 +3,52 @@ package store
 import (
 	"database/sql"
 	"errors"
+	"strconv"
 	"strings"
-
-	"daili/internal/domain"
 )
 
+// 套餐计费方式：lite 版只有「按日」一种，
+// 但 packages.unit 列保留（写入固定值 "day"），以便老库平滑升级。
+const unitDay = "day"
+
 // Package 服务套餐。
 type Package struct {
 	ID            int64
 	Name          string
-	Unit          string
+	DefaultAmount int // 默认天数
-	DefaultAmount int
 	PriceCents    int
 	HasPrice      bool
 	Color         string
 	Note          string
 	Archived      bool
 	SortOrder     int
-	CreatedAt     string
+	// CalendarSeparate 勾选后在工作台日历中单独成页
-	UpdatedAt     string
+	CalendarSeparate bool
-	SubCount      int
+	// Tag 套餐标签：相同标签的套餐在日历里合并显示
-	ActiveCount   int
+	Tag       string
+	CreatedAt string
+	UpdatedAt string
+	SubCount  int
+	ActiveCount int
 }
 
-// UnitLabel 返回类型中文名。
+// UnitLabel 返回类型中文名（lite 版只有按日）。
-func (p *Package) UnitLabel() string {
+func (p *Package) UnitLabel() string { return "按日" }
-	if p.Unit == domain.UnitCount {
+
-		return "按次"
+// AmountText 返回「默认量」列的中文描述。
-	}
+func (p *Package) AmountText() string {
-	return "按日"
+	return strconv.Itoa(p.DefaultAmount) + " 天"
 }
 
+const packageCols = `id,name,unit,default_amount,price_cents,color,note,archived,sort_order,calendar_separate,tag,created_at,updated_at`
+
 func scanPackage(row interface{ Scan(dest ...any) error }) (*Package, error) {
 	var p Package
+	var unit string
 	var price sql.NullInt64
-	var archived int
+	var archived, separate int
-	err := row.Scan(&p.ID, &p.Name, &p.Unit, &p.DefaultAmount, &price, &p.Color, &p.Note,
+	err := row.Scan(&p.ID, &p.Name, &unit, &p.DefaultAmount, &price, &p.Color, &p.Note,
-		&archived, &p.SortOrder, &p.CreatedAt, &p.UpdatedAt)
+		&archived, &p.SortOrder, &separate, &p.Tag, &p.CreatedAt, &p.UpdatedAt)
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
 			return nil, ErrNotFound
@@ -47,6 +56,7 @@ func scanPackage(row interface{ Scan(dest ...any) error }) (*Package, error) {
 		return nil, err
 	}
 	p.Archived = archived == 1
+	p.CalendarSeparate = separate == 1
 	if price.Valid {
 		p.PriceCents = int(price.Int64)
 		p.HasPrice = true
@@ -56,7 +66,7 @@ func scanPackage(row interface{ Scan(dest ...any) error }) (*Package, error) {
 
 // ListPackages 列出套餐（含订阅计数）。
 func (db *DB) ListPackages(includeArchived bool) ([]Package, error) {
-	q := `SELECT p.id,p.name,p.unit,p.default_amount,p.price_cents,p.color,p.note,p.archived,p.sort_order,p.created_at,p.updated_at,
+	q := `SELECT p.id,p.name,p.unit,p.default_amount,p.price_cents,p.color,p.note,p.archived,p.sort_order,p.calendar_separate,p.tag,p.created_at,p.updated_at,
 		(SELECT COUNT(*) FROM subscriptions s WHERE s.package_id=p.id),
 		(SELECT COUNT(*) FROM subscriptions s WHERE s.package_id=p.id AND s.status<>'closed')
 		FROM packages p`
@@ -72,13 +82,15 @@ func (db *DB) ListPackages(includeArchived bool) ([]Package, error) {
 	out := []Package{}
 	for rows.Next() {
 		var p Package
+		var unit string
 		var price sql.NullInt64
-		var archived int
+		var archived, separate int
-		if err := rows.Scan(&p.ID, &p.Name, &p.Unit, &p.DefaultAmount, &price, &p.Color, &p.Note,
+		if err := rows.Scan(&p.ID, &p.Name, &unit, &p.DefaultAmount, &price, &p.Color, &p.Note,
-			&archived, &p.SortOrder, &p.CreatedAt, &p.UpdatedAt, &p.SubCount, &p.ActiveCount); err != nil {
+			&archived, &p.SortOrder, &separate, &p.Tag, &p.CreatedAt, &p.UpdatedAt, &p.SubCount, &p.ActiveCount); err != nil {
 			return nil, err
 		}
 		p.Archived = archived == 1
+		p.CalendarSeparate = separate == 1
 		if price.Valid {
 			p.PriceCents = int(price.Int64)
 			p.HasPrice = true
@@ -90,27 +102,29 @@ func (db *DB) ListPackages(includeArchived bool) ([]Package, error) {
 
 // Package 取单个套餐。
 func (db *DB) Package(id int64) (*Package, error) {
-	return scanPackage(db.sql.QueryRow(`SELECT id,name,unit,default_amount,price_cents,color,note,archived,sort_order,created_at,updated_at
+	return scanPackage(db.sql.QueryRow(`SELECT `+packageCols+` FROM packages WHERE id=?`, id))
-		FROM packages WHERE id=?`, id))
+}
+
+func (p *Package) normalize() {
+	if p.DefaultAmount <= 0 {
+		p.DefaultAmount = 30
+	}
+	if strings.TrimSpace(p.Color) == "" {
+		p.Color = "#3B6EA5"
+	}
 }
 
 // CreatePackage 新建套餐。
 func (db *DB) CreatePackage(p *Package) (int64, error) {
 	now := nowStamp()
-	p.Unit = normalizeUnit(p.Unit)
+	p.normalize()
-	if p.DefaultAmount <= 0 {
-		p.DefaultAmount = 30
-	}
-	if strings.TrimSpace(p.Color) == "" {
-		p.Color = "#2F5D50"
-	}
 	var price any
 	if p.HasPrice {
 		price = p.PriceCents
 	}
-	res, err := db.sql.Exec(`INSERT INTO packages(name,unit,default_amount,price_cents,color,note,archived,sort_order,created_at,updated_at)
+	res, err := db.sql.Exec(`INSERT INTO packages(name,unit,default_amount,price_cents,color,note,archived,sort_order,calendar_separate,tag,created_at,updated_at)
-		VALUES(?,?,?,?,?,?,0,?,?,?)`,
+		VALUES(?,?,?,?,?,?,0,?,?,?,?,?)`,
-		p.Name, p.Unit, p.DefaultAmount, price, p.Color, p.Note, p.SortOrder, now, now)
+		p.Name, unitDay, p.DefaultAmount, price, p.Color, p.Note, p.SortOrder, b2i(p.CalendarSeparate), strings.TrimSpace(p.Tag), now, now)
 	if err != nil {
 		return 0, err
 	}
@@ -119,22 +133,24 @@ func (db *DB) CreatePackage(p *Package) (int64, error) {
 
 // UpdatePackage 更新套餐。
 func (db *DB) UpdatePackage(p *Package) error {
-	p.Unit = normalizeUnit(p.Unit)
+	p.normalize()
-	if p.DefaultAmount <= 0 {
-		p.DefaultAmount = 30
-	}
-	if strings.TrimSpace(p.Color) == "" {
-		p.Color = "#2F5D50"
-	}
 	var price any
 	if p.HasPrice {
 		price = p.PriceCents
 	}
-	_, err := db.sql.Exec(`UPDATE packages SET name=?,unit=?,default_amount=?,price_cents=?,color=?,note=?,sort_order=?,updated_at=?
+	_, err := db.sql.Exec(`UPDATE packages SET name=?,unit=?,default_amount=?,price_cents=?,color=?,note=?,sort_order=?,calendar_separate=?,tag=?,updated_at=?
-		WHERE id=?`, p.Name, p.Unit, p.DefaultAmount, price, p.Color, p.Note, p.SortOrder, nowStamp(), p.ID)
+		WHERE id=?`, p.Name, unitDay, p.DefaultAmount, price, p.Color, p.Note, p.SortOrder, b2i(p.CalendarSeparate), strings.TrimSpace(p.Tag), nowStamp(), p.ID)
 	return err
 }
 
+// b2i 把 bool 转成 SQLite 的 0/1。
+func b2i(v bool) int {
+	if v {
+		return 1
+	}
+	return 0
+}
+
 // SetPackageArchived 归档/取消归档。
 func (db *DB) SetPackageArchived(id int64, archived bool) error {
 	v := 0
@@ -144,3 +160,39 @@ func (db *DB) SetPackageArchived(id int64, archived bool) error {
 	_, err := db.sql.Exec(`UPDATE packages SET archived=?, updated_at=? WHERE id=?`, v, nowStamp(), id)
 	return err
 }
+
+// SubscribedCustomerIDs 返回已订阅某套餐的客户 ID 集合（含已关闭，用于批量订阅时置灰）。
+func (db *DB) SubscribedCustomerIDs(packageID int64) (map[int64]bool, error) {
+	rows, err := db.sql.Query(`SELECT customer_id FROM subscriptions WHERE package_id=?`, packageID)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	out := map[int64]bool{}
+	for rows.Next() {
+		var id int64
+		if err := rows.Scan(&id); err != nil {
+			return nil, err
+		}
+		out[id] = true
+	}
+	return out, rows.Err()
+}
+
+// PackageTags 返回所有非空标签（去重，按字典序）。
+func (db *DB) PackageTags() ([]string, error) {
+	rows, err := db.sql.Query(`SELECT DISTINCT tag FROM packages WHERE IFNULL(tag,'')<>'' ORDER BY tag`)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	out := []string{}
+	for rows.Next() {
+		var t string
+		if err := rows.Scan(&t); err != nil {
+			return nil, err
+		}
+		out = append(out, t)
+	}
+	return out, rows.Err()
+}

internal/store/stats.go

@@ -6,109 +6,25 @@ import (
 	"daili/internal/domain"
 )
 
-// Stats 大屏统计数据。
-type Stats struct {
-	Customers    int
-	ActiveSubs   int
-	PausedSubs   int
-	DueToday     int
-	Due7         int
-	DueTodaySubs []Subscription
-	Heat         map[string]int // 结束日 -> 该日到期数量
-	MonthDue     int
-	Top          []Subscription
-	TodayTasks   int
-	TodayDone    int
-}
-
 // Badges 顶栏常驻徽标。
-func (db *DB) Badges(today time.Time) (dueToday, due3 int, err error) {
+func (db *DB) Badges(today time.Time) (dueToday, due3, due7 int, err error) {
 	t := domain.Date(today)
-	if err = db.sql.QueryRow(`SELECT COUNT(*) FROM subscriptions WHERE status<>'closed' AND end_date=?`, t).Scan(&dueToday); err != nil {
+	const notArchived = ` AND IFNULL((SELECT archived FROM customers c WHERE c.id=customer_id),0)=0`
+	if err = db.sql.QueryRow(`SELECT COUNT(*) FROM subscriptions WHERE status<>'closed' AND end_date=?`+notArchived, t).Scan(&dueToday); err != nil {
 		return
 	}
-	err = db.sql.QueryRow(`SELECT COUNT(*) FROM subscriptions WHERE status<>'closed' AND end_date BETWEEN ? AND ?`,
+	if err = db.sql.QueryRow(`SELECT COUNT(*) FROM subscriptions WHERE status<>'closed' AND end_date BETWEEN ? AND ?`+notArchived,
-		t, domain.Date(domain.AddDays(today, 2))).Scan(&due3)
+		t, domain.Date(domain.AddDays(today, 2))).Scan(&due3); err != nil {
+		return
+	}
+	err = db.sql.QueryRow(`SELECT COUNT(*) FROM subscriptions WHERE status<>'closed' AND end_date BETWEEN ? AND ?`+notArchived,
+		t, domain.Date(domain.AddDays(today, 6))).Scan(&due7)
 	return
 }
 
-// ScreenStats 汇总大屏所需数据。
-func (db *DB) ScreenStats(today time.Time, warnDays int) (*Stats, error) {
-	st := &Stats{Heat: map[string]int{}}
-	var err error
-	if st.Customers, err = db.CustomerCount(); err != nil {
-		return nil, err
-	}
-	if st.ActiveSubs, err = db.CountActiveSubs(domain.Date(today)); err != nil {
-		return nil, err
-	}
-	if err = db.sql.QueryRow(`SELECT COUNT(*) FROM subscriptions WHERE status='paused'`).Scan(&st.PausedSubs); err != nil {
-		return nil, err
-	}
-	if err = db.sql.QueryRow(`SELECT COUNT(*) FROM subscriptions WHERE status<>'closed' AND end_date=?`,
-		domain.Date(today)).Scan(&st.DueToday); err != nil {
-		return nil, err
-	}
-	if err = db.sql.QueryRow(`SELECT COUNT(*) FROM subscriptions WHERE status<>'closed' AND end_date BETWEEN ? AND ?`,
-		domain.Date(today), domain.Date(domain.AddDays(today, 6))).Scan(&st.Due7); err != nil {
-		return nil, err
-	}
-	if st.DueTodaySubs, err = db.DueOn(domain.Date(today)); err != nil {
-		return nil, err
-	}
-
-	// 本月到期热力
-	ms := domain.MonthStart(today.Year(), today.Month())
-	me := domain.MonthEnd(today.Year(), today.Month())
-	rows, err := db.sql.Query(`SELECT end_date, COUNT(*) FROM subscriptions
-		WHERE status<>'closed' AND end_date BETWEEN ? AND ? GROUP BY end_date`,
-		domain.Date(ms), domain.Date(me))
-	if err != nil {
-		return nil, err
-	}
-	for rows.Next() {
-		var d string
-		var n int
-		if err := rows.Scan(&d, &n); err != nil {
-			rows.Close()
-			return nil, err
-		}
-		st.Heat[d] = n
-		st.MonthDue += n
-	}
-	rows.Close()
-
-	// TOP：按日按剩余天数、按次按剩余次数，各自排序后交替取前 10
-	t := domain.Date(today)
-	daySubs, err := db.querySubs(subSelect+` WHERE s.status<>'closed' AND s.unit='day' AND s.end_date>=?
-		ORDER BY s.end_date ASC LIMIT 12`, t)
-	if err != nil {
-		return nil, err
-	}
-	cntSubs, err := db.querySubs(subSelect+` WHERE s.status<>'closed' AND s.unit='count' AND s.used_count < s.total_count
-		AND (IFNULL(s.end_date,'')='' OR s.end_date>=?)
-		ORDER BY (s.total_count - s.used_count) ASC LIMIT 12`, t)
-	if err != nil {
-		return nil, err
-	}
-	for i := 0; i < 10 && len(st.Top) < 10; i++ {
-		if i < len(daySubs) {
-			st.Top = append(st.Top, daySubs[i])
-		}
-		if len(st.Top) < 10 && i < len(cntSubs) {
-			st.Top = append(st.Top, cntSubs[i])
-		}
-		if i >= len(daySubs) && i >= len(cntSubs) {
-			break
-		}
-	}
-	_ = warnDays
-	return st, nil
-}
-
 // RecentDue 返回未来 n 天内到期的订阅（按到期日排序）。
 func (db *DB) RecentDue(from string, days int) ([]Subscription, error) {
 	to := domain.Date(domain.AddDays(domain.ParseDateOr(from, domain.Today()), days-1))
-	return db.querySubs(subSelect+` WHERE s.status<>'closed' AND s.end_date BETWEEN ? AND ?
+	return db.querySubs(subSelect+` WHERE s.status<>'closed' AND IFNULL(c.archived,0)=0 AND s.end_date BETWEEN ? AND ?
 		ORDER BY s.end_date, s.id`, from, to)
 }

internal/store/store_test.go

@@ -4,7 +4,6 @@ import (
 	"database/sql"
 	"os"
 	"path/filepath"
-	"strconv"
 	"strings"
 	"testing"
 	"time"
@@ -25,9 +24,9 @@ func newTestDB(t *testing.T) *DB {
 	return db
 }
 
-func mustPackage(t *testing.T, db *DB, name, unit string, amount int) *Package {
+func mustPackage(t *testing.T, db *DB, name string, amount int) *Package {
 	t.Helper()
-	id, err := db.CreatePackage(&Package{Name: name, Unit: unit, DefaultAmount: amount, Color: "#2F5D50"})
+	id, err := db.CreatePackage(&Package{Name: name, DefaultAmount: amount, Color: "#2F5D50"})
 	if err != nil {
 		t.Fatalf("创建套餐失败: %v", err)
 	}
@@ -49,7 +48,7 @@ func mustCustomer(t *testing.T, db *DB, tail, name string) int64 {
 
 func TestCreateSubAndDuplicate(t *testing.T) {
 	db := newTestDB(t)
-	pkg := mustPackage(t, db, "包月日常", domain.UnitDay, 30)
+	pkg := mustPackage(t, db, "包月日常", 30)
 	cid := mustCustomer(t, db, "1234", "老张")
 	today := domain.Today()
 
@@ -62,8 +61,8 @@ func TestCreateSubAndDuplicate(t *testing.T) {
 	if sub.EndDate != domain.Date(domain.AddDays(today, 29)) {
 		t.Fatalf("结束日=%s", sub.EndDate)
 	}
-	if sub.Unit != domain.UnitDay || sub.Status != domain.StatusActive {
+	if sub.Status != domain.StatusActive {
-		t.Fatalf("unit=%s status=%s", sub.Unit, sub.Status)
+		t.Fatalf("status=%s", sub.Status)
 	}
 
 	if _, err := db.CreateSub(CreateSubInput{
@@ -84,7 +83,7 @@ func TestCreateSubAndDuplicate(t *testing.T) {
 
 func TestExtendDaysFromTodayWhenExpired(t *testing.T) {
 	db := newTestDB(t)
-	pkg := mustPackage(t, db, "包月日常", domain.UnitDay, 30)
+	pkg := mustPackage(t, db, "包月日常", 30)
 	cid := mustCustomer(t, db, "1234", "老张")
 	today := domain.Today()
 
@@ -128,7 +127,7 @@ func TestExtendDaysFromTodayWhenExpired(t *testing.T) {
 
 func TestExtendDaysFromOldEndWhenActive(t *testing.T) {
 	db := newTestDB(t)
-	pkg := mustPackage(t, db, "包月日常", domain.UnitDay, 30)
+	pkg := mustPackage(t, db, "包月日常", 30)
 	cid := mustCustomer(t, db, "1234", "老张")
 	today := domain.Today()
 
@@ -150,7 +149,7 @@ func TestExtendDaysFromOldEndWhenActive(t *testing.T) {
 
 func TestExtendDaysRejectsBackwards(t *testing.T) {
 	db := newTestDB(t)
-	pkg := mustPackage(t, db, "包月日常", domain.UnitDay, 30)
+	pkg := mustPackage(t, db, "包月日常", 30)
 	cid := mustCustomer(t, db, "1234", "老张")
 	today := domain.Today()
 
@@ -162,84 +161,9 @@ func TestExtendDaysRejectsBackwards(t *testing.T) {
 	}
 }
 
-func TestAddCountAndCheckinConsumption(t *testing.T) {
-	db := newTestDB(t)
-	pkg := mustPackage(t, db, "深渊十次", domain.UnitCount, 10)
-	cid := mustCustomer(t, db, "5678", "大鹏")
-	today := domain.Today()
-
-	sub, err := db.CreateSub(CreateSubInput{
-		CustomerID: cid, PackageID: pkg.ID, StartDate: domain.Date(today), TotalCount: 10,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if sub.TotalCount != 10 || sub.UsedCount != 0 {
-		t.Fatalf("total=%d used=%d", sub.TotalCount, sub.UsedCount)
-	}
-
-	// 打卡完成 → 扣 1 次
-	if err := db.SaveCheckin(sub.ID, domain.Date(today), "done", "", 0); err != nil {
-		t.Fatal(err)
-	}
-	got, _ := db.Sub(sub.ID)
-	if got.UsedCount != 1 {
-		t.Fatalf("used=%d want 1", got.UsedCount)
-	}
-
-	// 同一天改成「跳过」→ 返还
-	if err := db.SaveCheckin(sub.ID, domain.Date(today), "skipped", "", 0); err != nil {
-		t.Fatal(err)
-	}
-	got, _ = db.Sub(sub.ID)
-	if got.UsedCount != 0 {
-		t.Fatalf("used=%d want 0", got.UsedCount)
-	}
-
-	// 再改回完成 → 再扣
-	if err := db.SaveCheckin(sub.ID, domain.Date(today), "done", "", 0); err != nil {
-		t.Fatal(err)
-	}
-	got, _ = db.Sub(sub.ID)
-	if got.UsedCount != 1 {
-		t.Fatalf("used=%d want 1", got.UsedCount)
-	}
-
-	// 撤销打卡 → 返还
-	ci, err := db.CheckinFor(sub.ID, domain.Date(today))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := db.DeleteCheckin(ci.ID, 0); err != nil {
-		t.Fatal(err)
-	}
-	got, _ = db.Sub(sub.ID)
-	if got.UsedCount != 0 {
-		t.Fatalf("used=%d want 0", got.UsedCount)
-	}
-
-	// 次数用尽后不能再打卡
-	_, _ = db.sql.Exec(`UPDATE subscriptions SET used_count=total_count WHERE id=?`, sub.ID)
-	if err := db.SaveCheckin(sub.ID, domain.Date(domain.AddDays(today, -1)), "done", "", 0); err == nil {
-		t.Fatal("次数用尽时打卡应被拒绝")
-	}
-
-	// 追加次数
-	if err := db.AddCount(sub.ID, 5, "", "加购", 0); err != nil {
-		t.Fatal(err)
-	}
-	got, _ = db.Sub(sub.ID)
-	if got.TotalCount != 15 {
-		t.Fatalf("total=%d want 15", got.TotalCount)
-	}
-	if err := db.SaveCheckin(sub.ID, domain.Date(domain.AddDays(today, -1)), "done", "", 0); err != nil {
-		t.Fatalf("追加后应可打卡: %v", err)
-	}
-}
-
 func TestPauseResumeShiftsEndDate(t *testing.T) {
 	db := newTestDB(t)
-	pkg := mustPackage(t, db, "包月日常", domain.UnitDay, 30)
+	pkg := mustPackage(t, db, "包月日常", 30)
 	cid := mustCustomer(t, db, "1234", "老张")
 	today := domain.Today()
 
@@ -275,35 +199,9 @@ func TestPauseResumeShiftsEndDate(t *testing.T) {
 	}
 }
 
-func TestCalendarSubsExcludesOpenEndedCount(t *testing.T) {
-	db := newTestDB(t)
-	dayPkg := mustPackage(t, db, "包月日常", domain.UnitDay, 30)
-	cntPkg := mustPackage(t, db, "深渊十次", domain.UnitCount, 10)
-	today := domain.Today()
-	cid := mustCustomer(t, db, "1234", "老张")
-
-	daySub, _ := db.CreateSub(CreateSubInput{
-		CustomerID: cid, PackageID: dayPkg.ID, StartDate: domain.Date(today), Days: 30,
-	})
-	cid2 := mustCustomer(t, db, "5678", "大鹏")
-	if _, err := db.CreateSub(CreateSubInput{
-		CustomerID: cid2, PackageID: cntPkg.ID, StartDate: domain.Date(today), TotalCount: 10,
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	subs, err := db.CalendarSubs(domain.Date(today), domain.Date(today))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(subs) != 1 || subs[0].ID != daySub.ID {
-		t.Fatalf("无有效期的按次订阅不应出现在日历: %+v", subs)
-	}
-}
-
 func TestBackup(t *testing.T) {
 	db := newTestDB(t)
-	mustPackage(t, db, "包月日常", domain.UnitDay, 30)
+	mustPackage(t, db, "包月日常", 30)
 	path, err := db.BackupNow(14)
 	if err != nil {
 		t.Fatalf("备份失败: %v", err)
@@ -336,13 +234,13 @@ func TestSettingsAndBadges(t *testing.T) {
 		t.Fatalf("默认值=%s", got)
 	}
 
-	pkg := mustPackage(t, db, "包月日常", domain.UnitDay, 30)
+	pkg := mustPackage(t, db, "包月日常", 30)
 	cid := mustCustomer(t, db, "1234", "老张")
 	today := domain.Today()
 	_, _ = db.CreateSub(CreateSubInput{
 		CustomerID: cid, PackageID: pkg.ID, StartDate: domain.Date(domain.AddDays(today, -30)), Days: 31,
 	})
-	due, due3, err := db.Badges(today)
+	due, due3, _, err := db.Badges(today)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -356,14 +254,14 @@ func TestSearchByTail(t *testing.T) {
 	mustCustomer(t, db, "8899", "阿飞")
 	mustCustomer(t, db, "8890", "阿飞二号")
 	today := domain.Today()
-	list, total, err := db.ListCustomers("8899", 20, 0, domain.Date(today), 3)
+	list, total, err := db.ListCustomers("8899", 20, 0, domain.Date(today), 3, false)
 	if err != nil {
 		t.Fatal(err)
 	}
 	if total != 1 || len(list) != 1 || list[0].Name != "阿飞" {
 		t.Fatalf("搜索命中 %d 条", total)
 	}
-	list, total, _ = db.ListCustomers("889", 20, 0, domain.Date(today), 3)
+	list, total, _ = db.ListCustomers("889", 20, 0, domain.Date(today), 3, false)
 	if total != 2 {
 		t.Fatalf("前缀搜索应命中 2 条，实际 %d", total)
 	}
@@ -383,33 +281,9 @@ func TestUniqueCustomer(t *testing.T) {
 
 var _ = time.Now
 
-func TestScreenTopLimitedToTen(t *testing.T) {
-	db := newTestDB(t)
-	pkg := mustPackage(t, db, "包月日常", domain.UnitDay, 30)
-	today := domain.Today()
-	for i := 0; i < 12; i++ {
-		cid, err := db.CreateCustomer(&Customer{Tail: "T" + strconv.Itoa(i), Name: "客户" + strconv.Itoa(i)})
-		if err != nil {
-			t.Fatalf("建客户失败: %v", err)
-		}
-		if _, err := db.CreateSub(CreateSubInput{
-			CustomerID: cid, PackageID: pkg.ID, StartDate: domain.Date(today), Days: 30 - i,
-		}); err != nil {
-			t.Fatalf("建订阅失败: %v", err)
-		}
-	}
-	st, err := db.ScreenStats(today, 3)
-	if err != nil {
-		t.Fatalf("统计失败: %v", err)
-	}
-	if len(st.Top) != 10 {
-		t.Fatalf("TOP 榜应为 10 条，实际 %d 条", len(st.Top))
-	}
-}
-
 func TestBackupKeepPrune(t *testing.T) {
 	db := newTestDB(t)
-	mustPackage(t, db, "包月日常", domain.UnitDay, 30)
+	mustPackage(t, db, "包月日常", 30)
 	dir := db.BackupDir()
 	names := []string{
 		"daili-20260101-000001.db",
@@ -477,7 +351,7 @@ func TestSingleFileDatabase(t *testing.T) {
 		t.Fatalf("journal_mode=%s err=%v", mode, err)
 	}
 
-	pkg := mustPackage(t, db, "包月日常", domain.UnitDay, 30)
+	pkg := mustPackage(t, db, "包月日常", 30)
 	cid := mustCustomer(t, db, "1234", "老张")
 	if _, err := db.CreateSub(CreateSubInput{
 		CustomerID: cid, PackageID: pkg.ID, StartDate: domain.Date(domain.Today()), Days: 30,
@@ -512,7 +386,7 @@ func TestCopyDatabaseIsLossless(t *testing.T) {
 	if err := db.Migrate(); err != nil {
 		t.Fatal(err)
 	}
-	pkg := mustPackage(t, db, "包月日常", domain.UnitDay, 30)
+	pkg := mustPackage(t, db, "包月日常", 30)
 	cid := mustCustomer(t, db, "1234", "老张")
 	sub, err := db.CreateSub(CreateSubInput{
 		CustomerID: cid, PackageID: pkg.ID, StartDate: domain.Date(domain.Today()), Days: 30,
@@ -647,3 +521,533 @@ func TestOpenLegacyWALDatabaseKeepsData(t *testing.T) {
 		t.Fatalf("旧库未切到单文件模式: %s", mode)
 	}
 }
+
+func TestPackageCalendarSeparate(t *testing.T) {
+	db := newTestDB(t)
+	pkg := mustPackage(t, db, "每日任务", 30)
+	if pkg.CalendarSeparate {
+		t.Fatal("新建套餐默认不应勾选独立日历")
+	}
+	pkg.CalendarSeparate = true
+	if err := db.UpdatePackage(pkg); err != nil {
+		t.Fatal(err)
+	}
+	got, err := db.Package(pkg.ID)
+	if err != nil || !got.CalendarSeparate {
+		t.Fatalf("独立日历标记未保存: %+v err=%v", got, err)
+	}
+	list, err := db.ListPackages(true)
+	if err != nil || len(list) != 1 || !list[0].CalendarSeparate {
+		t.Fatalf("列表未带独立日历标记: %+v err=%v", list, err)
+	}
+	got.CalendarSeparate = false
+	if err := db.UpdatePackage(got); err != nil {
+		t.Fatal(err)
+	}
+	if again, _ := db.Package(pkg.ID); again.CalendarSeparate {
+		t.Fatal("取消勾选失败")
+	}
+}
+
+func TestTaskUrgentFlags(t *testing.T) {
+	db := newTestDB(t)
+	pkg := mustPackage(t, db, "包月日常", 30)
+	cid := mustCustomer(t, db, "4321", "老王")
+	sub1, err := db.CreateSub(CreateSubInput{
+		CustomerID: cid, PackageID: pkg.ID, StartDate: domain.Date(domain.Today()), Days: 30,
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	pkg2 := mustPackage(t, db, "包周", 7)
+	sub2, err := db.CreateSub(CreateSubInput{
+		CustomerID: cid, PackageID: pkg2.ID, StartDate: domain.Date(domain.Today()), Days: 7,
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	d1 := domain.Date(domain.Today())
+	d2 := domain.Date(domain.AddDays(domain.Today(), 1))
+
+	if err := db.SetUrgent(sub1.ID, d1, true); err != nil {
+		t.Fatal(err)
+	}
+	if err := db.SetUrgent(sub2.ID, d2, true); err != nil {
+		t.Fatal(err)
+	}
+	flags, err := db.UrgentFlags(d1, d2)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !flags[sub1.ID][d1] || !flags[sub2.ID][d2] {
+		t.Fatalf("加急标记缺失: %+v", flags)
+	}
+	if ok, _ := db.IsUrgent(sub1.ID, d1); !ok {
+		t.Fatal("IsUrgent 应为 true")
+	}
+	if n, _ := db.CountUrgent(d1, d2); n != 2 {
+		t.Fatalf("加急计数=%d 期望 2", n)
+	}
+	// 重复设置不报错（UPSERT）
+	if err := db.SetUrgent(sub1.ID, d1, true); err != nil {
+		t.Fatalf("重复标记加急失败: %v", err)
+	}
+	// 取消
+	if err := db.SetUrgent(sub1.ID, d1, false); err != nil {
+		t.Fatal(err)
+	}
+	if ok, _ := db.IsUrgent(sub1.ID, d1); ok {
+		t.Fatal("取消加急后仍为 true")
+	}
+	if n, _ := db.CountUrgent(d1, d2); n != 1 {
+		t.Fatalf("取消后计数=%d 期望 1", n)
+	}
+	// 非法日期
+	if err := db.SetUrgent(sub1.ID, "2026-13-40", true); err == nil {
+		t.Fatal("非法日期应报错")
+	}
+	// 不存在的订阅
+	if err := db.SetUrgent(99999, d1, true); err == nil {
+		t.Fatal("不存在的订阅应报错")
+	}
+}
+
+// TestMigrateOldDatabaseAddsColumn 模拟 v1.1 的旧库：packages 表没有 calendar_separate。
+func TestMigrateOldDatabaseAddsColumn(t *testing.T) {
+	dir := t.TempDir()
+	path := filepath.Join(dir, "old.db")
+	dsn := strings.ReplaceAll(path, "\\", "/")
+	old, err := sql.Open("sqlite", dsn)
+	if err != nil {
+		t.Fatal(err)
+	}
+	stmts := []string{
+		`CREATE TABLE packages (
+			id INTEGER PRIMARY KEY AUTOINCREMENT,
+			name TEXT NOT NULL,
+			unit TEXT NOT NULL,
+			default_amount INTEGER NOT NULL DEFAULT 30,
+			price_cents INTEGER,
+			color TEXT NOT NULL DEFAULT '#2F5D50',
+			note TEXT NOT NULL DEFAULT '',
+			archived INTEGER NOT NULL DEFAULT 0,
+			sort_order INTEGER NOT NULL DEFAULT 0,
+			created_at TEXT NOT NULL,
+			updated_at TEXT NOT NULL
+		)`,
+		`INSERT INTO packages(name,unit,default_amount,color,note,archived,sort_order,created_at,updated_at)
+		 VALUES('老套餐','day',30,'#2F5D50','',0,1,'2026-01-01 00:00:00','2026-01-01 00:00:00')`,
+		`CREATE TABLE users (
+			id INTEGER PRIMARY KEY AUTOINCREMENT,
+			username TEXT NOT NULL UNIQUE,
+			display_name TEXT NOT NULL DEFAULT '',
+			password_hash TEXT NOT NULL,
+			is_active INTEGER NOT NULL DEFAULT 1,
+			created_at TEXT NOT NULL,
+			last_login_at TEXT
+		)`,
+		`INSERT INTO users(username,display_name,password_hash,is_active,created_at)
+		 VALUES('admin','老板','x',1,'2026-01-01 00:00:00')`,
+		`CREATE TABLE customers (
+			id INTEGER PRIMARY KEY AUTOINCREMENT,
+			tail TEXT NOT NULL,
+			name TEXT NOT NULL,
+			game_name TEXT NOT NULL DEFAULT '',
+			game_server TEXT NOT NULL DEFAULT '',
+			contact TEXT NOT NULL DEFAULT '',
+			tags TEXT NOT NULL DEFAULT '',
+			source TEXT NOT NULL DEFAULT '',
+			note TEXT NOT NULL DEFAULT '',
+			created_at TEXT NOT NULL,
+			updated_at TEXT NOT NULL,
+			UNIQUE (tail, name)
+		)`,
+		`INSERT INTO customers(tail,name,created_at,updated_at)
+		 VALUES('1001','老客户','2026-01-01 00:00:00','2026-01-01 00:00:00')`,
+	}
+	for _, s := range stmts {
+		if _, err := old.Exec(s); err != nil {
+			t.Fatal(err)
+		}
+	}
+	if err := old.Close(); err != nil {
+		t.Fatal(err)
+	}
+
+	db, err := Open(path)
+	if err != nil {
+		t.Fatalf("打开旧库失败: %v", err)
+	}
+	defer db.Close()
+	if err := db.Migrate(); err != nil {
+		t.Fatalf("迁移失败: %v", err)
+	}
+	pkg, err := db.Package(1)
+	if err != nil {
+		t.Fatalf("读取老套餐失败: %v", err)
+	}
+	if pkg.Name != "老套餐" || pkg.CalendarSeparate {
+		t.Fatalf("老数据/默认值不对: %+v", pkg)
+	}
+	// 新列可写
+	pkg.CalendarSeparate = true
+	if err := db.UpdatePackage(pkg); err != nil {
+		t.Fatal(err)
+	}
+	if got, _ := db.Package(1); !got.CalendarSeparate {
+		t.Fatal("迁移后新列不可写")
+	}
+	// 老客户仍可读
+	if _, err := db.Customer(1); err != nil {
+		t.Fatalf("老客户读取失败: %v", err)
+	}
+	// 老套餐已被规范化成按日
+	if pkg.UnitLabel() != "按日" {
+		t.Fatalf("老套餐未规范化为按日: %s", pkg.UnitLabel())
+	}
+	// 迁移后仍可新建套餐（老库 packages.unit 是 NOT NULL 且没有默认值）
+	if _, err := db.CreatePackage(&Package{Name: "新套餐", DefaultAmount: 7, Color: "#123456"}); err != nil {
+		t.Fatalf("迁移后无法新建套餐: %v", err)
+	}
+
+	// 新表 task_flags 已建立
+	var tbl string
+	if err := db.sql.QueryRow(`SELECT name FROM sqlite_master WHERE type='table' AND name='task_flags'`).Scan(&tbl); err != nil {
+		t.Fatalf("task_flags 表未建立: %v", err)
+	}
+	// 迁移可重复执行
+	if err := db.Migrate(); err != nil {
+		t.Fatalf("重复迁移失败: %v", err)
+	}
+}
+
+// TestSingleUserAccount 覆盖 lite 版只保留一个账户后的账户与会话行为。
+func TestSingleUserAccount(t *testing.T) {
+	db := newTestDB(t)
+
+	u, err := db.CreateUser("admin", "老板", "daili123")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if u.ID != 1 {
+		t.Fatalf("首个账户 id 应为 1，实际 %d", u.ID)
+	}
+	if n, _ := db.CountUsers(); n != 1 {
+		t.Fatalf("账户数=%d want 1", n)
+	}
+	// 用户名唯一：不会再出现第二个账户
+	if _, err := db.CreateUser("admin", "另一个", "daili123"); err == nil {
+		t.Fatal("重复用户名应被拒绝")
+	}
+
+	// 登录
+	if _, err := db.Authenticate("admin", "daili123"); err != nil {
+		t.Fatalf("正确密码应可登录: %v", err)
+	}
+	if _, err := db.Authenticate("admin", "wrong"); err == nil {
+		t.Fatal("错误密码不应通过")
+	}
+
+	// 改密码后旧密码失效
+	if err := db.UpdatePassword(u.ID, "newpass123"); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := db.Authenticate("admin", "daili123"); err == nil {
+		t.Fatal("旧密码不应还能登录")
+	}
+	if _, err := db.Authenticate("admin", "newpass123"); err != nil {
+		t.Fatalf("新密码应可登录: %v", err)
+	}
+
+	// 改显示名称
+	if err := db.UpdateDisplayName(u.ID, "  强哥  "); err != nil {
+		t.Fatal(err)
+	}
+	got, err := db.UserByID(u.ID)
+	if err != nil || got.DisplayName != "强哥" {
+		t.Fatalf("显示名称未更新: %+v err=%v", got, err)
+	}
+}
+
+// TestSessionLifecycle 覆盖会话创建、过期清理与登出。
+func TestSessionLifecycle(t *testing.T) {
+	db := newTestDB(t)
+	u, err := db.CreateUser("admin", "老板", "daili123")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	token := "tok-test"
+	if err := db.CreateSession(token, u.ID, time.Hour, "127.0.0.1"); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := db.SessionUser(token); err != nil {
+		t.Fatalf("会话应有效: %v", err)
+	}
+	// 过期会话不可用，且会被删除
+	if err := db.CreateSession("tok-old", u.ID, -time.Hour, "127.0.0.1"); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := db.SessionUser("tok-old"); err == nil {
+		t.Fatal("过期会话不应有效")
+	}
+	// 登出
+	if err := db.DeleteSession(token); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := db.SessionUser(token); err == nil {
+		t.Fatal("登出后会话应失效")
+	}
+	db.PurgeSessions()
+}
+
+func TestCustomerArchiveFilters(t *testing.T) {
+	db := newTestDB(t)
+	pkg := mustPackage(t, db, "包月日常", 30)
+
+	// 一个正常客户 + 一个按次客户
+	cid := mustCustomer(t, db, "7001", "小张")
+	sub, err := db.CreateSub(CreateSubInput{
+		CustomerID: cid, PackageID: pkg.ID, StartDate: domain.Date(domain.Today()), Days: 10,
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	// 打卡 + 加急，稍后验证级联删除
+	if err := db.SaveCheckin(sub.ID, domain.Date(domain.Today()), "done", "", 0); err != nil {
+		t.Fatal(err)
+	}
+	if err := db.SetUrgent(sub.ID, domain.Date(domain.Today()), true); err != nil {
+		t.Fatal(err)
+	}
+
+	today := domain.Date(domain.Today())
+	subs, err := db.CalendarSubs(today, today)
+	if err != nil || len(subs) != 1 {
+		t.Fatalf("停用前日历应有 1 条: %v err=%v", len(subs), err)
+	}
+	if n, _ := db.CustomerCount(); n != 1 {
+		t.Fatalf("停用前客户数=1, got %d", n)
+	}
+
+	// 停用
+	if err := db.SetCustomerArchived(cid, true); err != nil {
+		t.Fatal(err)
+	}
+	if subs, _ := db.CalendarSubs(today, today); len(subs) != 0 {
+		t.Fatalf("停用后不应上日历: %d", len(subs))
+	}
+	if due, _ := db.DueOn(domain.Date(domain.AddDays(domain.Today(), 9))); len(due) != 0 {
+		t.Fatalf("停用后不应提醒到期: %d", len(due))
+	}
+	if n, _ := db.CustomerCount(); n != 0 {
+		t.Fatalf("停用后客户数应为 0, got %d", n)
+	}
+	if list, total, _ := db.ListCustomers("", 50, 0, today, 3, false); total != 0 || len(list) != 0 {
+		t.Fatalf("默认列表不应包含停用客户: total=%d", total)
+	}
+	if list, total, _ := db.ListCustomers("", 50, 0, today, 3, true); total != 1 || len(list) != 1 || !list[0].Archived {
+		t.Fatalf("已停用视图应包含: total=%d list=%+v", total, list)
+	}
+	if c, _ := db.Customer(cid); !c.Archived {
+		t.Fatal("Customer() 应返回 Archived=true")
+	}
+	if due, _, _, _ := db.Badges(domain.Today()); due != 0 {
+		t.Fatalf("停用后徽标应为 0, got %d", due)
+	}
+	if all, _ := db.CustomersByTail("7001"); len(all) != 0 {
+		t.Fatalf("停用客户不应被尾号搜到: %d", len(all))
+	}
+
+	// 恢复
+	if err := db.SetCustomerArchived(cid, false); err != nil {
+		t.Fatal(err)
+	}
+	if subs, _ := db.CalendarSubs(today, today); len(subs) != 1 {
+		t.Fatalf("恢复后应回到日历: %d", len(subs))
+	}
+
+	// 彻底删除：订阅/打卡/加急一起消失
+	if err := db.DeleteCustomer(cid); err != nil {
+		t.Fatal(err)
+	}
+	if _, err := db.Customer(cid); err == nil {
+		t.Fatal("删除后不应还能查到客户")
+	}
+	if subs, _ := db.CalendarSubs(today, today); len(subs) != 0 {
+		t.Fatalf("删除后订阅应级联消失: %d", len(subs))
+	}
+	var flags, checkins int
+	_ = db.sql.QueryRow(`SELECT COUNT(*) FROM task_flags`).Scan(&flags)
+	_ = db.sql.QueryRow(`SELECT COUNT(*) FROM checkins`).Scan(&checkins)
+	if flags != 0 || checkins != 0 {
+		t.Fatalf("删除后打卡/加急应级联删除: flags=%d checkins=%d", flags, checkins)
+	}
+	if err := db.DeleteCustomer(9999); err == nil {
+		t.Fatal("删除不存在的客户应报错")
+	}
+}
+
+// TestNormalizeLegacyTypeData 验证 main 分支遗留的「按次 / 通行证 / 深渊」
+// 数据在 lite 版迁移后统一折算成按日。
+func TestNormalizeLegacyTypeData(t *testing.T) {
+	dir := t.TempDir()
+	path := filepath.Join(dir, "legacy.db")
+	old, err := sql.Open("sqlite", strings.ReplaceAll(path, "\\", "/"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	stmts := []string{
+		`CREATE TABLE packages (
+			id INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT NOT NULL,
+			unit TEXT NOT NULL CHECK (unit IN ('day','count')),
+			default_amount INTEGER NOT NULL DEFAULT 30, price_cents INTEGER,
+			color TEXT NOT NULL DEFAULT '#3B6EA5', note TEXT NOT NULL DEFAULT '',
+			archived INTEGER NOT NULL DEFAULT 0, sort_order INTEGER NOT NULL DEFAULT 0,
+			calendar_separate INTEGER NOT NULL DEFAULT 0, tag TEXT NOT NULL DEFAULT '',
+			season INTEGER NOT NULL DEFAULT 0, default_validity_days INTEGER NOT NULL DEFAULT 0,
+			season_start TEXT NOT NULL DEFAULT '', season_end TEXT NOT NULL DEFAULT '',
+			abyss INTEGER NOT NULL DEFAULT 0, cycle_days INTEGER NOT NULL DEFAULT 0,
+			created_at TEXT NOT NULL, updated_at TEXT NOT NULL)`,
+		`CREATE TABLE customers (
+			id INTEGER PRIMARY KEY AUTOINCREMENT, tail TEXT NOT NULL, name TEXT NOT NULL,
+			game_name TEXT NOT NULL DEFAULT '', game_server TEXT NOT NULL DEFAULT '',
+			contact TEXT NOT NULL DEFAULT '', tags TEXT NOT NULL DEFAULT '',
+			source TEXT NOT NULL DEFAULT '', note TEXT NOT NULL DEFAULT '',
+			archived INTEGER NOT NULL DEFAULT 0,
+			created_at TEXT NOT NULL, updated_at TEXT NOT NULL, UNIQUE (tail, name))`,
+		`CREATE TABLE subscriptions (
+			id INTEGER PRIMARY KEY AUTOINCREMENT, customer_id INTEGER NOT NULL, package_id INTEGER NOT NULL,
+			unit TEXT NOT NULL CHECK (unit IN ('day','count')),
+			status TEXT NOT NULL DEFAULT 'active' CHECK (status IN ('active','paused','closed')),
+			start_date TEXT NOT NULL, end_date TEXT,
+			total_count INTEGER NOT NULL DEFAULT 0, used_count INTEGER NOT NULL DEFAULT 0,
+			season INTEGER NOT NULL DEFAULT 0, season_done TEXT NOT NULL DEFAULT '',
+			abyss INTEGER NOT NULL DEFAULT 0, cycle_days INTEGER NOT NULL DEFAULT 0,
+			note TEXT NOT NULL DEFAULT '', created_by INTEGER,
+			created_at TEXT NOT NULL, updated_at TEXT NOT NULL, closed_at TEXT,
+			UNIQUE (customer_id, package_id))`,
+		// 三个套餐：按次 / 通行证 / 深渊
+		`INSERT INTO packages(name,unit,default_amount,color,season,season_start,season_end,abyss,cycle_days,created_at,updated_at)
+		 VALUES('十次副本','count',10,'#111111',0,'','',0,0,'2026-01-01 00:00:00','2026-01-01 00:00:00')`,
+		`INSERT INTO packages(name,unit,default_amount,color,season,season_start,season_end,abyss,cycle_days,created_at,updated_at)
+		 VALUES('通行证','day',1,'#222222',1,'2026-01-01','2026-01-31',0,0,'2026-01-01 00:00:00','2026-01-01 00:00:00')`,
+		`INSERT INTO packages(name,unit,default_amount,color,season,season_start,season_end,abyss,cycle_days,created_at,updated_at)
+		 VALUES('深渊','day',4,'#333333',0,'','',1,7,'2026-01-01 00:00:00','2026-01-01 00:00:00')`,
+		`INSERT INTO customers(tail,name,created_at,updated_at) VALUES('1001','甲','2026-01-01 00:00:00','2026-01-01 00:00:00')`,
+		`INSERT INTO customers(tail,name,created_at,updated_at) VALUES('1002','乙','2026-01-01 00:00:00','2026-01-01 00:00:00')`,
+		`INSERT INTO customers(tail,name,created_at,updated_at) VALUES('1003','丙','2026-01-01 00:00:00','2026-01-01 00:00:00')`,
+		// 按次：10 次、已用 4 次、没有结束日 → 应折算成 2026-01-01 起共 10 天
+		`INSERT INTO subscriptions(customer_id,package_id,unit,status,start_date,end_date,total_count,used_count,created_at,updated_at)
+		 VALUES(1,1,'count','active','2026-01-01',NULL,10,4,'2026-01-01 00:00:00','2026-01-01 00:00:00')`,
+		// 通行证：区间完整，清标记即可
+		`INSERT INTO subscriptions(customer_id,package_id,unit,status,start_date,end_date,season,created_at,updated_at)
+		 VALUES(2,2,'day','active','2026-01-01','2026-01-31',1,'2026-01-01 00:00:00','2026-01-01 00:00:00')`,
+		// 深渊：周期 7 天 × 4 周期
+		`INSERT INTO subscriptions(customer_id,package_id,unit,status,start_date,end_date,abyss,cycle_days,total_count,created_at,updated_at)
+		 VALUES(3,3,'day','active','2026-02-01','2026-02-28',1,7,4,'2026-01-01 00:00:00','2026-01-01 00:00:00')`,
+	}
+	for _, s := range stmts {
+		if _, err := old.Exec(s); err != nil {
+			t.Fatalf("准备老库失败: %v\nSQL: %s", err, s)
+		}
+	}
+	if err := old.Close(); err != nil {
+		t.Fatal(err)
+	}
+
+	db, err := Open(path)
+	if err != nil {
+		t.Fatalf("打开老库失败: %v", err)
+	}
+	defer db.Close()
+	if err := db.Migrate(); err != nil {
+		t.Fatalf("迁移失败: %v", err)
+	}
+
+	// 套餐：全部按日，season / abyss / cycle_days 归零
+	pkgs, err := db.ListPackages(true)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(pkgs) != 3 {
+		t.Fatalf("套餐数量=%d want 3", len(pkgs))
+	}
+	for _, p := range pkgs {
+		if p.UnitLabel() != "按日" {
+			t.Fatalf("套餐 %q 未折算成按日: %s", p.Name, p.UnitLabel())
+		}
+	}
+	var legacy int
+	if err := db.sql.QueryRow(`SELECT COUNT(*) FROM packages WHERE unit<>'day' OR season<>0 OR abyss<>0 OR cycle_days<>0`).Scan(&legacy); err != nil {
+		t.Fatal(err)
+	}
+	if legacy != 0 {
+		t.Fatalf("仍有 %d 个套餐残留旧类型字段", legacy)
+	}
+
+	// 按次订阅：折算成 10 天，剩余 10 天
+	sub1, err := db.Sub(1)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if sub1.StartDate != "2026-01-01" || sub1.EndDate != "2026-01-10" {
+		t.Fatalf("按次订阅折算区间不对: %s → %s", sub1.StartDate, sub1.EndDate)
+	}
+	// 通行证订阅：区间保留
+	sub2, err := db.Sub(2)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if sub2.StartDate != "2026-01-01" || sub2.EndDate != "2026-01-31" {
+		t.Fatalf("通行证订阅区间被改动: %s → %s", sub2.StartDate, sub2.EndDate)
+	}
+	// 深渊订阅：区间保留
+	sub3, err := db.Sub(3)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if sub3.StartDate != "2026-02-01" || sub3.EndDate != "2026-02-28" {
+		t.Fatalf("深渊订阅区间被改动: %s → %s", sub3.StartDate, sub3.EndDate)
+	}
+	// 迁移可重复执行
+	if err := db.Migrate(); err != nil {
+		t.Fatalf("重复迁移失败: %v", err)
+	}
+}
+
+func TestPackageTag(t *testing.T) {
+	db := newTestDB(t)
+
+	p1 := mustPackage(t, db, "包月活动托", 30)
+	if p1.Tag != "" {
+		t.Fatalf("默认标签应为空: %q", p1.Tag)
+	}
+	p1.Tag = "包月"
+	if err := db.UpdatePackage(p1); err != nil {
+		t.Fatal(err)
+	}
+	got, err := db.Package(p1.ID)
+	if err != nil || got.Tag != "包月" {
+		t.Fatalf("标签未保存: %+v err=%v", got, err)
+	}
+
+	p2 := &Package{Name: "深渊委托", DefaultAmount: 10, Color: "#8C4A3C", Tag: " 包月 "}
+	if _, err := db.CreatePackage(p2); err != nil {
+		t.Fatal(err)
+	}
+	tags, err := db.PackageTags()
+	if err != nil || len(tags) != 1 || tags[0] != "包月" {
+		t.Fatalf("标签去重/去空格失败: %+v err=%v", tags, err)
+	}
+
+	list, err := db.ListPackages(true)
+	if err != nil || len(list) != 2 {
+		t.Fatalf("列表应有 2 个套餐: %d err=%v", len(list), err)
+	}
+	for _, p := range list {
+		if p.Tag != "包月" {
+			t.Fatalf("列表标签不对: %+v", p)
+		}
+	}
+}

internal/store/subscriptions.go

@@ -10,17 +10,14 @@ import (
 	"daili/internal/domain"
 )
 
-// Subscription 服务订阅。
+// Subscription 服务订阅（lite 版只有按日：一定有开始日与结束日）。
 type Subscription struct {
 	ID         int64
 	CustomerID int64
 	PackageID  int64
-	Unit       string
 	Status     string
 	StartDate  string
 	EndDate    string
-	TotalCount int
-	UsedCount  int
 	Note       string
 	CreatedBy  int64
 	CreatedAt  string
@@ -37,12 +34,9 @@ type Subscription struct {
 
 // Eval 计算展示状态。
 func (s *Subscription) Eval(today time.Time, warnDays int) domain.Eval {
-	return domain.EvalSub(s.Unit, s.Status, s.StartDate, s.EndDate, s.TotalCount, s.UsedCount, today, warnDays)
+	return domain.EvalSub(s.Status, s.StartDate, s.EndDate, today, warnDays)
 }
 
-// IsCount 是否按次套餐。
-func (s *Subscription) IsCount() bool { return s.Unit == domain.UnitCount }
-
 // Pause 暂停分段。
 type Pause struct {
 	ID        int64
@@ -62,9 +56,6 @@ type Adjustment struct {
 	OldEndDate   string
 	NewEndDate   string
 	DaysAdded    int
-	CountAdded   int
-	OldTotal     int
-	NewTotal     int
 	Note         string
 	OperatorID   int64
 	OperatorName string
@@ -83,16 +74,14 @@ func (a *Adjustment) KindLabel() string {
 		return "开通"
 	case "extend_days":
 		return "追加天数"
-	case "add_count":
-		return "追加次数"
 	case "set_end_date":
 		return "调整结束日"
 	}
 	return "调整"
 }
 
-const subSelect = `SELECT s.id,s.customer_id,s.package_id,s.unit,s.status,s.start_date,IFNULL(s.end_date,''),
+const subSelect = `SELECT s.id,s.customer_id,s.package_id,s.status,s.start_date,IFNULL(s.end_date,''),
-	s.total_count,s.used_count,s.note,IFNULL(s.created_by,0),s.created_at,s.updated_at,IFNULL(s.closed_at,''),
+	s.note,IFNULL(s.created_by,0),s.created_at,s.updated_at,IFNULL(s.closed_at,''),
 	p.name,p.color,c.tail,c.name,IFNULL(c.contact,'')
 	FROM subscriptions s
 	JOIN packages p ON p.id=s.package_id
@@ -100,8 +89,8 @@ const subSelect = `SELECT s.id,s.customer_id,s.package_id,s.unit,s.status,s.star
 
 func scanSub(row interface{ Scan(dest ...any) error }) (*Subscription, error) {
 	var s Subscription
-	err := row.Scan(&s.ID, &s.CustomerID, &s.PackageID, &s.Unit, &s.Status, &s.StartDate, &s.EndDate,
+	err := row.Scan(&s.ID, &s.CustomerID, &s.PackageID, &s.Status, &s.StartDate, &s.EndDate,
-		&s.TotalCount, &s.UsedCount, &s.Note, &s.CreatedBy, &s.CreatedAt, &s.UpdatedAt, &s.ClosedAt,
+		&s.Note, &s.CreatedBy, &s.CreatedAt, &s.UpdatedAt, &s.ClosedAt,
 		&s.PackageName, &s.PackageColor, &s.CustomerTail, &s.CustomerName, &s.CustomerContact)
 	if err != nil {
 		if errors.Is(err, sql.ErrNoRows) {
@@ -169,7 +158,7 @@ type SubFilter struct {
 	Today     time.Time
 }
 
-const expiredExpr = `((s.unit='day' AND s.end_date < ?) OR (s.unit='count' AND (s.used_count>=s.total_count OR (IFNULL(s.end_date,'')<>'' AND s.end_date < ?))))`
+const expiredExpr = `(IFNULL(s.end_date,'')<>'' AND s.end_date < ?)`
 
 // ListSubs 分页查询订阅。
 func (db *DB) ListSubs(f SubFilter) ([]Subscription, int, error) {
@@ -188,14 +177,14 @@ func (db *DB) ListSubs(f SubFilter) ([]Subscription, int, error) {
 	switch f.State {
 	case "active":
 		where = append(where, "s.status='active'", "NOT "+expiredExpr)
-		args = append(args, today, today)
+		args = append(args, today)
 	case "paused":
 		where = append(where, "s.status='paused'")
 	case "closed":
 		where = append(where, "s.status='closed'")
 	case "expired":
 		where = append(where, "s.status<>'closed'", expiredExpr)
-		args = append(args, today, today)
+		args = append(args, today)
 	case "due7":
 		where = append(where, "s.status<>'closed'", "s.end_date IS NOT NULL", "s.end_date BETWEEN ? AND ?")
 		args = append(args, today, domain.Date(domain.AddDays(f.Today, 6)))
@@ -223,14 +212,14 @@ func (db *DB) ListSubs(f SubFilter) ([]Subscription, int, error) {
 
 // CalendarSubs 取与 [from,to] 日期区间相交的订阅（用于日历）。
 func (db *DB) CalendarSubs(from, to string) ([]Subscription, error) {
-	return db.querySubs(subSelect+` WHERE s.status<>'closed'
+	return db.querySubs(subSelect+` WHERE s.status<>'closed' AND IFNULL(c.archived,0)=0
 		AND s.start_date <= ? AND IFNULL(s.end_date,'')<>'' AND s.end_date >= ?
 		ORDER BY s.id`, to, from)
 }
 
 // DueOn 某天到期的订阅。
 func (db *DB) DueOn(date string) ([]Subscription, error) {
-	return db.querySubs(subSelect+` WHERE s.status<>'closed' AND s.end_date=? ORDER BY s.id`, date)
+	return db.querySubs(subSelect+` WHERE s.status<>'closed' AND IFNULL(c.archived,0)=0 AND s.end_date=? ORDER BY s.id`, date)
 }
 
 // CreateSubInput 新建订阅入参。
@@ -240,7 +229,6 @@ type CreateSubInput struct {
 	StartDate  string
 	EndDate    string
 	Days       int
-	TotalCount int
 	Note       string
 	OperatorID int64
 }
@@ -258,49 +246,27 @@ func (db *DB) CreateSub(in CreateSubInput) (*Subscription, error) {
 	if err != nil {
 		return nil, errors.New("开始日期格式不正确")
 	}
-	unit := pkg.Unit
+
+	days := in.Days
+	if days <= 0 {
+		days = pkg.DefaultAmount
+	}
+	if days <= 0 {
+		days = 30
+	}
 	endDate := ""
-	days := 0
+	if in.EndDate != "" {
-	total := 0
+		end, err := domain.ParseDate(in.EndDate)
-	if unit == domain.UnitDay {
+		if err != nil {
-		days = in.Days
+			return nil, errors.New("结束日期格式不正确")
-		if days <= 0 {
-			days = pkg.DefaultAmount
 		}
-		if days <= 0 {
+		if domain.DayDiff(start, end) < 0 {
-			days = 30
+			return nil, errors.New("结束日期不能早于开始日期")
-		}
-		if in.EndDate != "" {
-			end, err := domain.ParseDate(in.EndDate)
-			if err != nil {
-				return nil, errors.New("结束日期格式不正确")
-			}
-			if domain.DayDiff(start, end) < 0 {
-				return nil, errors.New("结束日期不能早于开始日期")
-			}
-			endDate = domain.Date(end)
-			days = domain.DayDiff(start, end) + 1
-		} else {
-			endDate = domain.Date(domain.AddDays(start, days-1))
 		}
+		endDate = domain.Date(end)
+		days = domain.DayDiff(start, end) + 1
 	} else {
-		total = in.TotalCount
+		endDate = domain.Date(domain.AddDays(start, days-1))
-		if total <= 0 {
-			total = pkg.DefaultAmount
-		}
-		if total <= 0 {
-			return nil, errors.New("总次数必须大于 0")
-		}
-		if in.EndDate != "" {
-			end, err := domain.ParseDate(in.EndDate)
-			if err != nil {
-				return nil, errors.New("有效期格式不正确")
-			}
-			if domain.DayDiff(start, end) < 0 {
-				return nil, errors.New("有效期不能早于开始日期")
-			}
-			endDate = domain.Date(end)
-		}
 	}
 
 	now := nowStamp()
@@ -315,9 +281,9 @@ func (db *DB) CreateSub(in CreateSubInput) (*Subscription, error) {
 		if !errors.Is(err, sql.ErrNoRows) {
 			return err
 		}
-		res, err := tx.Exec(`INSERT INTO subscriptions(customer_id,package_id,unit,status,start_date,end_date,total_count,used_count,note,created_by,created_at,updated_at)
+		res, err := tx.Exec(`INSERT INTO subscriptions(customer_id,package_id,unit,status,start_date,end_date,note,created_by,created_at,updated_at)
-			VALUES(?,?,?,'active',?,?,?,0,?,?,?,?)`,
+			VALUES(?,?,?,'active',?,?,?,?,?,?)`,
-			in.CustomerID, in.PackageID, unit, domain.Date(start), nullIfEmpty(endDate), total, in.Note, nullIfZero(in.OperatorID), now, now)
+			in.CustomerID, in.PackageID, unitDay, domain.Date(start), nullIfEmpty(endDate), in.Note, nullIfZero(in.OperatorID), now, now)
 		if err != nil {
 			if isUnique(err) {
 				return errors.New("该客户已订阅此套餐，请改用「追加时长」")
@@ -325,9 +291,9 @@ func (db *DB) CreateSub(in CreateSubInput) (*Subscription, error) {
 			return err
 		}
 		id, _ = res.LastInsertId()
-		_, err = tx.Exec(`INSERT INTO sub_adjustments(sub_id,kind,base_date,old_end_date,new_end_date,days_added,count_added,old_total,new_total,note,operator_id,created_at)
+		_, err = tx.Exec(`INSERT INTO sub_adjustments(sub_id,kind,base_date,old_end_date,new_end_date,days_added,note,operator_id,created_at)
-			VALUES(?,?,?,?,?,?,?,?,?,?,?,?)`,
+			VALUES(?,?,?,?,?,?,?,?,?)`,
-			id, "initial", domain.Date(start), "", nullIfEmpty(endDate), days, 0, 0, total, "新建订阅", nullIfZero(in.OperatorID), now)
+			id, "initial", domain.Date(start), "", nullIfEmpty(endDate), days, "新建订阅", nullIfZero(in.OperatorID), now)
 		return err
 	})
 	if err != nil {
@@ -356,9 +322,6 @@ func (db *DB) ExtendDays(subID int64, newEndDate, note string, operatorID int64)
 		if err != nil {
 			return err
 		}
-		if s.Unit != domain.UnitDay {
-			return errors.New("该订阅按次计费，请使用「追加次数」")
-		}
 		if s.Status == domain.StatusClosed {
 			return errors.New("订阅已结束，请先「重新启用」")
 		}
@@ -375,58 +338,14 @@ func (db *DB) ExtendDays(subID int64, newEndDate, note string, operatorID int64)
 			domain.Date(newEnd), status, nowStamp(), subID); err != nil {
 			return err
 		}
-		_, err = tx.Exec(`INSERT INTO sub_adjustments(sub_id,kind,base_date,old_end_date,new_end_date,days_added,count_added,old_total,new_total,note,operator_id,created_at)
+		_, err = tx.Exec(`INSERT INTO sub_adjustments(sub_id,kind,base_date,old_end_date,new_end_date,days_added,note,operator_id,created_at)
-			VALUES(?,?,?,?,?,?,0,0,0,?,?,?)`,
+			VALUES(?,?,?,?,?,?,?,?,?)`,
 			subID, "extend_days", domain.Date(plan.Base), s.EndDate, domain.Date(newEnd), plan.Days, note, nullIfZero(operatorID), nowStamp())
 		return err
 	})
 	return plan, err
 }
 
-// AddCount 按次追加次数（可同时调整有效期）。
-func (db *DB) AddCount(subID int64, add int, newEndDate, note string, operatorID int64) error {
-	if add <= 0 {
-		return errors.New("追加次数必须大于 0")
-	}
-	err := db.withTx(func(tx *sql.Tx) error {
-		s, err := scanSub(tx.QueryRow(subSelect+` WHERE s.id=?`, subID))
-		if err != nil {
-			return err
-		}
-		if s.Unit != domain.UnitCount {
-			return errors.New("该订阅按日计费，请使用「追加天数」")
-		}
-		if s.Status == domain.StatusClosed {
-			return errors.New("订阅已结束，请先「重新启用」")
-		}
-		endDate := s.EndDate
-		if newEndDate != "" {
-			end, err := domain.ParseDate(newEndDate)
-			if err != nil {
-				return errors.New("有效期格式不正确")
-			}
-			if end.Before(domain.ParseDateOr(s.StartDate, domain.Today())) {
-				return errors.New("有效期不能早于开始日期")
-			}
-			endDate = domain.Date(end)
-		}
-		status := s.Status
-		if status == domain.StatusPaused {
-			status = domain.StatusActive
-		}
-		newTotal := s.TotalCount + add
-		if _, err := tx.Exec(`UPDATE subscriptions SET total_count=?, end_date=?, status=?, updated_at=? WHERE id=?`,
-			newTotal, nullIfEmpty(endDate), status, nowStamp(), subID); err != nil {
-			return err
-		}
-		_, err = tx.Exec(`INSERT INTO sub_adjustments(sub_id,kind,old_end_date,new_end_date,days_added,count_added,old_total,new_total,note,operator_id,created_at)
-			VALUES(?,?,?,?,0,?,?,?,?,?,?)`,
-			subID, "add_count", s.EndDate, endDate, add, s.TotalCount, newTotal, note, nullIfZero(operatorID), nowStamp())
-		return err
-	})
-	return err
-}
-
 // PauseSub 暂停订阅。
 func (db *DB) PauseSub(subID, operatorID int64) error {
 	return db.withTx(func(tx *sql.Tx) error {
@@ -449,7 +368,7 @@ func (db *DB) PauseSub(subID, operatorID int64) error {
 	})
 }
 
-// ResumeSub 恢复订阅，按日套餐顺延结束日，返回顺延天数。
+// ResumeSub 恢复订阅，顺延结束日，返回顺延天数。
 func (db *DB) ResumeSub(subID, operatorID int64) (int, error) {
 	var shift int
 	today := domain.Today()
@@ -477,7 +396,7 @@ func (db *DB) ResumeSub(subID, operatorID int64) (int, error) {
 		if _, err := tx.Exec(`UPDATE sub_pauses SET end_at=? WHERE sub_id=? AND end_at IS NULL`, now, subID); err != nil {
 			return err
 		}
-		if s.Unit == domain.UnitDay && shift > 0 {
+		if shift > 0 {
 			oldEnd := domain.ParseDateOr(s.EndDate, today)
 			if _, err := tx.Exec(`UPDATE subscriptions SET end_date=? WHERE id=?`,
 				domain.Date(domain.AddDays(oldEnd, shift)), subID); err != nil {
@@ -507,7 +426,7 @@ func (db *DB) ReopenSub(subID int64) error {
 // AdjustmentsBySub 取某订阅的追加记录（新→旧）。
 func (db *DB) AdjustmentsBySub(subID int64) ([]Adjustment, error) {
 	return db.queryAdjustments(`SELECT a.id,a.sub_id,a.kind,IFNULL(a.base_date,''),IFNULL(a.old_end_date,''),IFNULL(a.new_end_date,''),
-		a.days_added,a.count_added,a.old_total,a.new_total,a.note,IFNULL(a.operator_id,0),IFNULL(u.display_name,''),a.created_at,
+		a.days_added,a.note,IFNULL(a.operator_id,0),IFNULL(u.display_name,''),a.created_at,
 		c.tail,c.name,p.name
 		FROM sub_adjustments a
 		LEFT JOIN users u ON u.id=a.operator_id
@@ -520,7 +439,7 @@ func (db *DB) AdjustmentsBySub(subID int64) ([]Adjustment, error) {
 // RecentAdjustments 最近追加记录。
 func (db *DB) RecentAdjustments(limit int) ([]Adjustment, error) {
 	return db.queryAdjustments(`SELECT a.id,a.sub_id,a.kind,IFNULL(a.base_date,''),IFNULL(a.old_end_date,''),IFNULL(a.new_end_date,''),
-		a.days_added,a.count_added,a.old_total,a.new_total,a.note,IFNULL(a.operator_id,0),IFNULL(u.display_name,''),a.created_at,
+		a.days_added,a.note,IFNULL(a.operator_id,0),IFNULL(u.display_name,''),a.created_at,
 		c.tail,c.name,p.name
 		FROM sub_adjustments a
 		LEFT JOIN users u ON u.id=a.operator_id
@@ -540,7 +459,7 @@ func (db *DB) queryAdjustments(q string, args ...any) ([]Adjustment, error) {
 	for rows.Next() {
 		var a Adjustment
 		if err := rows.Scan(&a.ID, &a.SubID, &a.Kind, &a.BaseDate, &a.OldEndDate, &a.NewEndDate,
-			&a.DaysAdded, &a.CountAdded, &a.OldTotal, &a.NewTotal, &a.Note, &a.OperatorID, &a.OperatorName, &a.CreatedAt,
+			&a.DaysAdded, &a.Note, &a.OperatorID, &a.OperatorName, &a.CreatedAt,
 			&a.CustomerTail, &a.CustomerName, &a.PackageName); err != nil {
 			return nil, err
 		}
@@ -584,10 +503,9 @@ func (db *DB) PausesForSubs(ids []int64) (map[int64][]Pause, error) {
 // CountActiveSubs 活跃订阅数。
 func (db *DB) CountActiveSubs(today string) (int, error) {
 	var n int
-	err := db.sql.QueryRow(`SELECT COUNT(*) FROM subscriptions s WHERE s.status='active' AND (
+	err := db.sql.QueryRow(`SELECT COUNT(*) FROM subscriptions s WHERE s.status='active'
-		(s.unit='day' AND s.end_date >= ?) OR
+		AND IFNULL((SELECT archived FROM customers c WHERE c.id=s.customer_id),0)=0
-		(s.unit='count' AND (IFNULL(s.end_date,'')='' OR s.end_date >= ?) AND s.used_count < s.total_count)
+		AND s.end_date >= ?`, today).Scan(&n)
-	)`, today, today).Scan(&n)
 	return n, err
 }
 
@@ -595,3 +513,15 @@ func (db *DB) CountActiveSubs(today string) (int, error) {
 func (s *Subscription) SubTitle() string {
 	return fmt.Sprintf("%s %s · %s", s.CustomerTail, s.CustomerName, s.PackageName)
 }
+
+// DeleteSubscription 彻底删除订阅；打卡、暂停、追加、加急随外键级联删除。
+func (db *DB) DeleteSubscription(subID int64) error {
+	res, err := db.sql.Exec(`DELETE FROM subscriptions WHERE id=?`, subID)
+	if err != nil {
+		return err
+	}
+	if n, _ := res.RowsAffected(); n == 0 {
+		return ErrNotFound
+	}
+	return nil
+}

internal/store/tasks.go

@@ -0,0 +1,67 @@
+package store
+
+import (
+	"errors"
+
+	"daili/internal/domain"
+)
+
+// UrgentFlags 返回 [from,to] 区间内的加急标记，索引为 [subID][date]。
+// 表里只存“加急=1”的行，未出现即未加急。
+func (db *DB) UrgentFlags(from, to string) (map[int64]map[string]bool, error) {
+	out := map[int64]map[string]bool{}
+	rows, err := db.sql.Query(`SELECT sub_id, service_date FROM task_flags
+		WHERE urgent=1 AND service_date BETWEEN ? AND ?`, from, to)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	for rows.Next() {
+		var subID int64
+		var date string
+		if err := rows.Scan(&subID, &date); err != nil {
+			return nil, err
+		}
+		if out[subID] == nil {
+			out[subID] = map[string]bool{}
+		}
+		out[subID][date] = true
+	}
+	return out, rows.Err()
+}
+
+// SetUrgent 设置或取消某天某订阅的加急标记。
+func (db *DB) SetUrgent(subID int64, date string, urgent bool) error {
+	if _, err := domain.ParseDate(date); err != nil {
+		return errors.New("日期格式不正确")
+	}
+	if _, err := db.Sub(subID); err != nil {
+		return errors.New("订阅不存在")
+	}
+	now := nowStamp()
+	if urgent {
+		_, err := db.sql.Exec(`INSERT INTO task_flags(sub_id, service_date, urgent, created_at, updated_at)
+			VALUES(?,?,1,?,?)
+			ON CONFLICT(sub_id, service_date) DO UPDATE SET urgent=1, updated_at=excluded.updated_at`,
+			subID, date, now, now)
+		return err
+	}
+	_, err := db.sql.Exec(`DELETE FROM task_flags WHERE sub_id=? AND service_date=?`, subID, date)
+	return err
+}
+
+// IsUrgent 查询单条加急状态。
+func (db *DB) IsUrgent(subID int64, date string) (bool, error) {
+	var n int
+	err := db.sql.QueryRow(`SELECT COUNT(*) FROM task_flags WHERE sub_id=? AND service_date=? AND urgent=1`,
+		subID, date).Scan(&n)
+	return n > 0, err
+}
+
+// CountUrgent 统计区间内加急任务数。
+func (db *DB) CountUrgent(from, to string) (int, error) {
+	var n int
+	err := db.sql.QueryRow(`SELECT COUNT(*) FROM task_flags WHERE urgent=1 AND service_date BETWEEN ? AND ?`,
+		from, to).Scan(&n)
+	return n, err
+}

internal/store/users.go

@@ -3,12 +3,16 @@ package store
 import (
 	"database/sql"
 	"errors"
+	"strings"
 	"time"
 
 	"daili/internal/pw"
 )
 
 // User 管理员账户。
+//
+// lite 版只保留首次启动时创建的那一个账户：不再有新增/停用/改他人资料，
+// 因此这里只保留登录、改自己密码与会话相关的最小集合。
 type User struct {
 	ID          int64
 	Username    string
@@ -44,7 +48,7 @@ func (db *DB) CountUsers() (int, error) {
 	return n, err
 }
 
-// CreateUser 新建账户。
+// CreateUser 新建账户。只用于首次初始化，之后不再允许新增。
 func (db *DB) CreateUser(username, displayName, password string) (*User, error) {
 	hash, err := pw.Hash(password)
 	if err != nil {
@@ -88,29 +92,6 @@ func (db *DB) UserByID(id int64) (*User, error) {
 	return scanUser(db.sql.QueryRow(`SELECT `+userCols+` FROM users WHERE id=?`, id))
 }
 
-// UserByUsername 按用户名取账户。
-func (db *DB) UserByUsername(name string) (*User, error) {
-	return scanUser(db.sql.QueryRow(`SELECT `+userCols+` FROM users WHERE username=?`, name))
-}
-
-// ListUsers 列出账户。
-func (db *DB) ListUsers() ([]User, error) {
-	rows, err := db.sql.Query(`SELECT ` + userCols + ` FROM users ORDER BY id`)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var out []User
-	for rows.Next() {
-		u, err := scanUser(rows)
-		if err != nil {
-			return nil, err
-		}
-		out = append(out, *u)
-	}
-	return out, rows.Err()
-}
-
 // UpdatePassword 修改口令。
 func (db *DB) UpdatePassword(userID int64, password string) error {
 	hash, err := pw.Hash(password)
@@ -121,13 +102,9 @@ func (db *DB) UpdatePassword(userID int64, password string) error {
 	return err
 }
 
-// SetUserActive 启用/停用账户。
+// UpdateDisplayName 修改显示名称（仅限自己）。
-func (db *DB) SetUserActive(userID int64, active bool) error {
+func (db *DB) UpdateDisplayName(userID int64, displayName string) error {
-	v := 0
+	_, err := db.sql.Exec(`UPDATE users SET display_name=? WHERE id=?`, strings.TrimSpace(displayName), userID)
-	if active {
-		v = 1
-	}
-	_, err := db.sql.Exec(`UPDATE users SET is_active=? WHERE id=?`, v, userID)
 	return err
 }
 

internal/web/handlers_calendar.go

@@ -3,7 +3,9 @@ package web
 import (
 	"fmt"
 	"net/http"
+	"net/url"
 	"sort"
+	"strings"
 	"time"
 
 	"daili/internal/domain"
@@ -22,9 +24,12 @@ type DayCell struct {
 	DueCount   int
 	TaskCount  int
 	DoneCount  int
+	UrgentCnt  int
 	Heat       int
-	Tickets    []Ticket
+	// PendingCount 当日还没完成的单数（= TaskCount - DoneCount）
-	More       int
+	PendingCount int
+	Tickets      []Ticket
+	More         int
 }
 
 // Ticket 是日历格里的色签。
@@ -37,6 +42,7 @@ type Ticket struct {
 	Done    bool
 	Skipped bool
 	IsDue   bool
+	Urgent  bool
 }
 
 // TaskRow 是当日待打清单的一行。
@@ -47,40 +53,67 @@ type TaskRow struct {
 	Skipped   bool
 	Note      string
 	Operator  string
+	Urgent    bool
+}
+
+// PkgTab 是日历上方的套餐标签。
+type PkgTab struct {
+	ID     int64
+	Tag    string
+	Name   string
+	Color  string
+	Count  int
+	Href   string
+	Active bool
 }
 
 type calendarData struct {
-	Year, Month        int
+	Year, Month     int
-	Title              string
+	Title           string
-	PrevY, PrevM       int
+	PrevY, PrevM    int
-	NextY, NextM       int
+	NextY, NextM    int
-	TodayStr           string
+	TodayStr        string
-	Weekdays           []string
+	Weekdays        []string
-	Weeks              [][]DayCell
+	Weeks           [][]DayCell
-	Selected           string
+	Selected        string
-	SelectedLabel      string
+	SelectedLabel   string
-	SelectedIsToday    bool
+	SelectedIsToday bool
-	SelectedIsPast     bool
+	SelectedIsPast  bool
-	Tasks              []TaskRow
+	Tasks           []TaskRow
-	Due                []SubView
+	TaskPending     int
-	OtherDue           []SubView
+	Due             []SubView
-	Extend             *ExtendPanel
+	OtherDue        []SubView
-	MonthDue           int
+	Extend          *ExtendPanel
-	MonthTasks         int
+	MonthDue        int
-	MonthDone          int
+	MonthTasks      int
-	NoPackages         bool
+	MonthDone       int
-	NoCustomers        bool
+	MonthUrgent     int
-	Back               string
+	NoPackages      bool
+	NoCustomers     bool
+	Back            string
+
+	// 套餐标签（在日历中独立显示的套餐）
+	Tabs  []PkgTab
+	PkgID int64
+	Tag   string
+	// FilterQuery 当前筛选条件（pkg=1 或 tag=xxx），拼链接用
+	FilterQuery string
+	HasTabs     bool
+
+	// 快速完成：按尾号筛选出的候选
+	PickTail string
+	PickRows []TaskRow
+	PickMsg  string
 }
 
 // calSub 是日历计算用的订阅上下文。
 type calSub struct {
-	sub    store.Subscription
+	sub      store.Subscription
-	start  time.Time
+	start    time.Time
-	end    time.Time
+	end      time.Time
-	hasEnd bool
+	hasEnd   bool
-	eval   domain.Eval
+	pauses   []store.Pause
-	pauses []store.Pause
+	checkins map[string]store.Checkin
 }
 
 func (c calSub) pausedOn(date string) bool {
@@ -102,12 +135,101 @@ func (c calSub) covers(date string) bool {
 	if date < c.sub.StartDate || date > c.sub.EndDate {
 		return false
 	}
-	if c.sub.Unit == domain.UnitCount && c.eval.RemainingCount <= 0 {
-		return false
-	}
 	return !c.pausedOn(date)
 }
 
+// buildCalendarTabs 生成日历页签：先按套餐标签合并，再给「独立显示」的套餐各开一个。
+func buildCalendarTabs(pkgs []store.Package, subs []store.Subscription, total int) ([]PkgTab, bool) {
+	tagOrder := []string{}
+	tagColor := map[string]string{}
+	tagCount := map[string]int{}
+	pkgTag := map[int64]string{}
+	sep := []store.Package{}
+	for _, p := range pkgs {
+		if p.Archived {
+			continue
+		}
+		pkgTag[p.ID] = p.Tag
+		if p.Tag != "" {
+			if _, ok := tagColor[p.Tag]; !ok {
+				tagOrder = append(tagOrder, p.Tag)
+				tagColor[p.Tag] = p.Color
+			}
+		}
+		if p.CalendarSeparate {
+			sep = append(sep, p)
+		}
+	}
+	for _, sub := range subs {
+		if t := pkgTag[sub.PackageID]; t != "" {
+			tagCount[t]++
+		}
+	}
+	if len(tagOrder) == 0 && len(sep) == 0 {
+		return nil, false
+	}
+	tabs := []PkgTab{{ID: 0, Name: "全部", Color: "#8A8F98", Count: total}}
+	for _, t := range tagOrder {
+		tabs = append(tabs, PkgTab{Tag: t, Name: t, Color: tagColor[t], Count: tagCount[t]})
+	}
+	for _, p := range sep {
+		cnt := 0
+		for _, sub := range subs {
+			if sub.PackageID == p.ID {
+				cnt++
+			}
+		}
+		tabs = append(tabs, PkgTab{ID: p.ID, Name: p.Name, Color: p.Color, Count: cnt})
+	}
+	return tabs, true
+}
+
+// loadCalendarSubs 读取区间内与日历相交的订阅；pkgID>0 取该套餐，tag 非空取该标签下的所有套餐。
+func (s *Server) loadCalendarSubs(from, to string, pkgID int64, tag string) ([]store.Subscription, map[int64][]store.Pause, map[int64]map[string]store.Checkin, map[int64]map[string]bool, error) {
+	subs, err := s.db.CalendarSubs(from, to)
+	if err != nil {
+		return nil, nil, nil, nil, err
+	}
+	if pkgID > 0 || tag != "" {
+		pkgs, err := s.db.ListPackages(true)
+		if err != nil {
+			return nil, nil, nil, nil, err
+		}
+		tags := make(map[int64]string, len(pkgs))
+		for _, p := range pkgs {
+			tags[p.ID] = p.Tag
+		}
+		filtered := make([]store.Subscription, 0, len(subs))
+		for _, sub := range subs {
+			if pkgID > 0 && sub.PackageID != pkgID {
+				continue
+			}
+			if pkgID <= 0 && tag != "" && tags[sub.PackageID] != tag {
+				continue
+			}
+			filtered = append(filtered, sub)
+		}
+		subs = filtered
+	}
+	ids := make([]int64, 0, len(subs))
+	for _, sub := range subs {
+		ids = append(ids, sub.ID)
+	}
+	pauses, err := s.db.PausesForSubs(ids)
+	if err != nil {
+		return nil, nil, nil, nil, err
+	}
+	checkins, err := s.db.CheckinsBetween(from, to)
+	if err != nil {
+		return nil, nil, nil, nil, err
+	}
+	urgent, err := s.db.UrgentFlags(from, to)
+	if err != nil {
+		return nil, nil, nil, nil, err
+	}
+	return subs, pauses, checkins, urgent, nil
+}
+
 func (s *Server) handleCalendar(w http.ResponseWriter, r *http.Request) {
 	today := domain.Today()
 	y := s.queryInt(r, "y", today.Year())
@@ -118,6 +240,8 @@ func (s *Server) handleCalendar(w http.ResponseWriter, r *http.Request) {
 	monthStart := domain.MonthStart(y, time.Month(m))
 	monthEnd := domain.MonthEnd(y, time.Month(m))
 
+	pkgID := int64(s.queryInt(r, "pkg", 0))
+	tag := strings.TrimSpace(r.URL.Query().Get("tag"))
 	sel := r.URL.Query().Get("d")
 	selT, err := domain.ParseDate(sel)
 	if sel != "" && err != nil {
@@ -132,39 +256,24 @@ func (s *Server) handleCalendar(w http.ResponseWriter, r *http.Request) {
 		selT = domain.ParseDateOr(sel, today)
 	}
 
-	// 网格：以周一为首日，铺满整月所需的周数
 	gridStart := domain.AddDays(monthStart, -domain.WeekdayIndex(monthStart))
 	weeks := (domain.WeekdayIndex(monthStart) + monthEnd.Day() + 6) / 7
 	gridEnd := domain.AddDays(gridStart, weeks*7-1)
 
-	subs, err := s.db.CalendarSubs(domain.Date(gridStart), domain.Date(gridEnd))
+	subs, pauses, checkins, urgent, err := s.loadCalendarSubs(domain.Date(gridStart), domain.Date(gridEnd), pkgID, tag)
 	if err != nil {
 		http.Error(w, "读取订阅失败", http.StatusInternalServerError)
 		return
 	}
-	ids := make([]int64, 0, len(subs))
-	for _, sub := range subs {
-		ids = append(ids, sub.ID)
-	}
-	pauses, err := s.db.PausesForSubs(ids)
-	if err != nil {
-		http.Error(w, "读取暂停记录失败", http.StatusInternalServerError)
-		return
-	}
-	checkins, err := s.db.CheckinsBetween(domain.Date(gridStart), domain.Date(gridEnd))
-	if err != nil {
-		http.Error(w, "读取打卡记录失败", http.StatusInternalServerError)
-		return
-	}
 
 	warn := s.warnDays()
 	list := make([]calSub, 0, len(subs))
 	for _, sub := range subs {
 		cs := calSub{
-			sub:   sub,
+			sub:      sub,
-			start: domain.ParseDateOr(sub.StartDate, today),
+			start:    domain.ParseDateOr(sub.StartDate, today),
-			eval:  sub.Eval(today, warn),
+			pauses:   pauses[sub.ID],
-			pauses: pauses[sub.ID],
+			checkins: checkins[sub.ID],
 		}
 		if sub.EndDate != "" {
 			cs.end = domain.ParseDateOr(sub.EndDate, today)
@@ -173,6 +282,7 @@ func (s *Server) handleCalendar(w http.ResponseWriter, r *http.Request) {
 		list = append(list, cs)
 	}
 
+	back := r.URL.RequestURI()
 	data := &calendarData{
 		Year: y, Month: m,
 		Title:           fmt.Sprintf("%d 年 %d 月", y, m),
@@ -180,7 +290,13 @@ func (s *Server) handleCalendar(w http.ResponseWriter, r *http.Request) {
 		Weekdays:        []string{"一", "二", "三", "四", "五", "六", "日"},
 		Selected:        sel,
 		SelectedIsToday: sel == domain.Date(today),
-		Back:            r.URL.RequestURI(),
+		Back:            back,
+		PkgID:           pkgID,
+		Tag:             tag,
+		FilterQuery:     "pkg=" + itoa(pkgID),
+	}
+	if tag != "" {
+		data.FilterQuery = "tag=" + url.QueryEscape(tag)
 	}
 	data.PrevY, data.PrevM = m-1, y
 	if data.PrevM < 1 {
@@ -192,8 +308,7 @@ func (s *Server) handleCalendar(w http.ResponseWriter, r *http.Request) {
 		data.NextM = 1
 		data.NextY = y + 1
 	}
-	label := selT.Format("1 月 2 日")
+	data.SelectedLabel = selT.Format("1 月 2 日") + " 周" + dowCN(sel)
-	data.SelectedLabel = label + " 周" + dowCN(sel)
 	data.SelectedIsPast = selT.Before(today)
 
 	// 铺格子
@@ -216,11 +331,18 @@ func (s *Server) handleCalendar(w http.ResponseWriter, r *http.Request) {
 				if cs.sub.EndDate == ds {
 					cell.DueCount++
 				}
-				if !cell.InMonth || !cs.covers(ds) {
+				if !cell.InMonth {
+					continue
+				}
+				if !cs.covers(ds) {
 					continue
 				}
 				cell.TaskCount++
 				ci := checkins[cs.sub.ID][ds]
+				isUrgent := urgent[cs.sub.ID][ds]
+				if isUrgent {
+					cell.UrgentCnt++
+				}
 				t := Ticket{
 					SubID:   cs.sub.ID,
 					Tail:    cs.sub.CustomerTail,
@@ -230,6 +352,7 @@ func (s *Server) handleCalendar(w http.ResponseWriter, r *http.Request) {
 					Done:    ci.Status == "done",
 					Skipped: ci.Status == "skipped",
 					IsDue:   cs.sub.EndDate == ds,
+					Urgent:  isUrgent,
 				}
 				if t.Done || t.Skipped {
 					cell.DoneCount++
@@ -237,6 +360,9 @@ func (s *Server) handleCalendar(w http.ResponseWriter, r *http.Request) {
 				tickets = append(tickets, t)
 			}
 			sort.SliceStable(tickets, func(i, j int) bool {
+				if tickets[i].Urgent != tickets[j].Urgent {
+					return tickets[i].Urgent
+				}
 				if tickets[i].Done != tickets[j].Done {
 					return !tickets[i].Done
 				}
@@ -247,11 +373,13 @@ func (s *Server) handleCalendar(w http.ResponseWriter, r *http.Request) {
 				tickets = tickets[:3]
 			}
 			cell.Tickets = tickets
+			cell.PendingCount = cell.TaskCount - cell.DoneCount
 			cell.Heat = heatLevel(cell.TaskCount + cell.DueCount)
 			if cell.InMonth {
 				data.MonthDue += cell.DueCount
 				data.MonthTasks += cell.TaskCount
 				data.MonthDone += cell.DoneCount
+				data.MonthUrgent += cell.UrgentCnt
 			}
 			week = append(week, cell)
 		}
@@ -268,8 +396,7 @@ func (s *Server) handleCalendar(w http.ResponseWriter, r *http.Request) {
 		if !cs.covers(sel) {
 			continue
 		}
-		v := newSubView(cs.sub, today, warn)
+		row := TaskRow{SubView: newSubView(cs.sub, today, warn), Urgent: urgent[cs.sub.ID][sel]}
-		row := TaskRow{SubView: v}
 		if ci, ok := checkins[cs.sub.ID][sel]; ok {
 			row.CheckinID = ci.ID
 			row.Done = ci.Status == "done"
@@ -279,15 +406,13 @@ func (s *Server) handleCalendar(w http.ResponseWriter, r *http.Request) {
 		}
 		tasks = append(tasks, row)
 	}
-	sort.SliceStable(tasks, func(i, j int) bool {
+	sortTasks(tasks)
-		ai := tasks[i].Done || tasks[i].Skipped
-		aj := tasks[j].Done || tasks[j].Skipped
-		if ai != aj {
-			return !ai
-		}
-		return tasks[i].EndDate < tasks[j].EndDate
-	})
 	data.Tasks = tasks
+	for _, row := range tasks {
+		if !row.Done && !row.Skipped {
+			data.TaskPending++
+		}
+	}
 	data.Due = due
 
 	// 其它日期到期（不在当天的 7 天内）
@@ -296,25 +421,62 @@ func (s *Server) handleCalendar(w http.ResponseWriter, r *http.Request) {
 			if u.EndDate == sel {
 				continue
 			}
+			if pkgID > 0 && u.PackageID != pkgID {
+				continue
+			}
+			if pkgID <= 0 && tag != "" {
+				if p, err := s.db.Package(u.PackageID); err != nil || p.Tag != tag {
+					continue
+				}
+			}
 			data.OtherDue = append(data.OtherDue, newSubView(u, today, warn))
 		}
 	}
 
+	// 页签：先按「套餐标签」合并，再给勾了独立显示的套餐各开一个
+	pkgs, _ := s.db.ListPackages(true)
+	data.Tabs, data.HasTabs = buildCalendarTabs(pkgs, subs, len(list))
+	for i := range data.Tabs {
+		t := &data.Tabs[i]
+		href := fmt.Sprintf("/calendar?y=%d&m=%d&d=%s", y, m, sel)
+		if t.Tag != "" {
+			href += "&tag=" + url.QueryEscape(t.Tag)
+			t.Active = t.Tag == tag
+		} else if t.ID > 0 {
+			href += "&pkg=" + itoa(t.ID)
+			t.Active = t.ID == pkgID
+		} else {
+			t.Active = tag == "" && pkgID == 0
+		}
+		t.Href = href
+	}
+
+	// 快速完成：按尾号列出候选
+	if tail := r.URL.Query().Get("pick"); tail != "" {
+		data.PickTail = tail
+		for _, row := range tasks {
+			if row.CustomerTail == tail {
+				data.PickRows = append(data.PickRows, row)
+			}
+		}
+		if len(data.PickRows) == 0 {
+			data.PickMsg = "尾号 " + tail + " 在今天没有待完成的服务"
+		}
+	}
+
 	// 追加面板
 	if eid := s.queryInt(r, "extend", 0); eid > 0 {
 		if sub, err := s.db.Sub(int64(eid)); err == nil {
 			if pkg, err := s.db.Package(sub.PackageID); err == nil {
-				back := r.URL.Path + "?" + r.URL.RawQuery
 				data.Extend = buildExtendPanel(sub, pkg, today, back, warn)
 			}
 		}
 	}
 
-	// 空态提示
 	if n, _ := s.db.CustomerCount(); n == 0 {
 		data.NoCustomers = true
 	}
-	if pkgs, _ := s.db.ListPackages(false); len(pkgs) == 0 {
+	if len(pkgs) == 0 {
 		data.NoPackages = true
 	}
 
@@ -323,6 +485,22 @@ func (s *Server) handleCalendar(w http.ResponseWriter, r *http.Request) {
 	s.render(w, r, "calendar", p)
 }
 
+// sortTasks 加急优先，其次未完成，最后按结束日。
+func sortTasks(tasks []TaskRow) {
+	sort.SliceStable(tasks, func(i, j int) bool {
+		ai, aj := tasks[i], tasks[j]
+		if ai.Urgent != aj.Urgent {
+			return ai.Urgent
+		}
+		adi := ai.Done || ai.Skipped
+		adj := aj.Done || aj.Skipped
+		if adi != adj {
+			return !adi
+		}
+		return ai.EndDate < aj.EndDate
+	})
+}
+
 func heatLevel(n int) int {
 	switch {
 	case n <= 0:
@@ -346,3 +524,15 @@ func shortName(s string) string {
 	}
 	return string(r[:2])
 }
+
+// stripParam 去掉地址里的某个参数，用于拼“返回”链接。
+func stripParam(raw, key string) string {
+	u, err := url.Parse(raw)
+	if err != nil {
+		return raw
+	}
+	q := u.Query()
+	q.Del(key)
+	u.RawQuery = q.Encode()
+	return u.String()
+}

internal/web/handlers_customers.go

@@ -2,22 +2,26 @@ package web
 
 import (
 	"errors"
+	"fmt"
 	"net/http"
 	"sort"
 	"strconv"
 	"strings"
+	"time"
 
 	"daili/internal/domain"
 	"daili/internal/store"
 )
 
 type customersData struct {
-	List         []store.Customer
+	List          []store.Customer
-	Pager        Pager
+	Pager         Pager
-	Q            string
+	Q             string
-	Total        int
+	Total         int
-	PackageCount int
+	PackageCount  int
-	NoPackages   bool
+	NoPackages    bool
+	ShowArchived  bool
+	ArchivedCount int
 }
 
 func (s *Server) handleCustomers(w http.ResponseWriter, r *http.Request) {
@@ -28,21 +32,24 @@ func (s *Server) handleCustomers(w http.ResponseWriter, r *http.Request) {
 	if pageNo < 1 {
 		pageNo = 1
 	}
-	list, total, err := s.db.ListCustomers(q, pageSize, (pageNo-1)*pageSize, domain.Date(today), warn)
+	showArchived := r.URL.Query().Get("archived") == "1"
+	list, total, err := s.db.ListCustomers(q, pageSize, (pageNo-1)*pageSize, domain.Date(today), warn, showArchived)
 	if err != nil {
 		http.Error(w, "读取客户失败", http.StatusInternalServerError)
 		return
 	}
 	pager := newPager(r, pageNo, pageSize, total)
 	if pager.Page != pageNo {
-		list, total, err = s.db.ListCustomers(q, pageSize, (pager.Page-1)*pageSize, domain.Date(today), warn)
+		list, total, err = s.db.ListCustomers(q, pageSize, (pager.Page-1)*pageSize, domain.Date(today), warn, showArchived)
 		if err != nil {
 			http.Error(w, "读取客户失败", http.StatusInternalServerError)
 			return
 		}
 	}
 	pkgs, _ := s.db.ListPackages(false)
-	data := &customersData{List: list, Pager: pager, Q: q, Total: total, PackageCount: len(pkgs), NoPackages: len(pkgs) == 0}
+	archivedN, _ := s.db.CountArchivedCustomers()
+	data := &customersData{List: list, Pager: pager, Q: q, Total: total, PackageCount: len(pkgs), NoPackages: len(pkgs) == 0,
+		ShowArchived: showArchived, ArchivedCount: archivedN}
 	p := s.newPage(r, "客户", "customers")
 	p.D = data
 	s.render(w, r, "customers", p)
@@ -59,7 +66,7 @@ func (s *Server) handleCustomerNewPage(w http.ResponseWriter, r *http.Request) {
 	s.render(w, r, "customer_form", p)
 }
 
-func readCustomerForm(r *http.Request) *store.Customer {
+func (s *Server) readCustomerForm(r *http.Request) *store.Customer {
 	return &store.Customer{
 		Tail:       strings.TrimSpace(r.PostFormValue("tail")),
 		Name:       strings.TrimSpace(r.PostFormValue("name")),
@@ -104,7 +111,7 @@ func validateCustomer(c *store.Customer) string {
 }
 
 func (s *Server) handleCustomerCreate(w http.ResponseWriter, r *http.Request) {
-	c := readCustomerForm(r)
+	c := s.readCustomerForm(r)
 	p := s.newPage(r, "新建客户", "customers")
 	if msg := validateCustomer(c); msg != "" {
 		p.D = &customerFormData{Customer: c, IsNew: true}
@@ -143,7 +150,7 @@ func (s *Server) handleCustomerUpdate(w http.ResponseWriter, r *http.Request) {
 		http.NotFound(w, r)
 		return
 	}
-	c := readCustomerForm(r)
+	c := s.readCustomerForm(r)
 	c.ID = id
 	p := s.newPage(r, "编辑客户", "customers")
 	if msg := validateCustomer(c); msg != "" {
@@ -179,11 +186,112 @@ type customerDetailData struct {
 	AdjSubColor map[int64]string
 	Checkins    []CheckinRow
 	Packages    []store.Package
+	CustCal     *custCal
 	Timeline    *Timeline
 	Extend      *ExtendPanel
 	TotalRemain string
 }
 
+// custCalDay 客户月历的一格。
+type custCalDay struct {
+	Date    string
+	Day     int
+	InMonth bool
+	IsToday bool
+	Count   int
+	Done    int
+	AllDone bool
+}
+
+// custCal 客户详情页的当月排单日历。
+type custCal struct {
+	Year, Month int
+	Title       string
+	Prev, Next  string
+	Weekdays    []string
+	Weeks       [][]custCalDay
+	TaskDays    int
+	TotalTasks  int
+}
+
+func (s *Server) buildCustomerCal(c *store.Customer, cm string, today time.Time) *custCal {
+	y, m := today.Year(), int(today.Month())
+	if t, err := time.Parse("2006-01", cm); err == nil {
+		y, m = t.Year(), int(t.Month())
+	}
+	monthStart := domain.MonthStart(y, time.Month(m))
+	monthEnd := domain.MonthEnd(y, time.Month(m))
+	gridStart := domain.AddDays(monthStart, -domain.WeekdayIndex(monthStart))
+	weeks := (domain.WeekdayIndex(monthStart) + monthEnd.Day() + 6) / 7
+
+	subs, err := s.db.SubsByCustomer(c.ID)
+	if err != nil {
+		return nil
+	}
+	ids := make([]int64, 0, len(subs))
+	for _, sub := range subs {
+		ids = append(ids, sub.ID)
+	}
+	pauses, _ := s.db.PausesForSubs(ids)
+	checkins, _ := s.db.CheckinsBetween(domain.Date(gridStart), domain.Date(domain.AddDays(gridStart, weeks*7-1)))
+	list := make([]calSub, 0, len(subs))
+	for _, sub := range subs {
+		cs := calSub{sub: sub, pauses: pauses[sub.ID], checkins: checkins[sub.ID]}
+		cs.start = domain.ParseDateOr(sub.StartDate, today)
+		if sub.EndDate != "" {
+			cs.hasEnd = true
+			cs.end = domain.ParseDateOr(sub.EndDate, today)
+		}
+		list = append(list, cs)
+	}
+
+	cal := &custCal{
+		Year: y, Month: m,
+		Title:    fmt.Sprintf("%d 年 %d 月", y, m),
+		Weekdays: []string{"一", "二", "三", "四", "五", "六", "日"},
+	}
+	py, pm := y, m-1
+	if pm < 1 {
+		pm = 12
+		py--
+	}
+	ny, nm := y, m+1
+	if nm > 12 {
+		nm = 1
+		ny++
+	}
+	cal.Prev = fmt.Sprintf("/customers/%d?cm=%04d-%02d", c.ID, py, pm)
+	cal.Next = fmt.Sprintf("/customers/%d?cm=%04d-%02d", c.ID, ny, nm)
+
+	for wi := 0; wi < weeks; wi++ {
+		week := make([]custCalDay, 0, 7)
+		for di := 0; di < 7; di++ {
+			d := domain.AddDays(gridStart, wi*7+di)
+			ds := domain.Date(d)
+			cell := custCalDay{Date: ds, Day: d.Day(), InMonth: d.Month() == time.Month(m), IsToday: ds == domain.Date(today)}
+			for _, cs := range list {
+				if !cs.covers(ds) {
+					continue
+				}
+				cell.Count++
+				if ci, ok := checkins[cs.sub.ID][ds]; ok && (ci.Status == "done" || ci.Status == "skipped") {
+					cell.Done++
+				}
+			}
+			if cell.Count > 0 {
+				cell.AllDone = cell.Done >= cell.Count
+				if cell.InMonth {
+					cal.TaskDays++
+					cal.TotalTasks += cell.Count
+				}
+			}
+			week = append(week, cell)
+		}
+		cal.Weeks = append(cal.Weeks, week)
+	}
+	return cal
+}
+
 func (s *Server) handleCustomerDetail(w http.ResponseWriter, r *http.Request) {
 	id := pathID(r)
 	c, err := s.db.Customer(id)
@@ -208,10 +316,31 @@ func (s *Server) handleCustomerDetail(w http.ResponseWriter, r *http.Request) {
 	}
 	pauses, _ := s.db.PausesForSubs(ids)
 
+	// 已开通的套餐不再出现在「开通订阅」下拉里，延期走追加
+	owned := map[int64]bool{}
+	for _, sub := range subs {
+		owned[sub.PackageID] = true
+	}
+	available := make([]store.Package, 0, len(pkgs))
+	for _, pkg := range pkgs {
+		if !owned[pkg.ID] {
+			available = append(available, pkg)
+		}
+	}
+	sorted := append([]store.Subscription{}, subs...)
+	sort.SliceStable(sorted, func(i, j int) bool {
+		ai := sorted[i].Status == domain.StatusClosed
+		aj := sorted[j].Status == domain.StatusClosed
+		if ai != aj {
+			return !ai
+		}
+		return sorted[i].ID < sorted[j].ID
+	})
 	data := &customerDetailData{
+		CustCal:     s.buildCustomerCal(c, r.URL.Query().Get("cm"), today),
 		Customer:    c,
-		Subs:        subViews(subs, today, warn),
+		Subs:        subViews(sorted, today, warn),
-		Packages:    pkgs,
+		Packages:    available,
 		Timeline:    buildTimeline(subs, pauses, today),
 		AdjSubName:  map[int64]string{},
 		AdjSubColor: map[int64]string{},
@@ -247,6 +376,59 @@ func (s *Server) handleCustomerDetail(w http.ResponseWriter, r *http.Request) {
 	s.render(w, r, "customer_detail", p)
 }
 
+// handleCustomerArchive 停用客户：默认从列表与日历隐藏，订阅保留。
+func (s *Server) handleCustomerArchive(w http.ResponseWriter, r *http.Request) {
+	id := pathID(r)
+	c, err := s.db.Customer(id)
+	if err != nil {
+		http.NotFound(w, r)
+		return
+	}
+	if err := s.db.SetCustomerArchived(id, true); err != nil {
+		s.redirect(w, r, "/customers/"+itoa(id), "停用失败："+err.Error())
+		return
+	}
+	s.logOp(r, "停用客户", "customer", id, c.Tail+" "+c.Name+"（订阅保留，不再上日历）")
+	s.redirect(w, r, "/customers", "已停用客户 "+c.Tail+" "+c.Name+"，可在「已停用」里恢复")
+}
+
+// handleCustomerRestore 恢复客户，订单一并回到日历。
+func (s *Server) handleCustomerRestore(w http.ResponseWriter, r *http.Request) {
+	id := pathID(r)
+	c, err := s.db.Customer(id)
+	if err != nil {
+		http.NotFound(w, r)
+		return
+	}
+	if err := s.db.SetCustomerArchived(id, false); err != nil {
+		s.redirect(w, r, "/customers/"+itoa(id), "恢复失败："+err.Error())
+		return
+	}
+	s.logOp(r, "恢复客户", "customer", id, c.Tail+" "+c.Name)
+	s.redirect(w, r, "/customers/"+itoa(id), "已恢复客户 "+c.Tail+" "+c.Name)
+}
+
+// handleCustomerDelete 彻底删除客户及其订阅/打卡/追加记录（外键级联）。
+func (s *Server) handleCustomerDelete(w http.ResponseWriter, r *http.Request) {
+	id := pathID(r)
+	c, err := s.db.Customer(id)
+	if err != nil {
+		http.NotFound(w, r)
+		return
+	}
+	if r.PostFormValue("confirm") != "delete" {
+		s.redirect(w, r, "/customers/"+itoa(id), "请在弹窗里确认删除")
+		return
+	}
+	if err := s.db.DeleteCustomer(id); err != nil {
+		s.redirect(w, r, "/customers/"+itoa(id), "删除失败："+err.Error())
+		return
+	}
+	s.logOp(r, "删除客户", "customer", id, c.Tail+" "+c.Name+"（含订阅与打卡记录）")
+	s.redirect(w, r, "/customers", "已彻底删除客户 "+c.Tail+" "+c.Name)
+}
+
+// handleSubCreate 给客户开通一个按日套餐。
 func (s *Server) handleSubCreate(w http.ResponseWriter, r *http.Request) {
 	customerID := pathID(r)
 	c, err := s.db.Customer(customerID)
@@ -260,7 +442,6 @@ func (s *Server) handleSubCreate(w http.ResponseWriter, r *http.Request) {
 		StartDate:  r.PostFormValue("start_date"),
 		EndDate:    r.PostFormValue("end_date"),
 		Days:       s.formInt(r, "days", 0),
-		TotalCount: s.formInt(r, "total_count", 0),
 		Note:       strings.TrimSpace(r.PostFormValue("note")),
 	}
 	u := s.currentUser(r)
@@ -273,17 +454,10 @@ func (s *Server) handleSubCreate(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	s.logOp(r, "新建订阅", "subscription", sub.ID,
-		"为 "+c.Tail+" "+c.Name+" 开通 "+sub.PackageName+"（"+unitLabel(sub.Unit)+"）")
+		"为 "+c.Tail+" "+c.Name+" 开通 "+sub.PackageName+"（按日）")
 	s.redirect(w, r, "/customers/"+itoa(customerID), "已开通「"+sub.PackageName+"」")
 }
 
-func unitLabel(u string) string {
-	if u == domain.UnitCount {
-		return "按次"
-	}
-	return "按日"
-}
-
 func itoa(v int64) string { return strconv.FormatInt(v, 10) }
 
 func sortAdjustments(list []store.Adjustment) {

internal/web/handlers_misc.go

@@ -46,15 +46,12 @@ func (s *Server) handleLogs(w http.ResponseWriter, r *http.Request) {
 
 type settingsData struct {
 	WarnDays      int
-	ScreenRefresh int
-	Users         []store.User
 	Backups       []string
 	DBPath        string
 	BackupDir     string
 	BackupKeep    int
 	BackupEnabled bool
 	ConfigPath    string
-	ScreenPublic  bool
 	Addrs         []string
 	Port          string
 	Uptime        string
@@ -119,7 +116,6 @@ func LocalAddrs() []string {
 }
 
 func (s *Server) handleSettings(w http.ResponseWriter, r *http.Request) {
-	users, _ := s.db.ListUsers()
 	backups, _ := s.db.ListBackups()
 	custN, _ := s.db.CustomerCount()
 	pkgs, _ := s.db.ListPackages(true)
@@ -130,15 +126,12 @@ func (s *Server) handleSettings(w http.ResponseWriter, r *http.Request) {
 	}
 	data := &settingsData{
 		WarnDays:      s.warnDays(),
-		ScreenRefresh: s.screenRefresh(),
-		Users:         users,
 		Backups:       backups,
 		DBPath:        s.db.Path,
 		BackupDir:     s.cfg.BackupDir,
 		BackupKeep:    s.cfg.BackupKeep,
 		BackupEnabled: s.cfg.BackupEnabled,
 		ConfigPath:    s.cfg.ConfigPath,
-		ScreenPublic:  s.cfg.ScreenPublic,
 		Addrs:         LocalAddrs(),
 		Port:          port,
 		Uptime:        humanDuration(time.Since(s.started)),
@@ -160,18 +153,8 @@ func (s *Server) handleSettingsSave(w http.ResponseWriter, r *http.Request) {
 	if warn > 60 {
 		warn = 60
 	}
-
-	refresh := s.formInt(r, "screen_refresh", 30)
-	if refresh < 5 {
-		refresh = 5
-	}
-	if refresh > 600 {
-		refresh = 600
-	}
 	_ = s.db.SetSetting("warn_days", strconv.Itoa(warn))
-	_ = s.db.SetSetting("screen_refresh", strconv.Itoa(refresh))
+	s.logOp(r, "修改设置", "settings", 0, fmt.Sprintf("预警 %d 天", warn))
-	s.logOp(r, "修改设置", "settings", 0,
-		fmt.Sprintf("预警 %d 天、大屏刷新 %d 秒", warn, refresh))
 	s.redirect(w, r, "/settings", "设置已保存")
 }
 
@@ -204,58 +187,6 @@ func (s *Server) handlePasswordChange(w http.ResponseWriter, r *http.Request) {
 	s.redirect(w, r, "/settings", "密码已更新")
 }
 
-func (s *Server) handleUserCreate(w http.ResponseWriter, r *http.Request) {
-	username := strings.TrimSpace(r.PostFormValue("username"))
-	display := strings.TrimSpace(r.PostFormValue("display_name"))
-	pw := r.PostFormValue("password")
-	switch {
-	case len(username) < 3:
-		s.redirect(w, r, "/settings", "用户名至少 3 个字符")
-		return
-	case len(pw) < 6:
-		s.redirect(w, r, "/settings", "密码至少 6 位")
-		return
-	}
-	if display == "" {
-		display = username
-	}
-	u, err := s.db.CreateUser(username, display, pw)
-	if err != nil {
-		if err == store.ErrDuplicate {
-			s.redirect(w, r, "/settings", "用户名已存在")
-			return
-		}
-		s.redirect(w, r, "/settings", "创建失败："+err.Error())
-		return
-	}
-	s.logOp(r, "新增管理员", "user", u.ID, "新增管理员 "+username)
-	s.redirect(w, r, "/settings", "管理员 "+username+" 已创建")
-}
-
-func (s *Server) handleUserToggle(w http.ResponseWriter, r *http.Request) {
-	id := pathID(r)
-	me := s.currentUser(r)
-	if me != nil && me.ID == id {
-		s.redirect(w, r, "/settings", "不能停用自己的账户")
-		return
-	}
-	target, err := s.db.UserByID(id)
-	if err != nil {
-		http.NotFound(w, r)
-		return
-	}
-	if err := s.db.SetUserActive(id, !target.IsActive); err != nil {
-		s.redirect(w, r, "/settings", "操作失败："+err.Error())
-		return
-	}
-	action := "停用账户"
-	if !target.IsActive {
-		action = "启用账户"
-	}
-	s.logOp(r, action, "user", id, action+" "+target.Username)
-	s.redirect(w, r, "/settings", action+"成功")
-}
-
 func (s *Server) handleBackupNow(w http.ResponseWriter, r *http.Request) {
 	path, err := s.db.BackupNow(s.cfg.BackupKeep)
 	if err != nil {

internal/web/handlers_packages.go

@@ -1,6 +1,7 @@
 package web
 
 import (
+	"fmt"
 	"net/http"
 	"strconv"
 	"strings"
@@ -27,13 +28,16 @@ func (s *Server) handlePackages(w http.ResponseWriter, r *http.Request) {
 type packageFormData struct {
 	Package *store.Package
 	IsNew   bool
+	Tags    []string
 }
 
 func (s *Server) handlePackageNewPage(w http.ResponseWriter, r *http.Request) {
 	p := s.newPage(r, "新增套餐", "packages")
+	tags, _ := s.db.PackageTags()
 	p.D = &packageFormData{
-		Package: &store.Package{Unit: domain.UnitDay, DefaultAmount: 30, Color: "#2F5D50"},
+		Package: &store.Package{DefaultAmount: 30, Color: "#3B6EA5"},
 		IsNew:   true,
+		Tags:    tags,
 	}
 	s.render(w, r, "package_form", p)
 }
@@ -41,7 +45,6 @@ func (s *Server) handlePackageNewPage(w http.ResponseWriter, r *http.Request) {
 func readPackageForm(r *http.Request) *store.Package {
 	p := &store.Package{
 		Name:          strings.TrimSpace(r.PostFormValue("name")),
-		Unit:          strings.TrimSpace(r.PostFormValue("unit")),
 		DefaultAmount: 0,
 		Color:         strings.TrimSpace(r.PostFormValue("color")),
 		Note:          strings.TrimSpace(r.PostFormValue("note")),
@@ -59,9 +62,8 @@ func readPackageForm(r *http.Request) *store.Package {
 			p.HasPrice = true
 		}
 	}
-	if p.Unit == "" {
+	p.CalendarSeparate = r.PostFormValue("calendar_separate") != ""
-		p.Unit = domain.UnitDay
+	p.Tag = strings.TrimSpace(r.PostFormValue("tag"))
-	}
 	return p
 }
 
@@ -72,11 +74,8 @@ func validatePackage(p *store.Package) string {
 	if len([]rune(p.Name)) > 32 {
 		return "套餐名称最长 32 字"
 	}
-	if p.Unit != domain.UnitDay && p.Unit != domain.UnitCount {
-		return "套餐类型不正确"
-	}
 	if p.DefaultAmount <= 0 {
-		return "默认天数/次数必须大于 0"
+		return "默认天数必须大于 0"
 	}
 	if p.Color == "" || !strings.HasPrefix(p.Color, "#") {
 		return "请选择套餐颜色"
@@ -84,17 +83,124 @@ func validatePackage(p *store.Package) string {
 	return ""
 }
 
+// packageDetailData 套餐详情页数据。
+type packageDetailData struct {
+	Package    *store.Package
+	Customers  []store.Customer
+	Subscribed map[int64]bool
+	Q          string
+	Tags       []string
+	Today      string
+}
+
+// handlePackageDetail 套餐详情：查看信息 + 勾选客户批量开通。
+func (s *Server) handlePackageDetail(w http.ResponseWriter, r *http.Request) {
+	id := pathID(r)
+	pkg, err := s.db.Package(id)
+	if err != nil {
+		http.NotFound(w, r)
+		return
+	}
+	today := domain.Today()
+	warn := s.warnDays()
+	q := strings.TrimSpace(r.URL.Query().Get("q"))
+	list, _, err := s.db.ListCustomers(q, 300, 0, domain.Date(today), warn, false)
+	if err != nil {
+		http.Error(w, "读取客户失败", http.StatusInternalServerError)
+		return
+	}
+	subscribed, err := s.db.SubscribedCustomerIDs(id)
+	if err != nil {
+		http.Error(w, "读取订阅失败", http.StatusInternalServerError)
+		return
+	}
+	tags, _ := s.db.PackageTags()
+	p := s.newPage(r, "套餐详情", "packages")
+	p.D = &packageDetailData{Package: pkg, Customers: list, Subscribed: subscribed, Q: q, Tags: tags, Today: domain.Date(today)}
+	s.render(w, r, "package_detail", p)
+}
+
+// handlePackageBatchSubscribe 给勾选的客户批量开通该套餐。
+func (s *Server) handlePackageBatchSubscribe(w http.ResponseWriter, r *http.Request) {
+	id := pathID(r)
+	pkg, err := s.db.Package(id)
+	if err != nil {
+		http.NotFound(w, r)
+		return
+	}
+	_ = r.ParseForm()
+	back := "/packages/" + itoa(id)
+	raw := r.PostForm["customer_ids"]
+	if len(raw) == 0 {
+		s.redirect(w, r, back, "没有选中任何客户")
+		return
+	}
+	start := strings.TrimSpace(r.PostFormValue("start_date"))
+	if start == "" {
+		start = domain.Date(domain.Today())
+	}
+	if start != "" {
+		if _, err := domain.ParseDate(start); err != nil {
+			s.redirect(w, r, back, "开始日期格式不正确")
+			return
+		}
+	}
+	end := strings.TrimSpace(r.PostFormValue("end_date"))
+	days := s.formInt(r, "days", 0)
+	u := s.currentUser(r)
+	var op int64
+	if u != nil {
+		op = u.ID
+	}
+
+	done, skipped, failed := 0, 0, 0
+	var lastErr string
+	for _, v := range raw {
+		cid, err := strconv.ParseInt(strings.TrimSpace(v), 10, 64)
+		if err != nil {
+			failed++
+			continue
+		}
+		_, err = s.db.CreateSub(store.CreateSubInput{
+			CustomerID: cid, PackageID: id, StartDate: start, EndDate: end,
+			Days: days, OperatorID: op,
+		})
+		if err != nil {
+			if strings.Contains(err.Error(), "已订阅") {
+				skipped++
+				continue
+			}
+			failed++
+			lastErr = err.Error()
+			continue
+		}
+		done++
+	}
+	s.logOp(r, "批量开通", "package", id,
+		fmt.Sprintf("%s：成功 %d、跳过 %d、失败 %d", pkg.Name, done, skipped, failed))
+	msg := fmt.Sprintf("已为 %d 位客户开通「%s」", done, pkg.Name)
+	if skipped > 0 {
+		msg += fmt.Sprintf("，%d 位已有该套餐已跳过", skipped)
+	}
+	if failed > 0 {
+		msg += fmt.Sprintf("，%d 位失败（%s）", failed, lastErr)
+	}
+	s.redirect(w, r, back, msg)
+}
+
 func (s *Server) handlePackageCreate(w http.ResponseWriter, r *http.Request) {
 	pkg := readPackageForm(r)
 	p := s.newPage(r, "新增套餐", "packages")
 	if msg := validatePackage(pkg); msg != "" {
-		p.D = &packageFormData{Package: pkg, IsNew: true}
+		tags, _ := s.db.PackageTags()
+		p.D = &packageFormData{Package: pkg, IsNew: true, Tags: tags}
 		s.fail(w, r, "package_form", msg, p)
 		return
 	}
 	id, err := s.db.CreatePackage(pkg)
 	if err != nil {
-		p.D = &packageFormData{Package: pkg, IsNew: true}
+		tags, _ := s.db.PackageTags()
+		p.D = &packageFormData{Package: pkg, IsNew: true, Tags: tags}
 		s.fail(w, r, "package_form", "保存失败："+err.Error(), p)
 		return
 	}
@@ -110,7 +216,8 @@ func (s *Server) handlePackageEditPage(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	p := s.newPage(r, "编辑套餐", "packages")
-	p.D = &packageFormData{Package: pkg, IsNew: false}
+	tags, _ := s.db.PackageTags()
+	p.D = &packageFormData{Package: pkg, IsNew: false, Tags: tags}
 	s.render(w, r, "package_form", p)
 }
 
@@ -120,12 +227,14 @@ func (s *Server) handlePackageUpdate(w http.ResponseWriter, r *http.Request) {
 	pkg.ID = id
 	p := s.newPage(r, "编辑套餐", "packages")
 	if msg := validatePackage(pkg); msg != "" {
-		p.D = &packageFormData{Package: pkg, IsNew: false}
+		tags, _ := s.db.PackageTags()
+		p.D = &packageFormData{Package: pkg, IsNew: false, Tags: tags}
 		s.fail(w, r, "package_form", msg, p)
 		return
 	}
 	if err := s.db.UpdatePackage(pkg); err != nil {
-		p.D = &packageFormData{Package: pkg, IsNew: false}
+		tags, _ := s.db.PackageTags()
+		p.D = &packageFormData{Package: pkg, IsNew: false, Tags: tags}
 		s.fail(w, r, "package_form", "保存失败："+err.Error(), p)
 		return
 	}

internal/web/handlers_screen.go

@@ -1,134 +0,0 @@
-package web
-
-import (
-	"fmt"
-	"net/http"
-	"time"
-
-	"daili/internal/domain"
-	"daili/internal/store"
-)
-
-type screenDay struct {
-	Date    string
-	Day     int
-	InMonth bool
-	IsToday bool
-	IsPast  bool
-	Due     int
-	Heat    int
-}
-
-type screenData struct {
-	Stats       *store.Stats
-	MonthTitle  string
-	Year, Month int
-	Weeks       [][]screenDay
-	Weekdays    []string
-	Top         []SubView
-	DueToday    []SubView
-	TodayList   []SubView
-	Recent      []store.Adjustment
-	TodayTasks  int
-	TodayDone   int
-	Refresh     int
-	Version     string
-}
-
-func (s *Server) handleScreen(w http.ResponseWriter, r *http.Request) {
-	today := domain.Today()
-	warn := s.warnDays()
-	stats, err := s.db.ScreenStats(today, warn)
-	if err != nil {
-		http.Error(w, "读取大屏数据失败", http.StatusInternalServerError)
-		return
-	}
-	data := &screenData{
-		Stats:      stats,
-		MonthTitle: fmt.Sprintf("%d 年 %d 月", today.Year(), int(today.Month())),
-		Year:       today.Year(),
-		Month:      int(today.Month()),
-		Weekdays:   []string{"一", "二", "三", "四", "五", "六", "日"},
-		Top:        subViews(stats.Top, today, warn),
-		DueToday:   subViews(stats.DueTodaySubs, today, warn),
-		Refresh:    s.screenRefresh(),
-		Version:    s.cfg.Version,
-	}
-	if len(data.DueToday) > 6 {
-		data.DueToday = data.DueToday[:6]
-	}
-
-	// 本月热力
-	monthStart := domain.MonthStart(today.Year(), today.Month())
-	monthEnd := domain.MonthEnd(today.Year(), today.Month())
-	gridStart := domain.AddDays(monthStart, -domain.WeekdayIndex(monthStart))
-	weeks := (domain.WeekdayIndex(monthStart) + monthEnd.Day() + 6) / 7
-	for wi := 0; wi < weeks; wi++ {
-		week := make([]screenDay, 0, 7)
-		for di := 0; di < 7; di++ {
-			d := domain.AddDays(gridStart, wi*7+di)
-			ds := domain.Date(d)
-			due := stats.Heat[ds]
-			week = append(week, screenDay{
-				Date:    ds,
-				Day:     d.Day(),
-				InMonth: d.Month() == today.Month(),
-				IsToday: ds == domain.Date(today),
-				IsPast:  d.Before(today),
-				Due:     due,
-				Heat:    heatLevel(due),
-			})
-		}
-		data.Weeks = append(data.Weeks, week)
-	}
-
-	if adj, err := s.db.RecentAdjustments(6); err == nil {
-		data.Recent = adj
-	}
-	list, done := s.todayTaskList(today)
-	data.TodayTasks = len(list)
-	data.TodayDone = done
-	data.TodayList = subViews(list, today, warn)
-
-	p := s.newPage(r, "大屏", "screen")
-	p.D = data
-	s.render(w, r, "screen", p)
-}
-
-// todayTaskList 返回今天应服务的订阅与已完成数量。
-func (s *Server) todayTaskList(today time.Time) ([]store.Subscription, int) {
-	ts := domain.Date(today)
-	subs, err := s.db.CalendarSubs(ts, ts)
-	if err != nil {
-		return nil, 0
-	}
-	ids := make([]int64, 0, len(subs))
-	for _, sub := range subs {
-		ids = append(ids, sub.ID)
-	}
-	pauses, _ := s.db.PausesForSubs(ids)
-	checkins, _ := s.db.CheckinsBetween(ts, ts)
-	warn := s.warnDays()
-	out := []store.Subscription{}
-	done := 0
-	for _, sub := range subs {
-		if sub.Status == domain.StatusClosed {
-			continue
-		}
-		if sub.StartDate > ts || sub.EndDate == "" || sub.EndDate < ts {
-			continue
-		}
-		cs := calSub{sub: sub, pauses: pauses[sub.ID], hasEnd: true, eval: sub.Eval(today, warn)}
-		if sub.Unit == domain.UnitCount && cs.eval.RemainingCount <= 0 {
-			continue
-		}
-		if cs.pausedOn(ts) {
-			continue
-		}
-		out = append(out, sub)
-		if ci, ok := checkins[sub.ID][ts]; ok && ci.Status == "done" {
-			done++
-		}
-	}
-	return out, done
-}

internal/web/handlers_subs.go

@@ -72,27 +72,15 @@ func (s *Server) handleSubExtend(w http.ResponseWriter, r *http.Request) {
 	note := strings.TrimSpace(r.PostFormValue("note"))
 	back := backURL(r, "/customers/"+itoa(sub.CustomerID))
 
-	if sub.Unit == domain.UnitDay {
+	newEnd := strings.TrimSpace(r.PostFormValue("new_end_date"))
-		newEnd := strings.TrimSpace(r.PostFormValue("new_end_date"))
+	plan, err := s.db.ExtendDays(id, newEnd, note, opID)
-		plan, err := s.db.ExtendDays(id, newEnd, note, opID)
+	if err != nil {
-		if err != nil {
-			s.redirect(w, r, back+"#extend", "追加失败："+err.Error())
-			return
-		}
-		s.logOp(r, "追加时长", "subscription", id, fmt.Sprintf("%s 追加 %d 天：%s → %s（起点 %s）",
-			sub.SubTitle(), plan.Days, sub.EndDate, domain.Date(plan.NewEnd), domain.Date(plan.Base)))
-		s.redirect(w, r, back, fmt.Sprintf("已追加 %d 天，新结束日 %s", plan.Days, domain.Date(plan.NewEnd)))
-		return
-	}
-
-	add := s.formInt(r, "add_count", 0)
-	optEnd := strings.TrimSpace(r.PostFormValue("new_end_opt"))
-	if err := s.db.AddCount(id, add, optEnd, note, opID); err != nil {
 		s.redirect(w, r, back+"#extend", "追加失败："+err.Error())
 		return
 	}
-	s.logOp(r, "追加次数", "subscription", id, fmt.Sprintf("%s 追加 %d 次", sub.SubTitle(), add))
+	s.logOp(r, "追加时长", "subscription", id, fmt.Sprintf("%s 追加 %d 天：%s → %s（起点 %s）",
-	s.redirect(w, r, back, fmt.Sprintf("已追加 %d 次", add))
+		sub.SubTitle(), plan.Days, sub.EndDate, domain.Date(plan.NewEnd), domain.Date(plan.Base)))
+	s.redirect(w, r, back, fmt.Sprintf("已追加 %d 天，新结束日 %s", plan.Days, domain.Date(plan.NewEnd)))
 }
 
 func (s *Server) handleSubAction(action string) http.HandlerFunc {
@@ -183,3 +171,23 @@ func (s *Server) handleCheckinDelete(w http.ResponseWriter, r *http.Request) {
 	s.logOp(r, "撤销打卡", "subscription", subID, "撤销打卡记录 #"+itoa(id))
 	s.redirect(w, r, back, "已撤销打卡")
 }
+
+// handleSubDelete 彻底删除订阅。
+func (s *Server) handleSubDelete(w http.ResponseWriter, r *http.Request) {
+	id := pathID(r)
+	sub, err := s.db.Sub(id)
+	if err != nil {
+		http.NotFound(w, r)
+		return
+	}
+	if r.PostFormValue("confirm") != "delete" {
+		s.redirect(w, r, "/customers/"+itoa(sub.CustomerID), "请在弹窗里确认删除")
+		return
+	}
+	if err := s.db.DeleteSubscription(id); err != nil {
+		s.redirect(w, r, "/customers/"+itoa(sub.CustomerID), "删除失败："+err.Error())
+		return
+	}
+	s.logOp(r, "删除订阅", "subscription", id, sub.SubTitle()+"（含打卡与追加记录）")
+	s.redirect(w, r, "/customers/"+itoa(sub.CustomerID), "已删除订阅「"+sub.PackageName+"」")
+}

internal/web/handlers_tasks.go

@@ -0,0 +1,209 @@
+package web
+
+import (
+	"fmt"
+	"net/http"
+	"strconv"
+	"strings"
+
+	"daili/internal/domain"
+)
+
+// pendingTasks 返回某天“应服务”的订阅行（在区间内且未暂停），
+// customerIDs 非空时只保留这些客户；pkgID>0 时只保留该套餐。
+func (s *Server) pendingTasks(date string, customerIDs map[int64]bool, pkgID int64, tag string) ([]TaskRow, error) {
+	subs, pauses, checkins, urgent, err := s.loadCalendarSubs(date, date, pkgID, tag)
+	if err != nil {
+		return nil, err
+	}
+	today := domain.Today()
+	warn := s.warnDays()
+	rows := []TaskRow{}
+	for _, sub := range subs {
+		if customerIDs != nil && !customerIDs[sub.CustomerID] {
+			continue
+		}
+		cs := calSub{sub: sub, pauses: pauses[sub.ID], checkins: checkins[sub.ID]}
+		if sub.EndDate != "" {
+			cs.hasEnd = true
+			cs.end = domain.ParseDateOr(sub.EndDate, today)
+		}
+		if !cs.covers(date) {
+			continue
+		}
+		row := TaskRow{SubView: newSubView(sub, today, warn), Urgent: urgent[sub.ID][date]}
+		if ci, ok := checkins[sub.ID][date]; ok {
+			row.CheckinID = ci.ID
+			row.Done = ci.Status == "done"
+			row.Skipped = ci.Status == "skipped"
+			row.Note = ci.Note
+			row.Operator = ci.OperatorName
+		}
+		rows = append(rows, row)
+	}
+	sortTasks(rows)
+	return rows, nil
+}
+
+// completeTask 完成某个订阅的某一天。
+func (s *Server) completeTask(subID int64, date string, operatorID int64) error {
+	return s.db.SaveCheckin(subID, date, "done", "", operatorID)
+}
+
+// handleQuickCheckin 输入手机尾号直接完成当日服务：
+// 命中 1 项直接完成；命中多项则跳到日历的选择面板。
+func (s *Server) handleQuickCheckin(w http.ResponseWriter, r *http.Request) {
+	tail := strings.TrimSpace(r.PostFormValue("tail"))
+	date := strings.TrimSpace(r.PostFormValue("date"))
+	pkgID := int64(s.formInt(r, "pkg", 0))
+	tag := strings.TrimSpace(r.PostFormValue("tag"))
+	if _, err := domain.ParseDate(date); err != nil {
+		date = domain.Date(domain.Today())
+	}
+	back := backURL(r, "/calendar?d="+date)
+	if tail == "" {
+		s.redirect(w, r, back, "请输入手机尾号")
+		return
+	}
+
+	customers, err := s.db.CustomersByTail(tail)
+	if err != nil {
+		s.redirect(w, r, back, "查询客户失败："+err.Error())
+		return
+	}
+	if len(customers) == 0 {
+		s.redirect(w, r, back, "没有找到尾号 "+tail+" 的客户")
+		return
+	}
+	ids := map[int64]bool{}
+	for _, c := range customers {
+		ids[c.ID] = true
+	}
+
+	rows, err := s.pendingTasks(date, ids, pkgID, tag)
+	if err != nil {
+		s.redirect(w, r, back, "读取待完成失败："+err.Error())
+		return
+	}
+	pending := make([]TaskRow, 0, len(rows))
+	for _, row := range rows {
+		if !row.Done && !row.Skipped {
+			pending = append(pending, row)
+		}
+	}
+	switch len(pending) {
+	case 0:
+		if len(rows) > 0 {
+			s.redirect(w, r, back, "尾号 "+tail+" 今天的服务已经处理过了")
+			return
+		}
+		s.redirect(w, r, back, "尾号 "+tail+" 今天没有待完成的服务")
+		return
+	case 1:
+		row := pending[0]
+		u := s.currentUser(r)
+		var op int64
+		if u != nil {
+			op = u.ID
+		}
+		if err := s.completeTask(row.ID, date, op); err != nil {
+			s.redirect(w, r, back, "完成失败："+err.Error())
+			return
+		}
+		s.logOp(r, "快速完成", "subscription", row.ID,
+			fmt.Sprintf("尾号 %s：%s %s 完成 %s（%s）", tail, row.CustomerTail, row.CustomerName, row.PackageName, date))
+		s.redirect(w, r, back, "已为 "+row.CustomerTail+" "+row.CustomerName+" 完成「"+row.PackageName+"」")
+		return
+	default:
+		// 多项：回到日历并打开选择面板
+		target := stripParam(back, "pick")
+		sep := "?"
+		if strings.Contains(target, "?") {
+			sep = "&"
+		}
+		s.redirect(w, r, target+sep+"pick="+urlQueryEscape(tail), fmt.Sprintf("尾号 %s 有 %d 项待完成，请勾选", tail, len(pending)))
+		return
+	}
+}
+
+// handleCheckinBatch 批量完成选中的订阅（同日）。
+func (s *Server) handleCheckinBatch(w http.ResponseWriter, r *http.Request) {
+	date := strings.TrimSpace(r.PostFormValue("date"))
+	if _, err := domain.ParseDate(date); err != nil {
+		date = domain.Date(domain.Today())
+	}
+	back := backURL(r, "/calendar?d="+date)
+	_ = r.ParseForm()
+	raw := r.PostForm["sub_ids"]
+	if len(raw) == 0 {
+		s.redirect(w, r, back, "没有选中任何项")
+		return
+	}
+	u := s.currentUser(r)
+	var op int64
+	if u != nil {
+		op = u.ID
+	}
+	done, failed := 0, 0
+	var lastErr string
+	for _, v := range raw {
+		id, err := strconv.ParseInt(strings.TrimSpace(v), 10, 64)
+		if err != nil {
+			failed++
+			continue
+		}
+		if err := s.completeTask(id, date, op); err != nil {
+			failed++
+			lastErr = err.Error()
+			continue
+		}
+		done++
+	}
+	if done > 0 {
+		s.logOp(r, "批量完成", "checkin", 0, fmt.Sprintf("%s 一次完成 %d 项", date, done))
+	}
+	msg := fmt.Sprintf("已完成 %d 项", done)
+	if failed > 0 {
+		msg += fmt.Sprintf("，%d 项失败（%s）", failed, lastErr)
+	}
+	s.redirect(w, r, stripParam(back, "pick"), msg)
+}
+
+// handleUrgentToggle 勾选/取消某天某订阅的加急。
+func (s *Server) handleUrgentToggle(w http.ResponseWriter, r *http.Request) {
+	subID := int64(s.formInt(r, "sub_id", 0))
+	date := strings.TrimSpace(r.PostFormValue("date"))
+	urgent := r.PostFormValue("urgent") == "1"
+	back := backURL(r, "/calendar")
+	if subID <= 0 {
+		s.redirect(w, r, back, "参数不正确")
+		return
+	}
+	if err := s.db.SetUrgent(subID, date, urgent); err != nil {
+		s.redirect(w, r, back, "设置加急失败："+err.Error())
+		return
+	}
+	word := "已取消加急"
+	if urgent {
+		word = "已标记加急"
+	}
+	if sub, err := s.db.Sub(subID); err == nil {
+		s.logOp(r, word, "subscription", subID, sub.SubTitle()+" "+date+" "+word)
+	}
+	s.redirect(w, r, back, word)
+}
+
+func urlQueryEscape(v string) string {
+	var b strings.Builder
+	for _, c := range []byte(v) {
+		if (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '-' || c == '_' || c == '.' || c == '~' {
+			b.WriteByte(c)
+			continue
+		}
+		b.WriteString("%")
+		const hex = "0123456789ABCDEF"
+		b.WriteByte(hex[c>>4])
+		b.WriteByte(hex[c&15])
+	}
+	return b.String()
+}

internal/web/server.go

@@ -5,6 +5,7 @@ import (
 	"bytes"
 	"context"
 	"crypto/rand"
+	"crypto/sha256"
 	"embed"
 	"encoding/hex"
 	"fmt"
@@ -22,7 +23,7 @@ import (
 	"daili/internal/store"
 )
 
-//go:embed templates/_layout.html templates/_screen_layout.html templates/_partials.html templates/pages/*.html
+//go:embed templates/_layout.html templates/_partials.html templates/pages/*.html
 var templateFS embed.FS
 
 //go:embed static
@@ -31,6 +32,7 @@ var staticFS embed.FS
 const (
 	cookieSession = "daili_sid"
 	cookieFlash   = "daili_flash"
+	cookieTheme   = "daili_theme"
 	sessionTTL    = 7 * 24 * time.Hour
 	pageSize      = 20
 )
@@ -42,18 +44,18 @@ type Config struct {
 	BackupKeep    int
 	BackupDir     string
 	BackupEnabled bool
-	ScreenPublic  bool
 	ConfigPath    string
 	Version       string
 }
 
 // Server 是应用服务。
 type Server struct {
-	db      *store.DB
+	db           *store.DB
-	cfg     Config
+	cfg          Config
-	tpl     *renderer
+	tpl          *renderer
-	handler http.Handler
+	handler      http.Handler
-	started time.Time
+	started      time.Time
+	assetVersion string
 }
 
 type ctxKey int
@@ -66,11 +68,33 @@ func New(db *store.DB, cfg Config) (*Server, error) {
 	if err != nil {
 		return nil, err
 	}
-	s := &Server{db: db, cfg: cfg, tpl: r, started: time.Now()}
+	s := &Server{db: db, cfg: cfg, tpl: r, started: time.Now(), assetVersion: staticAssetVersion()}
 	s.handler = s.routes()
 	return s, nil
 }
 
+// staticAssetVersion 计算内嵌静态资源的内容指纹。
+// 资源 URL 带上它之后可以放心长缓存；改了 CSS/JS 重新编译就会自动换 URL。
+func staticAssetVersion() string {
+	h := sha256.New()
+	if err := fs.WalkDir(staticFS, "static", func(path string, d fs.DirEntry, err error) error {
+		if err != nil || d.IsDir() {
+			return nil
+		}
+		data, rerr := fs.ReadFile(staticFS, path)
+		if rerr != nil {
+			return nil
+		}
+		h.Write([]byte(path))
+		h.Write([]byte{0})
+		h.Write(data)
+		return nil
+	}); err != nil {
+		return "dev"
+	}
+	return hex.EncodeToString(h.Sum(nil))[:12]
+}
+
 // Handler 返回 HTTP 处理器。
 func (s *Server) Handler() http.Handler { return s.handler }
 
@@ -81,7 +105,7 @@ func (s *Server) routes() http.Handler {
 	if err != nil {
 		panic(err)
 	}
-	mux.Handle("GET /static/", cacheControl(http.StripPrefix("/static/", http.FileServerFS(sub))))
+	mux.Handle("GET /static/", s.staticFiles(http.StripPrefix("/static/", http.FileServerFS(sub))))
 	mux.HandleFunc("GET /healthz", func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "text/plain; charset=utf-8")
 		_, _ = w.Write([]byte("ok"))
@@ -103,6 +127,9 @@ func (s *Server) routes() http.Handler {
 	mux.HandleFunc("GET /customers/{id}", s.auth(s.handleCustomerDetail))
 	mux.HandleFunc("GET /customers/{id}/edit", s.auth(s.handleCustomerEditPage))
 	mux.HandleFunc("POST /customers/{id}/edit", s.auth(s.handleCustomerUpdate))
+	mux.HandleFunc("POST /customers/{id}/archive", s.auth(s.handleCustomerArchive))
+	mux.HandleFunc("POST /customers/{id}/restore", s.auth(s.handleCustomerRestore))
+	mux.HandleFunc("POST /customers/{id}/delete", s.auth(s.handleCustomerDelete))
 	mux.HandleFunc("POST /customers/{id}/subscriptions", s.auth(s.handleSubCreate))
 	mux.HandleFunc("GET /subscriptions", s.auth(s.handleSubscriptions))
 	mux.HandleFunc("POST /subscriptions/{id}/extend", s.auth(s.handleSubExtend))
@@ -110,35 +137,40 @@ func (s *Server) routes() http.Handler {
 	mux.HandleFunc("POST /subscriptions/{id}/resume", s.auth(s.handleSubAction("resume")))
 	mux.HandleFunc("POST /subscriptions/{id}/close", s.auth(s.handleSubAction("close")))
 	mux.HandleFunc("POST /subscriptions/{id}/reopen", s.auth(s.handleSubAction("reopen")))
+	mux.HandleFunc("POST /subscriptions/{id}/delete", s.auth(s.handleSubDelete))
 	mux.HandleFunc("POST /subscriptions/{id}/checkin", s.auth(s.handleCheckinSave))
 	mux.HandleFunc("POST /checkins/{id}/delete", s.auth(s.handleCheckinDelete))
+	mux.HandleFunc("POST /checkins/batch", s.auth(s.handleCheckinBatch))
+	mux.HandleFunc("POST /checkins/quick", s.auth(s.handleQuickCheckin))
+	mux.HandleFunc("POST /tasks/urgent", s.auth(s.handleUrgentToggle))
 	mux.HandleFunc("GET /packages", s.auth(s.handlePackages))
 	mux.HandleFunc("GET /packages/new", s.auth(s.handlePackageNewPage))
 	mux.HandleFunc("POST /packages", s.auth(s.handlePackageCreate))
 	mux.HandleFunc("GET /packages/{id}/edit", s.auth(s.handlePackageEditPage))
 	mux.HandleFunc("POST /packages/{id}/edit", s.auth(s.handlePackageUpdate))
 	mux.HandleFunc("POST /packages/{id}/archive", s.auth(s.handlePackageArchive))
-	if s.cfg.ScreenPublic {
+	mux.HandleFunc("GET /packages/{id}", s.auth(s.handlePackageDetail))
-			// 大屏免登录：仅局域网部署时使用，内容为只读看板
+	mux.HandleFunc("POST /packages/{id}/subscribe", s.auth(s.handlePackageBatchSubscribe))
-			mux.HandleFunc("GET /screen", s.handleScreen)
-		} else {
-			mux.HandleFunc("GET /screen", s.auth(s.handleScreen))
-		}
 	mux.HandleFunc("GET /logs", s.auth(s.handleLogs))
 	mux.HandleFunc("GET /settings", s.auth(s.handleSettings))
 	mux.HandleFunc("POST /settings", s.auth(s.handleSettingsSave))
 	mux.HandleFunc("POST /settings/password", s.auth(s.handlePasswordChange))
-	mux.HandleFunc("POST /settings/users", s.auth(s.handleUserCreate))
-	mux.HandleFunc("POST /settings/users/{id}/toggle", s.auth(s.handleUserToggle))
 	mux.HandleFunc("POST /settings/backup", s.auth(s.handleBackupNow))
 	mux.HandleFunc("GET /export/{kind}", s.auth(s.handleExport))
 
 	return s.noCacheHTML(mux)
 }
 
-func cacheControl(h http.Handler) http.Handler {
+// staticFiles 给内嵌静态资源加缓存策略：
+// 只有带当前内容指纹（?v=）的 URL 才允许一年不可变缓存，其它一律回源。
+func (s *Server) staticFiles(h http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Cache-Control", "public, max-age=300")
+		w.Header().Set("X-Content-Type-Options", "nosniff")
+		if r.URL.Query().Get("v") == s.assetVersion {
+			w.Header().Set("Cache-Control", "public, max-age=31536000, immutable")
+		} else {
+			w.Header().Set("Cache-Control", "no-cache")
+		}
 		h.ServeHTTP(w, r)
 	})
 }
@@ -263,11 +295,6 @@ func newRenderer() (*renderer, error) {
 	if err != nil {
 		return nil, err
 	}
-	screenBase, err := template.New("screen").Funcs(funcs).ParseFS(templateFS,
-		"templates/_screen_layout.html", "templates/_partials.html")
-	if err != nil {
-		return nil, err
-	}
 
 	pages := map[string]*template.Template{}
 	entries, err := fs.Glob(templateFS, "templates/pages/*.html")
@@ -276,13 +303,7 @@ func newRenderer() (*renderer, error) {
 	}
 	for _, p := range entries {
 		name := strings.TrimSuffix(strings.TrimPrefix(p, "templates/pages/"), ".html")
-		var baseSet *template.Template
+		clone, err := base.Clone()
-		if name == "screen" {
-			baseSet = screenBase
-		} else {
-			baseSet = base
-		}
-		clone, err := baseSet.Clone()
 		if err != nil {
 			return nil, err
 		}
@@ -320,12 +341,19 @@ type page struct {
 	TodayStr string
 	WarnDays int
 	Version  string
-	Query    string
+	// AssetVersion 是内嵌静态资源的内容指纹，用于 /static/*.css?v=... 的长缓存
-	Next     string
+	AssetVersion string
-	DueToday int
+	Query        string
-	Due3     int
+	Name         string
-	Addr     string
+	InlineError  string
-	D        any
+	InvalidField string
+	Next         string
+	DueToday     int
+	Due3         int
+	Due7         int
+	Addr         string
+	Theme        string // "" = 跟随系统；light / dark
+	D            any
 }
 
 func (s *Server) warnDays() int {
@@ -336,14 +364,6 @@ func (s *Server) warnDays() int {
 	return v
 }
 
-func (s *Server) screenRefresh() int {
-	v, err := strconv.Atoi(s.db.Setting("screen_refresh", "30"))
-	if err != nil || v < 5 {
-		return 30
-	}
-	return v
-}
-
 func (s *Server) newPage(r *http.Request, title, nav string) *page {
 	u := s.currentUser(r)
 	today := domain.Today()
@@ -355,17 +375,33 @@ func (s *Server) newPage(r *http.Request, title, nav string) *page {
 		TodayStr: domain.Date(today),
 		WarnDays: s.warnDays(),
 		Version:  s.cfg.Version,
-		Query:    r.URL.Query().Get("q"),
+
-		Next:     r.URL.Query().Get("next"),
+		AssetVersion: s.assetVersion,
+		Query:        r.URL.Query().Get("q"),
+		Next:         r.URL.Query().Get("next"),
+		Theme:        themeFromRequest(r),
 	}
 	if u != nil {
-		if due, due3, err := s.db.Badges(today); err == nil {
+		if due, due3, due7, err := s.db.Badges(today); err == nil {
-			p.DueToday, p.Due3 = due, due3
+			p.DueToday, p.Due3, p.Due7 = due, due3, due7
 		}
 	}
 	return p
 }
 
+// themeFromRequest 读取主题偏好："" = 跟随系统，light / dark = 手动指定。
+func themeFromRequest(r *http.Request) string {
+	c, err := r.Cookie(cookieTheme)
+	if err != nil {
+		return ""
+	}
+	switch c.Value {
+	case "light", "dark":
+		return c.Value
+	}
+	return ""
+}
+
 func (s *Server) popFlash(w http.ResponseWriter, r *http.Request) string {
 	c, err := r.Cookie(cookieFlash)
 	if err != nil || c.Value == "" {
@@ -411,9 +447,6 @@ func (s *Server) render(w http.ResponseWriter, r *http.Request, name string, d *
 		return
 	}
 	layout := "layout"
-	if name == "screen" {
-		layout = "screenlayout"
-	}
 	var buf bytes.Buffer
 	if err := tpl.ExecuteTemplate(&buf, layout, d); err != nil {
 		log.Printf("渲染 %s 失败: %v", name, err)

internal/web/static/app.js

@@ -1,16 +1,21 @@
-/* 代打台 · 交互增强（无框架，全部渐进增强） */
+/* 代打台-L · 交互增强（无框架，全部渐进增强） */
+/* Powered by Baka春秋 */
 (function () {
   'use strict';
 
-  /* 提示条自动淡出 */
+  /* ---------- 工具：本地日期，禁止用 toISOString 做“自然日”计算 ---------- */
+  function parseDay(s) { return new Date(s + 'T00:00:00'); }
+  function diffDays(a, b) { return Math.round((b.getTime() - a.getTime()) / 86400000); }
+
+  /* ---------- 提示条：自动淡出（.flash 固定定位，不会顶动页面） ---------- */
   document.querySelectorAll('[data-flash]').forEach(function (el) {
     setTimeout(function () {
       el.classList.add('hide');
-      setTimeout(function () { el.remove(); }, 450);
+      setTimeout(function () { el.remove(); }, 400);
     }, 4200);
   });
 
-  /* 按 / 聚焦搜索框 */
+  /* ---------- 按 / 聚焦搜索框 ---------- */
   document.addEventListener('keydown', function (e) {
     if (e.key !== '/' || e.metaKey || e.ctrlKey || e.altKey) return;
     var tag = (document.activeElement && document.activeElement.tagName) || '';
@@ -19,17 +24,14 @@
     if (s) { e.preventDefault(); s.focus(); s.select(); }
   });
 
-  /* 危险操作确认 */
+  /* ---------- 危险操作确认 ---------- */
   document.querySelectorAll('form[data-confirm]').forEach(function (f) {
     f.addEventListener('submit', function (e) {
       if (!window.confirm(f.getAttribute('data-confirm'))) e.preventDefault();
     });
   });
 
-  /* 追加时长面板：点日历挑终止日 + 实时反算 */
+  /* ---------- 追加时长面板：点日历挑终止日 + 实时反算 ---------- */
-  function parseDay(s) { return new Date(s + 'T00:00:00'); }
-  function diffDays(a, b) { return Math.round((b.getTime() - a.getTime()) / 86400000); }
-
   document.querySelectorAll('form[data-extend]').forEach(function (form) {
     var base = parseDay(form.getAttribute('data-base'));
     var today = parseDay(form.getAttribute('data-today'));
@@ -63,46 +65,92 @@
     if (input.value) paint(input.value);
   });
 
-  /* 新订阅表单：按套餐类型切换「天数 / 次数 / 终止日」 */
+  /* ---------- 新订阅表单：选套餐时带出默认天数 ---------- */
   document.querySelectorAll('form[data-sub-form]').forEach(function (form) {
     var sel = form.querySelector('[data-pkg-select]');
     var daysWrap = form.querySelector('[data-days-wrap]');
-    var countWrap = form.querySelector('[data-count-wrap]');
+    if (!sel || !daysWrap) return;
-    var endWrap = form.querySelector('[data-end-wrap]');
+    var daysInput = daysWrap.querySelector('input');
-    if (!sel) return;
 
-    function sync() {
+    sel.addEventListener('change', function () {
       var opt = sel.options[sel.selectedIndex];
-      var unit = opt && opt.getAttribute('data-unit');
+      var amount = opt && parseInt(opt.getAttribute('data-amount') || '0', 10);
-      var amount = opt && opt.getAttribute('data-amount');
+      if (amount > 0 && daysInput) daysInput.value = amount;
-      if (unit === 'count') {
+    });
-        if (daysWrap) daysWrap.hidden = true;
-        if (countWrap) { countWrap.hidden = false; if (amount) countWrap.querySelector('input').value = amount; }
-        if (endWrap) endWrap.hidden = true;
-      } else if (unit === 'day') {
-        if (daysWrap) { daysWrap.hidden = false; if (amount) daysWrap.querySelector('input').value = amount; }
-        if (countWrap) countWrap.hidden = true;
-        if (endWrap) endWrap.hidden = false;
-      } else {
-        if (daysWrap) daysWrap.hidden = false;
-        if (countWrap) countWrap.hidden = true;
-        if (endWrap) endWrap.hidden = true;
-      }
-    }
-    sel.addEventListener('change', sync);
-    sync();
   });
 
-  /* 套餐表单：切换默认量单位文案 */
+  /* ---------- 批量开通：表头全选 + 半选状态 ---------- */
-  document.querySelectorAll('form[data-package-form]').forEach(function (form) {
+  document.querySelectorAll('[data-select-all]').forEach(function (box) {
-    var label = form.querySelector('[data-unit-label]');
+    var form = box.closest('form') || document;
-    var radios = form.querySelectorAll('input[name="unit"]');
+    var boxes = form.querySelectorAll('input[name="customer_ids"]');
-    function sync() {
+
-      var v = 'day';
+    function refresh() {
-      radios.forEach(function (r) { if (r.checked) v = r.value; });
+      var total = 0, checked = 0;
-      if (label) label.textContent = v === 'count' ? '次' : '天';
+      boxes.forEach(function (c) {
+        if (c.disabled) return;
+        total++;
+        if (c.checked) checked++;
+      });
+      box.checked = total > 0 && checked === total;
+      box.indeterminate = checked > 0 && checked < total;
     }
-    radios.forEach(function (r) { r.addEventListener('change', sync); });
+
-    sync();
+    box.addEventListener('change', function () {
+      boxes.forEach(function (c) { if (!c.disabled) c.checked = box.checked; });
+      box.indeterminate = false;
+    });
+    boxes.forEach(function (c) { c.addEventListener('change', refresh); });
+    refresh();
+  });
+})();
+
+/* ---------- 亮色 / 暗色切换 ----------
+   唯一状态源是 <html data-bs-theme>：服务端按 Cookie 直出，
+   没有 Cookie 时由 <head> 里的内联脚本按系统偏好补上。 */
+(function () {
+  'use strict';
+  var KEY = 'daili_theme';
+  var root = document.documentElement;
+  var btns = document.querySelectorAll('[data-theme-toggle]');
+  if (!btns.length) return;
+
+  function current() {
+    return root.getAttribute('data-bs-theme') === 'dark' ? 'dark' : 'light';
+  }
+  function paint() {
+    var dark = current() === 'dark';
+    btns.forEach(function (b) { b.setAttribute('aria-pressed', dark ? 'true' : 'false'); });
+  }
+
+  btns.forEach(function (btn) {
+    btn.addEventListener('click', function () {
+      var next = current() === 'dark' ? 'light' : 'dark';
+      root.setAttribute('data-bs-theme', next);
+      document.cookie = KEY + '=' + next + '; path=/; max-age=31536000; SameSite=Lax';
+      paint();
+    });
+  });
+  paint();
+})();
+
+/* ---------- 抽屉时钟 + 更多菜单 ---------- */
+(function () {
+  'use strict';
+
+  /* 时钟：精确到秒 */
+  var clocks = document.querySelectorAll('[data-clock]');
+  function tick() {
+    var d = new Date();
+    var pad = function (n) { return n < 10 ? '0' + n : '' + n; };
+    var t = pad(d.getHours()) + ':' + pad(d.getMinutes()) + ':' + pad(d.getSeconds());
+    clocks.forEach(function (el) { el.textContent = t; });
+  }
+  if (clocks.length) { tick(); setInterval(tick, 1000); }
+
+  /* 更多菜单：点开一个时收起其它，点空白处关闭 */
+  document.addEventListener('click', function (e) {
+    document.querySelectorAll('.more-actions[open]').forEach(function (d) {
+      if (!d.contains(e.target)) { d.removeAttribute('open'); }
+    });
   });
 })();

internal/web/static/screen.css

@@ -1,212 +0,0 @@
-/* ============================================================
-   代打台 · 可视化大屏（深色「记分板」）
-   ============================================================ */
-
-:root {
-  --bg: #070a0f;
-  --panel: #0e141c;
-  --panel-2: #121a24;
-  --line: #1b2530;
-  --ink: #e8eef2;
-  --dim: #7d8b99;
-  --mint: #35e0c6;
-  --mint-dim: rgba(53, 224, 198, 0.14);
-  --amber: #f5a524;
-  --red: #f2555a;
-  --mono: "Bahnschrift", "Consolas", "SF Mono", ui-monospace, monospace;
-  --sans: "Microsoft YaHei UI", "PingFang SC", system-ui, sans-serif;
-}
-
-* { box-sizing: border-box; }
-
-html, body { margin: 0; height: 100%; }
-
-body.screen-body {
-  background:
-    radial-gradient(1200px 600px at 15% -10%, rgba(53, 224, 198, 0.07), transparent 60%),
-    radial-gradient(900px 500px at 100% 0%, rgba(245, 165, 36, 0.05), transparent 55%),
-    var(--bg);
-  color: var(--ink);
-  font-family: var(--sans);
-  font-size: 14px;
-  min-height: 100vh;
-  overflow-x: hidden;
-}
-
-a { color: var(--mint); text-decoration: none; }
-a:hover { opacity: 0.8; }
-
-.scr {
-  display: flex; flex-direction: column;
-  min-height: 100vh;
-  padding: clamp(12px, 1.4vw, 22px) clamp(14px, 1.8vw, 28px);
-  gap: clamp(10px, 1.1vw, 16px);
-}
-
-.scr-head { display: flex; align-items: center; gap: 16px; }
-.scr-brand {
-  display: flex; align-items: center; gap: 10px;
-  font-size: clamp(15px, 1.2vw, 19px); font-weight: 700; letter-spacing: 0.1em;
-}
-.scr-brand .mark {
-  display: grid; place-items: center;
-  width: 30px; height: 30px; border-radius: 3px;
-  background: var(--mint); color: #04211d; font-size: 15px;
-  box-shadow: 0 0 22px rgba(53, 224, 198, 0.45);
-}
-.scr-brand em { font-style: normal; color: var(--dim); font-weight: 400; letter-spacing: 0.24em; font-size: 0.7em; }
-
-.scr-clock { margin-left: auto; display: flex; flex-direction: column; align-items: flex-end; }
-.scr-clock b {
-  font-family: var(--mono); font-size: clamp(24px, 2.4vw, 36px);
-  font-weight: 600; line-height: 1;
-  color: var(--ink); letter-spacing: 0.04em;
-  text-shadow: 0 0 22px rgba(53, 224, 198, 0.25);
-}
-.scr-clock span { font-family: var(--mono); font-size: 11px; color: var(--dim); letter-spacing: 0.1em; }
-.scr-links { font-size: 11px; color: var(--dim); }
-
-/* KPI */
-.scr-kpis { display: grid; grid-template-columns: repeat(4, 1fr); gap: clamp(8px, 0.9vw, 14px); }
-.kpi {
-  position: relative; overflow: hidden;
-  background: linear-gradient(180deg, var(--panel-2), var(--panel));
-  border: 1px solid var(--line);
-  border-radius: 4px;
-  padding: clamp(10px, 1vw, 16px) clamp(12px, 1.2vw, 20px);
-}
-.kpi::before {
-  content: ""; position: absolute; left: 0; top: 0; bottom: 0; width: 3px;
-  background: var(--mint); opacity: 0.75;
-}
-.kpi-warm::before { background: var(--amber); }
-.kpi-hot::before { background: var(--red); }
-.kpi span { display: block; font-size: 11px; color: var(--dim); letter-spacing: 0.16em; }
-.kpi b {
-  font-family: var(--mono); font-size: clamp(28px, 3.4vw, 52px); font-weight: 700;
-  line-height: 1.15; letter-spacing: -0.01em;
-}
-.kpi i { font-style: normal; font-size: 11px; color: var(--dim); margin-left: 4px; }
-.kpi-hot b { color: var(--red); }
-.kpi-warm b { color: var(--amber); }
-
-/* 主区 */
-.scr-main { display: grid; grid-template-columns: 1.15fr 1fr; gap: clamp(10px, 1.1vw, 16px); flex: 1 1 auto; }
-.panel {
-  background: var(--panel);
-  border: 1px solid var(--line);
-  border-radius: 4px;
-  padding: clamp(10px, 1vw, 16px);
-  display: flex; flex-direction: column; min-height: 0;
-}
-.panel-head { display: flex; align-items: baseline; justify-content: space-between; gap: 10px; margin-bottom: 10px; }
-.panel-head h2 {
-  margin: 0; font-size: clamp(12px, 0.95vw, 14px); font-weight: 600; letter-spacing: 0.08em;
-  color: var(--ink);
-}
-.panel-head h2::before {
-  content: ""; display: inline-block; width: 6px; height: 6px; margin-right: 7px;
-  background: var(--mint); vertical-align: 2px;
-}
-.panel-head span { font-size: 11px; color: var(--dim); font-family: var(--mono); }
-
-/* 热力月历 */
-.heat-grid { display: flex; flex-direction: column; gap: 4px; flex: 1 1 auto; }
-.heat-dow, .heat-row { display: grid; grid-template-columns: repeat(7, 1fr); gap: 4px; }
-.heat-row { flex: 1 1 0; min-height: 0; }
-.heat-dow { flex: 0 0 auto; }
-.heat-dow span { text-align: center; font-size: 10px; color: var(--dim); }
-.heat-cell {
-  position: relative;
-  display: flex; flex-direction: column; justify-content: space-between;
-  min-height: 34px;
-  padding: 5px 6px;
-  border: 1px solid var(--line);
-  border-radius: 3px;
-  background: #0a1017;
-}
-.heat-cell span { font-family: var(--mono); font-size: 10px; color: var(--dim); }
-.heat-cell b {
-  align-self: flex-end; font-family: var(--mono); font-size: clamp(12px, 1.1vw, 16px);
-  color: var(--mint); font-weight: 700;
-}
-.heat-cell.out { opacity: 0.28; }
-.heat-cell.today { border-color: var(--mint); box-shadow: 0 0 0 1px rgba(53, 224, 198, 0.35), 0 0 18px rgba(53, 224, 198, 0.16); }
-.heat-cell.h1 { background: rgba(53, 224, 198, 0.08); border-color: rgba(53, 224, 198, 0.22); }
-.heat-cell.h2 { background: rgba(53, 224, 198, 0.15); border-color: rgba(53, 224, 198, 0.3); }
-.heat-cell.h3 { background: rgba(53, 224, 198, 0.24); border-color: rgba(53, 224, 198, 0.42); }
-.heat-cell.h4 { background: rgba(53, 224, 198, 0.36); border-color: rgba(53, 224, 198, 0.6); }
-.heat-cell.h3 b, .heat-cell.h4 b { color: #eafffb; }
-.heat-legend { display: flex; align-items: center; gap: 5px; margin-top: 10px; font-size: 10px; color: var(--dim); flex: 0 0 auto; }
-.heat-legend i { width: 18px; height: 9px; border-radius: 2px; border: 1px solid #26313d; }
-.heat-legend .h0 { background: #0a1017; }
-.heat-legend .h1 { background: rgba(53, 224, 198, 0.16); }
-.heat-legend .h2 { background: rgba(53, 224, 198, 0.28); }
-.heat-legend .h3 { background: rgba(53, 224, 198, 0.42); }
-.heat-legend .h4 { background: rgba(53, 224, 198, 0.6); }
-
-/* TOP10 */
-.top-list { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; gap: 4px; overflow: hidden; }
-.top-item {
-  display: grid; grid-template-columns: 22px auto 1fr auto auto;
-  grid-template-areas: "rank tail name pkg remain" "rank bar bar bar bar";
-  column-gap: 8px; row-gap: 3px;
-  align-items: center;
-  padding: 5px 8px;
-  border-radius: 3px;
-  background: #0a1017;
-  border-left: 2px solid transparent;
-}
-.top-item .rank { grid-area: rank; font-family: var(--mono); font-size: 11px; color: var(--dim); }
-.top-tail { grid-area: tail; font-family: var(--mono); font-size: clamp(13px, 1.15vw, 17px); font-weight: 700; letter-spacing: 0.03em; }
-.top-name { grid-area: name; font-size: 12px; color: var(--ink); overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
-.top-pkg {
-  grid-area: pkg; font-size: 10px; color: var(--dim);
-  border-left: 2px solid var(--tag); padding-left: 5px;
-}
-.top-remain { grid-area: remain; font-family: var(--mono); font-size: 12px; color: var(--mint); }
-.top-bar { grid-area: bar; height: 3px; background: #16202b; border-radius: 999px; overflow: hidden; }
-.top-bar i { display: block; height: 100%; background: linear-gradient(90deg, var(--mint), rgba(53, 224, 198, 0.35)); }
-.top-item.lv-warn { border-left-color: var(--amber); }
-.top-item.lv-warn .top-remain { color: var(--amber); }
-.top-item.lv-warn .top-bar i { background: linear-gradient(90deg, var(--amber), rgba(245, 165, 36, 0.3)); }
-.top-item.lv-today, .top-item.lv-expired { border-left-color: var(--red); }
-.top-item.lv-today .top-remain, .top-item.lv-expired .top-remain { color: var(--red); }
-.top-item.lv-today .top-bar i, .top-item.lv-expired .top-bar i { background: linear-gradient(90deg, var(--red), rgba(242, 85, 90, 0.3)); }
-
-/* 底部 */
-.scr-bottom { display: grid; grid-template-columns: 1.15fr 1fr; gap: clamp(10px, 1.1vw, 16px); }
-.today-list, .recent-list { list-style: none; margin: 0; padding: 0; display: flex; flex-direction: column; gap: 3px; max-height: 22vh; overflow: hidden; }
-.today-list li {
-  display: grid; grid-template-columns: auto 1fr auto; gap: 10px; align-items: center;
-  padding: 4px 6px; border-bottom: 1px solid rgba(27, 37, 48, 0.6);
-}
-.tchip {
-  display: inline-flex; align-items: baseline; gap: 3px;
-  padding: 1px 6px; font-size: 11px;
-  border-left: 3px solid var(--tag);
-  background: rgba(255, 255, 255, 0.04);
-  border-radius: 1px 2px 2px 1px;
-}
-.tchip b { font-family: var(--mono); font-size: 12px; color: var(--ink); }
-.today-list .pkg, .recent-list .pkg { font-size: 11px; color: var(--dim); }
-.today-list .rem { font-family: var(--mono); font-size: 11px; color: var(--mint); }
-
-.recent-list li { display: flex; align-items: center; gap: 8px; padding: 3px 4px; font-size: 11px; border-bottom: 1px solid rgba(27, 37, 48, 0.6); }
-.recent-list .time { color: var(--dim); font-size: 10px; }
-.recent-list .who b { font-family: var(--mono); font-size: 12px; margin-right: 4px; }
-.recent-list .plus { margin-left: auto; color: var(--mint); font-family: var(--mono); font-style: normal; }
-.recent-list .op { color: var(--dim); }
-
-.scr-foot { font-size: 10px; color: #47535f; text-align: right; letter-spacing: 0.12em; }
-.scr-empty { margin: auto; color: var(--dim); font-size: 12px; text-align: center; }
-
-@media (max-width: 1100px) {
-  .scr-kpis { grid-template-columns: repeat(2, 1fr); }
-  .scr-main, .scr-bottom { grid-template-columns: 1fr; }
-  .heat-cell { min-height: 34px; }
-}
-
-@media (prefers-reduced-motion: reduce) {
-  * { animation: none !important; transition: none !important; }
-}

internal/web/static/screen.js

@@ -1,29 +0,0 @@
-/* 大屏：时钟 + 全屏快捷键 */
-(function () {
-  'use strict';
-
-  function pad(n) { return n < 10 ? '0' + n : '' + n; }
-
-  function tick() {
-    var d = new Date();
-    var clock = document.querySelector('[data-clock]');
-    if (clock) clock.textContent = pad(d.getHours()) + ':' + pad(d.getMinutes()) + ':' + pad(d.getSeconds());
-    var dateEl = document.querySelector('[data-date]');
-    if (dateEl) {
-      dateEl.textContent = d.getFullYear() + '-' + pad(d.getMonth() + 1) + '-' + pad(d.getDate()) +
-        ' 周' + '日一二三四五六'.charAt(d.getDay());
-    }
-  }
-  tick();
-  setInterval(tick, 1000);
-
-  document.addEventListener('keydown', function (e) {
-    if (e.key === 'f' || e.key === 'F') {
-      if (document.fullscreenElement) {
-        document.exitFullscreen();
-      } else if (document.documentElement.requestFullscreen) {
-        document.documentElement.requestFullscreen();
-      }
-    }
-  });
-})();

internal/web/templates/_layout.html

@@ -1,41 +1,71 @@
 {{define "layout"}}<!doctype html>
-<html lang="zh-CN">
+<html lang="zh-CN"{{if .Theme}} data-bs-theme="{{.Theme}}"{{end}}>
 <head>
 <meta charset="utf-8">
 <meta name="viewport" content="width=device-width, initial-scale=1">
-<title>{{.Title}} · 代打台</title>
+<meta name="color-scheme" content="light dark">
-<link rel="icon" href="/static/favicon.svg" type="image/svg+xml">
+<title>{{.Title}} · 代打台-L</title>
-<link rel="stylesheet" href="/static/app.css">
+<link rel="icon" href="/static/favicon.svg?v={{.AssetVersion}}" type="image/svg+xml">
+<script>
+  /* 首屏主题：服务端没有写 data-bs-theme 时（还没选过主题）跟随系统，避免闪白 */
+  (function () {
+    var d = document.documentElement;
+    if (d.hasAttribute('data-bs-theme')) return;
+    var dark = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches;
+    d.setAttribute('data-bs-theme', dark ? 'dark' : 'light');
+  })();
+</script>
+<link rel="stylesheet" href="/static/vendor/bootstrap.min.css?v={{.AssetVersion}}">
+<link rel="stylesheet" href="/static/app.css?v={{.AssetVersion}}">
 </head>
 <body>
+<!-- Powered by Baka春秋 · 代打台-L 盲水印（不可见，勿删） -->
+<div class="wm-blind" aria-hidden="true" data-wm="Powered by Baka春秋" hidden-mark="Powered by Baka春秋">Powered by Baka春秋</div>
 {{if .User}}
-<header class="topbar">
+<nav class="navbar navbar-expand-xl app-navbar sticky-top">
-  <a class="brand" href="/calendar"><span class="brand-mark">代</span><span class="brand-name">代打台</span></a>
+  <div class="container-fluid">
-  <form class="search" action="/customers" method="get" role="search">
+    <a class="navbar-brand" href="/calendar"><span class="brand-mark" aria-hidden="true">代</span><span>代打台-L</span></a>
-    <input type="search" name="q" value="{{.Query}}" placeholder="手机尾号 / 姓名 / 游戏名" aria-label="搜索客户" autocomplete="off" data-search>
+    <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#mainNav" aria-controls="mainNav" aria-expanded="false" aria-label="展开导航"><span class="navbar-toggler-icon"></span></button>
-    <kbd>/</kbd>
+    <div class="collapse navbar-collapse" id="mainNav">
-  </form>
+      <ul class="navbar-nav me-auto">
-  <nav class="nav">
+        <li class="nav-item"><a class="nav-link{{if eq .Nav "calendar"}} active{{end}}" href="/calendar">日历</a></li>
-    <a href="/calendar" class="{{if eq .Nav "calendar"}}on{{end}}">日历</a>
+        <li class="nav-item"><a class="nav-link{{if eq .Nav "customers"}} active{{end}}" href="/customers">客户</a></li>
-    <a href="/customers" class="{{if eq .Nav "customers"}}on{{end}}">客户</a>
+        <li class="nav-item"><a class="nav-link{{if eq .Nav "subscriptions"}} active{{end}}" href="/subscriptions">订阅</a></li>
-    <a href="/subscriptions" class="{{if eq .Nav "subscriptions"}}on{{end}}">订阅</a>
+        <li class="nav-item"><a class="nav-link{{if eq .Nav "packages"}} active{{end}}" href="/packages">套餐</a></li>
-    <a href="/packages" class="{{if eq .Nav "packages"}}on{{end}}">套餐</a>
+      </ul>
-    <a href="/screen" target="_blank" rel="noopener" class="nav-screen">大屏 ↗</a>
+      <form class="nav-search" role="search" action="/customers" method="get">
-  </nav>
+        <input class="form-control form-control-sm" type="search" name="q" value="{{.Query}}" placeholder="手机尾号 / 姓名 / 游戏名" aria-label="搜索客户" data-search>
-  <div class="topbar-right">
+        <kbd aria-hidden="true">/</kbd>
-    <a class="pill pill-due" href="/subscriptions?state=due_today" title="今天到期的订阅">今日到期 <b>{{.DueToday}}</b></a>
+      </form>
-    <a class="pill pill-warn" href="/subscriptions?state=due3" title="3 天内到期">3 天内 <b>{{.Due3}}</b></a>
+      <div class="nav-side">
-    <div class="me">
+        <a class="badge-due" href="/subscriptions?state=due_today" title="今天到期">今日到期 <b>{{.DueToday}}</b></a>
-      <a href="/settings">{{if .User.DisplayName}}{{.User.DisplayName}}{{else}}{{.User.Username}}{{end}}</a>
+        <a class="badge-warn" href="/subscriptions?state=due3" title="3 天内到期">3 天内 <b>{{.Due3}}</b></a>
-      <form method="post" action="/logout"><button type="submit" class="link-btn">退出</button></form>
+        <a class="badge-muted" href="/subscriptions?state=due7" title="7 天内到期">7 天内 <b>{{.Due7}}</b></a>
+        <button class="theme-toggle" type="button" data-theme-toggle aria-label="切换亮色/暗色" aria-pressed="false"><span class="ic-moon" aria-hidden="true">☾</span><span class="ic-sun" aria-hidden="true">☀</span></button>
+        <div class="dropdown">
+          <button class="btn btn-soft btn-sm dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">{{if .User.DisplayName}}{{.User.DisplayName}}{{else}}{{.User.Username}}{{end}}</button>
+          <ul class="dropdown-menu dropdown-menu-end">
+            <li><a class="dropdown-item" href="/settings">设置</a></li>
+            <li><a class="dropdown-item" href="/logs">操作日志</a></li>
+            <li><hr class="dropdown-divider"></li>
+            <li><form method="post" action="/logout"><button class="dropdown-item text-danger" type="submit">退出登录</button></form></li>
+          </ul>
+        </div>
+      </div>
     </div>
   </div>
-</header>
+</nav>
 {{end}}
-{{if .Flash}}<div class="flash" data-flash>{{.Flash}}</div>{{end}}
+{{if .Flash}}<div class="flash" role="status" data-flash>{{.Flash}}</div>{{end}}
-{{if .Error}}<div class="flash flash-error">{{.Error}}</div>{{end}}
+{{if .Error}}<div class="notice notice-danger" role="alert">{{.Error}}</div>{{end}}
-<main{{if .User}} class="with-top"{{end}}>{{template "content" .}}</main>
+<main class="{{if .User}}app-main{{else}}auth-main{{end}}">{{template "content" .}}</main>
-{{if .User}}<footer class="foot">代打台 v{{.Version}} · <a href="/logs">操作日志</a> · <a href="/settings">设置</a> · <a href="/screen" target="_blank" rel="noopener">大屏</a></footer>{{end}}
+{{if .User}}<footer class="app-foot">
-<script src="/static/app.js" defer></script>
+  <span>代打台-L <span class="foot-version">v{{.Version}}</span></span>
+  <span class="foot-by">Powered by Baka春秋</span>
+  <a href="/logs">操作日志</a>
+  <a href="/settings">设置</a>
+</footer>{{end}}
+<script src="/static/vendor/bootstrap.bundle.min.js?v={{.AssetVersion}}" defer></script>
+<script src="/static/app.js?v={{.AssetVersion}}" defer></script>
 </body>
 </html>{{end}}

internal/web/templates/_partials.html

@@ -3,9 +3,9 @@
 {{define "pager"}}
 {{if gt .Pages 1}}
 <nav class="pager">
-  {{if .Prev}}<a class="btn btn-sm" href="{{.Prev}}">← 上一页</a>{{else}}<span class="btn btn-sm disabled">← 上一页</span>{{end}}
+  {{if .Prev}}<a class="btn btn-soft btn-sm" href="{{.Prev}}">← 上一页</a>{{else}}<span class="btn btn-soft btn-sm disabled">← 上一页</span>{{end}}
   <span class="pager-info">{{.Page}} / {{.Pages}} 页 · 共 {{.Total}} 条</span>
-  {{if .Next}}<a class="btn btn-sm" href="{{.Next}}">下一页 →</a>{{else}}<span class="btn btn-sm disabled">下一页 →</span>{{end}}
+  {{if .Next}}<a class="btn btn-soft btn-sm" href="{{.Next}}">下一页 →</a>{{else}}<span class="btn btn-soft btn-sm disabled">下一页 →</span>{{end}}
 </nav>
 {{end}}
 {{end}}
@@ -19,7 +19,7 @@
 {{end}}
 
 {{define "sub-card"}}
-<article class="subcard" id="sub-{{.ID}}" style="--tag:{{.PackageColor}}">
+<article class="subcard{{if eq .Status "closed"}} is-closed{{end}}" id="sub-{{.ID}}" style="--tag:{{.PackageColor}}">
   <div class="subcard-head">
     <span class="tag"></span>
     <h3>{{.PackageName}}</h3>
@@ -38,25 +38,29 @@
       <form method="post" action="/subscriptions/{{.ID}}/checkin">
         <input type="hidden" name="date" value="{{.Today}}">
         <input type="hidden" name="status" value="done">
-        <button class="btn btn-sm">今日打卡</button>
+        <button class="btn btn-primary btn-sm">今日打卡</button>
       </form>
       {{end}}
-      <a class="btn btn-primary btn-sm" href="?extend={{.ID}}#extend">{{if eq .Unit "day"}}追加时长{{else}}追加次数{{end}}</a>
+      <a class="btn btn-soft btn-sm" href="?extend={{.ID}}#extend">追加时长</a>
       {{if eq .Status "active"}}
       <form method="post" action="/subscriptions/{{.ID}}/pause" data-confirm="暂停后剩余时长冻结，确认暂停？">
-        <button class="btn btn-sm">暂停</button>
+        <button class="btn btn-soft btn-sm">暂停</button>
       </form>
       {{else if eq .Status "paused"}}
       <form method="post" action="/subscriptions/{{.ID}}/resume">
-        <button class="btn btn-sm">恢复</button>
+        <button class="btn btn-soft btn-sm">恢复</button>
       </form>
       {{end}}
       <form method="post" action="/subscriptions/{{.ID}}/close" data-confirm="结束后该订阅不再出现在待打清单，确认结束？">
-        <button class="btn btn-sm btn-ghost">结束</button>
+        <button class="btn btn-ghost btn-sm">结束</button>
       </form>
     {{else}}
       <form method="post" action="/subscriptions/{{.ID}}/reopen">
-        <button class="btn btn-sm">重新启用</button>
+        <button class="btn btn-soft btn-sm">重新启用</button>
+      </form>
+      <form method="post" action="/subscriptions/{{.ID}}/delete" data-confirm="将永久删除该订阅及其打卡/追加记录，无法恢复。确定删除？">
+        <input type="hidden" name="confirm" value="delete">
+        <button class="btn btn-ghost btn-sm text-danger">删除</button>
       </form>
     {{end}}
   </div>
@@ -67,12 +71,11 @@
 <section class="extend" id="extend" style="--tag:{{.Sub.PackageColor}}">
   <header class="extend-head">
     <div>
-      <h3>给 {{.Sub.CustomerTail}} {{.Sub.CustomerName}} 追加{{if .IsDay}}时长{{else}}次数{{end}}</h3>
+      <h3>给 {{.Sub.CustomerTail}} {{.Sub.CustomerName}} 追加时长</h3>
-      <p class="muted">{{.Sub.PackageName}} · {{.View.RemainText}} · {{.View.PeriodText}}</p>
+      <p>{{.Sub.PackageName}} · {{.View.RemainText}} · {{.View.PeriodText}}</p>
     </div>
     <a class="extend-close" href="{{.Back}}" aria-label="关闭">×</a>
   </header>
-  {{if .IsDay}}
   <form method="post" action="/subscriptions/{{.Sub.ID}}/extend" class="extend-form"
         data-extend data-base="{{.Base}}" data-old-end="{{.OldEnd}}" data-today="{{.Today}}">
     <input type="hidden" name="back" value="{{.Back}}">
@@ -103,33 +106,8 @@
     </label>
     <div class="actions">
       <button type="submit" class="btn btn-primary">确认追加</button>
-      <a class="btn" href="{{.Back}}">取消</a>
+      <a class="btn btn-soft" href="{{.Back}}">取消</a>
     </div>
   </form>
-  {{else}}
-  <form method="post" action="/subscriptions/{{.Sub.ID}}/extend" class="extend-form">
-    <input type="hidden" name="back" value="{{.Back}}">
-    <div class="extend-preview">
-      <div><span>当前剩余</span><b>{{.View.RemainText}}</b></div>
-      <div><span>已用 / 总数</span><b>{{.Sub.UsedCount}} / {{.Sub.TotalCount}}</b></div>
-      {{if .Sub.EndDate}}<div><span>有效期至</span><b>{{.Sub.EndDate}}</b></div>{{end}}
-    </div>
-    <div class="grid-2">
-      <label class="field"><span>追加次数</span>
-        <input type="number" name="add_count" min="1" max="10000" value="{{.DefaultAmount}}" required>
-      </label>
-      <label class="field"><span>新的有效期（留空不改）</span>
-        <input type="date" name="new_end_opt">
-      </label>
-    </div>
-    <label class="field"><span>备注</span>
-      <input type="text" name="note" maxlength="120" placeholder="例如：加购 10 次副本">
-    </label>
-    <div class="actions">
-      <button type="submit" class="btn btn-primary">确认追加</button>
-      <a class="btn" href="{{.Back}}">取消</a>
-    </div>
-  </form>
-  {{end}}
 </section>
 {{end}}

internal/web/templates/_screen_layout.html

@@ -1,15 +0,0 @@
-{{define "screenlayout"}}<!doctype html>
-<html lang="zh-CN">
-<head>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="refresh" content="{{.D.Refresh}}">
-<title>{{.Title}} · 代打台</title>
-<link rel="icon" href="/static/favicon.svg" type="image/svg+xml">
-<link rel="stylesheet" href="/static/screen.css">
-</head>
-<body class="screen-body">
-{{template "content" .}}
-<script src="/static/screen.js" defer></script>
-</body>
-</html>{{end}}

internal/web/templates/pages/calendar.html

@@ -2,19 +2,30 @@
 <div class="cal-page">
   <header class="cal-head">
     <div class="cal-title">
-      <a class="btn btn-ghost btn-square" href="/calendar?y={{.D.PrevY}}&m={{.D.PrevM}}" aria-label="上个月">‹</a>
+      <a class="btn btn-ghost btn-square" href="/calendar?y={{.D.PrevY}}&m={{.D.PrevM}}&{{.D.FilterQuery}}" aria-label="上个月">‹</a>
       <h1>{{.D.Title}}</h1>
-      <a class="btn btn-ghost btn-square" href="/calendar?y={{.D.NextY}}&m={{.D.NextM}}" aria-label="下个月">›</a>
+      <a class="btn btn-ghost btn-square" href="/calendar?y={{.D.NextY}}&m={{.D.NextM}}&{{.D.FilterQuery}}" aria-label="下个月">›</a>
-      <a class="btn btn-sm" href="/calendar">回到今天</a>
+      <a class="btn btn-soft btn-sm" href="/calendar?{{.D.FilterQuery}}">回到今天</a>
     </div>
     <div class="cal-stats">
       <span><em>{{.D.MonthDue}}</em>本月到期</span>
       <span><em>{{.D.MonthTasks}}</em>本月待打</span>
       <span><em>{{.D.MonthDone}}</em>已完成</span>
+      {{if gt .D.MonthUrgent 0}}<span class="text-urgent"><em>{{.D.MonthUrgent}}</em>加急</span>{{end}}
       <a class="btn btn-primary btn-sm" href="/customers/new">＋ 新建客户</a>
     </div>
   </header>
 
+  {{if .D.HasTabs}}
+  <nav class="pkg-tabs">
+    {{range .D.Tabs}}
+    <a class="{{if .Active}}on{{end}}" style="--tab:{{.Color}}" href="{{.Href}}">
+      <i></i>{{.Name}}{{if gt .Count 0}}<em>{{.Count}}</em>{{end}}
+    </a>
+    {{end}}
+  </nav>
+  {{end}}
+
   {{if .D.NoPackages}}
   <div class="notice">还没有服务套餐，先去 <a href="/packages/new">新建套餐</a>，再给客户开通。</div>
   {{else if .D.NoCustomers}}
@@ -30,20 +41,19 @@
       <div class="cal-week" role="row">
         {{range .}}
         <a class="cal-cell heat-{{.Heat}}{{if not .InMonth}} out{{end}}{{if .IsToday}} today{{end}}{{if .IsSelected}} sel{{end}}{{if .IsWeekend}} weekend{{end}}{{if .DueCount}} has-due{{end}}"
-           href="/calendar?y={{$.D.Year}}&m={{$.D.Month}}&d={{.Date}}" role="gridcell">
+           href="/calendar?y={{$.D.Year}}&m={{$.D.Month}}&d={{.Date}}&{{$.D.FilterQuery}}" role="gridcell">
           <div class="cell-top">
             <span class="dnum">{{.Day}}</span>
-            {{if .DueCount}}<span class="due-badge"><em>到期</em>{{.DueCount}}</span>{{end}}
+            <span class="cell-badges">
+              {{if gt .UrgentCnt 0}}<span class="urgent-dot" title="{{.UrgentCnt}} 项加急"></span>{{end}}
+              {{if .DueCount}}<span class="due-badge"><em>到期</em>{{.DueCount}}</span>{{end}}
+            </span>
           </div>
           {{if .TaskCount}}
-          <div class="cell-load">{{.DoneCount}}/{{.TaskCount}} 单</div>
+          <div class="cell-count">
-          {{end}}
+            <b>{{.DoneCount}}</b><span>/ {{.TaskCount}}</span>
-          <div class="cell-tickets">
-            {{range .Tickets}}
-            <span class="ticket{{if .Done}} done{{end}}{{if .Skipped}} skipped{{end}}" style="--tag:{{.Color}}"><b>{{.Tail}}</b><span class="tk-name">{{.Name}}</span><i>{{.Pkg}}</i></span>
-            {{end}}
-            {{if gt .More 0}}<span class="ticket more">+{{.More}}</span>{{end}}
           </div>
+          {{end}}
         </a>
         {{end}}
       </div>
@@ -51,43 +61,114 @@
     </div>
 
     <aside class="drawer">
+      <div class="drawer-clock">
+        <b data-clock>--:--:--</b>
+        <span>{{.D.TodayStr}}</span>
+      </div>
       <header class="drawer-head">
         <h2>{{.D.SelectedLabel}}</h2>
         <div class="drawer-tags">
           {{if .D.SelectedIsToday}}<span class="chip chip-active">今天</span>{{end}}
           {{if .D.SelectedIsPast}}<span class="chip chip-closed">已过去</span>{{end}}
-          <span class="chip chip-plain">{{len .D.Tasks}} 待打</span>
+          <span class="chip chip-plain">{{.D.TaskPending}} 待完成</span>
         </div>
       </header>
 
       <section class="drawer-block">
-        <h3>这天到期 <em>{{len .D.Due}}</em></h3>
+        <h3>当日待完成 <em>{{.D.TaskPending}}</em><span class="muted small">/ {{len .D.Tasks}} 单</span></h3>
-        {{if .D.Due}}
+        <form class="quick-form" method="post" action="/checkins/quick">
-        <ul class="due-list">
+          <input type="hidden" name="date" value="{{.D.Selected}}">
-          {{range .D.Due}}
+          <input type="hidden" name="pkg" value="{{.D.PkgID}}">
-          <li>
+          <input type="hidden" name="tag" value="{{.D.Tag}}">
-            <a class="due-main" href="/customers/{{.CustomerID}}">
+          <input type="hidden" name="back" value="{{.D.Back}}">
-              <span class="ticket" style="--tag:{{.PackageColor}}"><b>{{.CustomerTail}}</b>{{.CustomerName}}</span>
+          <input class="form-control form-control-sm" type="text" name="tail" placeholder="输入手机尾号，回车即可完成" maxlength="8" autocomplete="off" inputmode="numeric" aria-label="手机尾号快速完成">
-              <span class="pkg">{{.PackageName}}</span>
+          <button class="btn btn-sm btn-primary" type="submit">完成</button>
-              <span class="rem">{{.RemainShort}}</span>
+        </form>
-            </a>
+        <p class="muted small quick-hint">唯一匹配直接完成；同尾号多人 / 一单多服务会列出让你勾选。</p>
-            <a class="btn btn-sm" href="/calendar?y={{$.D.Year}}&m={{$.D.Month}}&d={{$.D.Selected}}&extend={{.ID}}#extend">追加</a>
+
-          </li>
+        {{if .D.PickTail}}
-          {{end}}
+        <section class="picker">
-        </ul>
+          <header class="picker-head">
-        {{else}}<p class="muted">没有到期订阅。</p>{{end}}
+            <h4>尾号 {{.D.PickTail}} 的待完成项</h4>
-      </section>
+            <a class="btn btn-sm btn-ghost" href="{{.D.Back}}">收起</a>
+          </header>
+          {{if .D.PickRows}}
+          <form method="post" action="/checkins/batch">
+            <input type="hidden" name="date" value="{{.D.Selected}}">
+            <input type="hidden" name="back" value="{{.D.Back}}">
+            <ul class="pick-list">
+              {{range .D.PickRows}}
+              <li class="list-group-item px-0">
+                <label>
+                  <input type="checkbox" name="sub_ids" value="{{.ID}}"{{if not .Done}}{{if not .Skipped}} checked{{end}}{{end}}>
+                  <span class="ticket" style="--tag:{{.PackageColor}}"><b>{{.CustomerTail}}</b>{{.CustomerName}}</span>
+                  <span class="pick-pkg">{{.PackageName}}</span>
+                  <span class="pick-remain">{{.RemainShort}}</span>
+                  {{if .Done}}<span class="chip chip-active">已完成</span>{{end}}
+                  {{if .Skipped}}<span class="chip chip-paused">已跳过</span>{{end}}
+                </label>
+              </li>
+              {{end}}
+            </ul>
+            <div class="actions">
+              <button class="btn btn-primary btn-sm" type="submit">确认完成选中项</button>
+              <a class="btn btn-soft btn-sm" href="{{.D.Back}}">取消</a>
+            </div>
+          </form>
+          {{else}}
+          <p class="muted">{{.D.PickMsg}}</p>
+          {{end}}
+        </section>
+        {{end}}
 
-      <section class="drawer-block">
-        <h3>当日待打 <em>{{len .D.Tasks}}</em></h3>
         {{if .D.Tasks}}
-        <ul class="task-list">
+        <ul class="list-group list-group-flush task-list">
           {{range .D.Tasks}}
-          <li class="task{{if .Done}} done{{end}}{{if .Skipped}} skipped{{end}}">
+          {{if or .Done .Skipped}}
+          <li class="list-group-item task task-done px-0">
+            <details class="done-fold">
+              <summary>
+                <span class="ticket" style="--tag:{{.PackageColor}}"><b>{{.CustomerTail}}</b>{{.CustomerName}}</span>
+                <span class="pkg">{{.PackageName}}</span>
+                <span class="chip {{if .Done}}chip-active{{else}}chip-paused{{end}}">{{if .Done}}已完成{{else}}已跳过{{end}}</span>
+                {{if .Urgent}}<span class="tag-urgent">加急</span>{{end}}
+                <span class="fold-caret" aria-hidden="true"></span>
+              </summary>
+              <div class="done-detail">
+                <div class="task-meta">
+                  <span>{{.RemainText}}</span>
+                  {{if .DueText}}<span class="due due-{{.Eval.Level}}">{{.DueText}}</span>{{end}}
+                </div>
+                {{if .Note}}<div class="task-note">{{.Note}}{{if .Operator}} · {{.Operator}}{{end}}</div>{{end}}
+                <div class="task-actions">
+                  <form method="post" action="/checkins/{{.CheckinID}}/delete">
+                    <input type="hidden" name="back" value="{{$.D.Back}}">
+                    <button class="btn btn-sm btn-ghost" type="submit">撤销打卡</button>
+                  </form>
+                  <details class="more-actions">
+                    <summary class="btn btn-sm btn-ghost" title="更多操作" aria-label="更多操作">⋯</summary>
+                    <div class="more-menu">
+                      <form method="post" action="/tasks/urgent">
+                        <input type="hidden" name="sub_id" value="{{.ID}}">
+                        <input type="hidden" name="date" value="{{$.D.Selected}}">
+                        <input type="hidden" name="urgent" value="{{if .Urgent}}0{{else}}1{{end}}">
+                        <input type="hidden" name="back" value="{{$.D.Back}}">
+                        <button class="btn btn-sm {{if .Urgent}}btn-urgent{{else}}btn-ghost{{end}}" type="submit">{{if .Urgent}}取消加急{{else}}标记加急{{end}}</button>
+                      </form>
+                  <a class="btn btn-soft btn-sm" href="/calendar?y={{$.D.Year}}&m={{$.D.Month}}&d={{$.D.Selected}}&{{$.D.FilterQuery}}&extend={{.ID}}#extend">追加时长</a>
+                    </div>
+                  </details>
+                </div>
+              </div>
+            </details>
+          </li>
+          {{else}}
+          <li class="list-group-item task{{if .Urgent}} urgent{{end}} px-0">
             <div class="task-main">
               <a class="task-title" href="/customers/{{.CustomerID}}">
                 <span class="ticket" style="--tag:{{.PackageColor}}"><b>{{.CustomerTail}}</b>{{.CustomerName}}</span>
                 <span class="pkg">{{.PackageName}}</span>
+                {{if .Urgent}}<span class="tag-urgent">加急</span>{{end}}
               </a>
               <div class="task-meta">
                 <span>{{.RemainText}}</span>
@@ -96,36 +177,59 @@
               {{if .Note}}<div class="task-note">{{.Note}}{{if .Operator}} · {{.Operator}}{{end}}</div>{{end}}
             </div>
             <div class="task-actions">
-              {{if or .Done .Skipped}}
-              <span class="chip {{if .Done}}chip-active{{else}}chip-paused{{end}}">{{if .Done}}已完成{{else}}已跳过{{end}}</span>
-              <form method="post" action="/checkins/{{.CheckinID}}/delete">
-                <input type="hidden" name="back" value="{{$.D.Back}}">
-                <button class="btn btn-sm btn-ghost">撤销</button>
-              </form>
-              {{else}}
               <form method="post" action="/subscriptions/{{.ID}}/checkin">
                 <input type="hidden" name="date" value="{{$.D.Selected}}">
                 <input type="hidden" name="status" value="done">
                 <input type="hidden" name="back" value="{{$.D.Back}}">
                 <button class="btn btn-sm btn-primary">完成</button>
               </form>
-              <form method="post" action="/subscriptions/{{.ID}}/checkin">
+              <details class="more-actions">
-                <input type="hidden" name="date" value="{{$.D.Selected}}">
+                <summary class="btn btn-sm btn-ghost" title="更多操作" aria-label="更多操作">⋯</summary>
-                <input type="hidden" name="status" value="skipped">
+                <div class="more-menu">
-                <input type="hidden" name="back" value="{{$.D.Back}}">
+                  <form method="post" action="/subscriptions/{{.ID}}/checkin">
-                <button class="btn btn-sm btn-ghost">跳过</button>
+                    <input type="hidden" name="date" value="{{$.D.Selected}}">
-              </form>
+                    <input type="hidden" name="status" value="skipped">
-              {{end}}
+                    <input type="hidden" name="back" value="{{$.D.Back}}">
-              <a class="btn btn-sm" href="/calendar?y={{$.D.Year}}&m={{$.D.Month}}&d={{$.D.Selected}}&extend={{.ID}}#extend">追加</a>
+                    <button class="btn btn-sm btn-ghost" type="submit">跳过这次</button>
+                  </form>
+                  <form method="post" action="/tasks/urgent">
+                    <input type="hidden" name="sub_id" value="{{.ID}}">
+                    <input type="hidden" name="date" value="{{$.D.Selected}}">
+                    <input type="hidden" name="urgent" value="{{if .Urgent}}0{{else}}1{{end}}">
+                    <input type="hidden" name="back" value="{{$.D.Back}}">
+                    <button class="btn btn-sm {{if .Urgent}}btn-urgent{{else}}btn-ghost{{end}}" type="submit">{{if .Urgent}}取消加急{{else}}标记加急{{end}}</button>
+                  </form>
+                  <a class="btn btn-soft btn-sm" href="/calendar?y={{$.D.Year}}&m={{$.D.Month}}&d={{$.D.Selected}}&{{$.D.FilterQuery}}&extend={{.ID}}#extend">追加时长</a>
+                </div>
+              </details>
             </div>
           </li>
           {{end}}
+          {{end}}
         </ul>
         {{else}}<p class="muted">这天没有待打任务。</p>{{end}}
       </section>
 
       {{if .D.Extend}}{{template "extend-panel" .D.Extend}}{{end}}
 
+      <section class="drawer-block">
+        <h3>这天到期 <em>{{len .D.Due}}</em></h3>
+        {{if .D.Due}}
+        <ul class="list-group list-group-flush due-list">
+          {{range .D.Due}}
+          <li>
+            <a class="due-main" href="/customers/{{.CustomerID}}">
+              <span class="ticket" style="--tag:{{.PackageColor}}"><b>{{.CustomerTail}}</b>{{.CustomerName}}</span>
+              <span class="pkg">{{.PackageName}}</span>
+              <span class="rem">{{.RemainShort}}</span>
+            </a>
+            <a class="btn btn-soft btn-sm" href="/calendar?y={{$.D.Year}}&m={{$.D.Month}}&d={{$.D.Selected}}&{{$.D.FilterQuery}}&extend={{.ID}}#extend">追加</a>
+          </li>
+          {{end}}
+        </ul>
+        {{else}}<p class="muted">没有到期订阅。</p>{{end}}
+      </section>
+
       <section class="drawer-block">
         <h3>近 7 天到期</h3>
         {{if .D.OtherDue}}

internal/web/templates/pages/customer_detail.html

@@ -3,13 +3,26 @@
   <header class="cust-head">
     <div class="cust-id">
       <span class="cust-tail">{{.D.Customer.Tail}}</span>
-      <div>
+      <div class="cust-id-main">
-        <h1>{{.D.Customer.Name}}</h1>
+        <h1>{{.D.Customer.Name}}{{if .D.Customer.Archived}} <span class="chip chip-closed">已停用</span>{{end}}</h1>
         <div class="cust-tags">
           {{range .D.Customer.TagList}}<span class="tagchip">{{.}}</span>{{end}}
         </div>
       </div>
     </div>
+    <div class="page-actions">
+      <a class="btn btn-soft" href="/customers/{{.D.Customer.ID}}/edit">编辑资料</a>
+      {{if .D.Customer.Archived}}
+      <form method="post" action="/customers/{{.D.Customer.ID}}/restore"><button class="btn btn-soft" type="submit">恢复客户</button></form>
+      {{else}}
+      <form method="post" action="/customers/{{.D.Customer.ID}}/archive" data-confirm="停用后该客户不再出现在日历，订阅会保留。确定停用？"><button class="btn btn-ghost" type="submit">停用客户</button></form>
+      {{end}}
+      <form method="post" action="/customers/{{.D.Customer.ID}}/delete" data-confirm="将永久删除该客户及其全部订阅、打卡与追加记录，无法恢复。确定删除？">
+        <input type="hidden" name="confirm" value="delete">
+        <button class="btn btn-ghost text-danger" type="submit">彻底删除</button>
+      </form>
+      <a class="btn btn-ghost" href="/customers">返回列表</a>
+    </div>
     <dl class="cust-meta">
       {{if .D.Customer.GameName}}<div><dt>游戏</dt><dd>{{.D.Customer.GameName}}</dd></div>{{end}}
       {{if .D.Customer.GameServer}}<div><dt>区服</dt><dd>{{.D.Customer.GameServer}}</dd></div>{{end}}
@@ -17,14 +30,37 @@
       {{if .D.Customer.Source}}<div><dt>来源</dt><dd>{{.D.Customer.Source}}</dd></div>{{end}}
       <div><dt>建档</dt><dd>{{.D.Customer.CreatedAt}}</dd></div>
     </dl>
-    <div class="page-actions">
-      <a class="btn" href="/customers/{{.D.Customer.ID}}/edit">编辑资料</a>
-      <a class="btn btn-ghost" href="/customers">返回列表</a>
-    </div>
   </header>
 
   {{if .D.Customer.Note}}<div class="notice note">{{.D.Customer.Note}}</div>{{end}}
 
+  {{if .D.CustCal}}
+  <section class="section">
+    <div class="section-head">
+      <h2>当月排单</h2>
+      <div class="minical-nav">
+        <a class="btn btn-ghost btn-sm btn-square" href="{{.D.CustCal.Prev}}" aria-label="上个月">‹</a>
+        <b>{{.D.CustCal.Title}}</b>
+        <a class="btn btn-ghost btn-sm btn-square" href="{{.D.CustCal.Next}}" aria-label="下个月">›</a>
+        <span class="muted small">{{.D.CustCal.TaskDays}} 天有单 · {{.D.CustCal.TotalTasks}} 单</span>
+      </div>
+    </div>
+    <div class="minical">
+      <div class="minical-dow">{{range .D.CustCal.Weekdays}}<span>{{.}}</span>{{end}}</div>
+      {{range .D.CustCal.Weeks}}
+      <div class="minical-row">
+        {{range .}}
+        <a class="minical-cell{{if not .InMonth}} out{{end}}{{if .IsToday}} today{{end}}{{if eq .Count 0}} no-task{{end}}{{if .AllDone}} all-done{{end}}" href="/calendar?d={{.Date}}" title="{{.Date}}">
+          <span class="mc-day">{{.Day}}</span>
+          {{if gt .Count 0}}<span class="mc-count">{{.Done}}/{{.Count}}</span>{{end}}
+        </a>
+        {{end}}
+      </div>
+      {{end}}
+    </div>
+  </section>
+  {{end}}
+
   <section class="section">
     <div class="section-head">
       <h2>订阅</h2>
@@ -40,25 +76,22 @@
 
     {{if .D.Packages}}
     <form method="post" action="/customers/{{.D.Customer.ID}}/subscriptions" class="inline-form" data-sub-form>
-      <select name="package_id" required data-pkg-select>
+      <select class="form-select form-select-sm" name="package_id" required data-pkg-select aria-label="选择套餐">
         <option value="">选择套餐…</option>
         {{range .D.Packages}}
-        <option value="{{.ID}}" data-unit="{{.Unit}}" data-amount="{{.DefaultAmount}}"{{if .Archived}} disabled{{end}}>
+        <option value="{{.ID}}" data-amount="{{.DefaultAmount}}"{{if .Archived}} disabled{{end}}>
-          {{.Name}} · {{.UnitLabel}} {{.DefaultAmount}}{{if eq .Unit "day"}}天{{else}}次{{end}}{{if .Archived}}（已归档）{{end}}
+          {{.Name}} · {{.UnitLabel}} {{.DefaultAmount}} 天{{if .Archived}}（已归档）{{end}}
         </option>
         {{end}}
       </select>
-      <label class="inline-field">开始日
+      <label class="inline-field" data-start-wrap>开始日
-        <input type="date" name="start_date" value="{{.TodayStr}}" required>
+        <input class="form-control form-control-sm" type="date" name="start_date" value="{{.TodayStr}}" required>
       </label>
-      <label class="inline-field" data-days-wrap>{{/* 默认显示 */}}
+      <label class="inline-field" data-days-wrap>
-        天数 <input type="number" name="days" min="1" max="3650" value="30">
+        天数 <input class="form-control form-control-sm" type="number" name="days" min="1" max="3650" value="30">
-      </label>
-      <label class="inline-field" data-count-wrap hidden>
-        次数 <input type="number" name="total_count" min="1" max="10000" value="10">
       </label>
       <label class="inline-field" data-end-wrap>
-        终止日（可留空）<input type="date" name="end_date">
+        终止日（可留空）<input class="form-control form-control-sm" type="date" name="end_date">
       </label>
       <button class="btn btn-primary" type="submit">开通订阅</button>
     </form>
@@ -101,9 +134,9 @@
     </div>
     {{if .D.Adjustments}}
     <div class="table-wrap">
-      <table class="table tight">
+      <table class="table tight table-adjust">
         <thead>
-          <tr><th>时间</th><th>套餐</th><th>类型</th><th>计算起点</th><th>结束日变化</th><th>增量</th><th>备注</th><th>操作人</th></tr>
+          <tr><th scope="col">时间</th><th scope="col">套餐</th><th scope="col">类型</th><th scope="col">计算起点</th><th scope="col">结束日变化</th><th scope="col">增量</th><th scope="col">备注</th><th scope="col">操作人</th></tr>
         </thead>
         <tbody>
           {{range .D.Adjustments}}
@@ -114,9 +147,7 @@
             <td class="mono small">{{if .BaseDate}}{{.BaseDate}}{{else}}—{{end}}</td>
             <td class="mono small">{{if .OldEndDate}}{{.OldEndDate}} → {{end}}{{if .NewEndDate}}{{.NewEndDate}}{{else}}—{{end}}</td>
             <td class="mono">
-              {{if gt .DaysAdded 0}}<span class="plus">+{{.DaysAdded}} 天</span>{{end}}
+              {{if gt .DaysAdded 0}}<span class="plus">+{{.DaysAdded}} 天</span>{{else}}—{{end}}
-              {{if gt .CountAdded 0}}<span class="plus">+{{.CountAdded}} 次</span>{{end}}
-              {{if and (le .DaysAdded 0) (le .CountAdded 0)}}—{{end}}
             </td>
             <td class="small">{{if .Note}}{{.Note}}{{else}}—{{end}}</td>
             <td class="small">{{if .OperatorName}}{{.OperatorName}}{{else}}—{{end}}</td>

internal/web/templates/pages/customer_form.html

@@ -3,7 +3,7 @@
   <header class="page-head">
     <div>
       <h1>{{if .D.IsNew}}新建客户{{else}}编辑客户{{end}}</h1>
-      <p class="muted">手机尾号 + 客户名 唯一；尾号是日常查询的主键。</p>
+      <p>手机尾号 + 客户名 唯一；尾号是日常查询的主键。</p>
     </div>
   </header>
 
@@ -11,37 +11,37 @@
         action="{{if .D.IsNew}}/customers{{else}}/customers/{{.D.Customer.ID}}/edit{{end}}">
     <div class="grid-2">
       <label class="field"><span>手机尾号 <i>*</i></span>
-        <input name="tail" value="{{.D.Customer.Tail}}" required maxlength="8" placeholder="例如 1234" autofocus>
+        <input type="text" name="tail" value="{{.D.Customer.Tail}}" required maxlength="8" placeholder="例如 1234" inputmode="numeric" autofocus>
       </label>
       <label class="field"><span>客户名 <i>*</i></span>
-        <input name="name" value="{{.D.Customer.Name}}" required maxlength="32" placeholder="例如 老张">
+        <input type="text" name="name" value="{{.D.Customer.Name}}" required maxlength="32" placeholder="例如 老张">
       </label>
     </div>
     <div class="grid-2">
       <label class="field"><span>游戏名</span>
-        <input name="game_name" value="{{.D.Customer.GameName}}" maxlength="32" placeholder="例如 王者荣耀">
+        <input type="text" name="game_name" value="{{.D.Customer.GameName}}" maxlength="32" placeholder="例如 王者荣耀">
       </label>
       <label class="field"><span>区服 / UID</span>
-        <input name="game_server" value="{{.D.Customer.GameServer}}" maxlength="32" placeholder="例如 微信区 123456">
+        <input type="text" name="game_server" value="{{.D.Customer.GameServer}}" maxlength="32" placeholder="例如 微信区 123456">
       </label>
     </div>
     <div class="grid-2">
       <label class="field"><span>联系方式</span>
-        <input name="contact" value="{{.D.Customer.Contact}}" maxlength="64" placeholder="微信 / QQ">
+        <input type="text" name="contact" value="{{.D.Customer.Contact}}" maxlength="64" placeholder="微信 / QQ">
       </label>
       <label class="field"><span>来源渠道</span>
-        <input name="source" value="{{.D.Customer.Source}}" maxlength="32" placeholder="抖音 / 朋友介绍">
+        <input type="text" name="source" value="{{.D.Customer.Source}}" maxlength="32" placeholder="抖音 / 朋友介绍">
       </label>
     </div>
     <label class="field"><span>标签</span>
-      <input name="tags" value="{{.D.Customer.Tags}}" maxlength="120" placeholder="老客户,包月,难缠（逗号分隔）">
+      <input type="text" name="tags" value="{{.D.Customer.Tags}}" maxlength="120" placeholder="老客户,包月,难缠（逗号分隔）">
     </label>
     <label class="field"><span>备注</span>
       <textarea name="note" rows="3" maxlength="500" placeholder="打法偏好、沟通记录等">{{.D.Customer.Note}}</textarea>
     </label>
     <div class="actions">
       <button class="btn btn-primary" type="submit">保存</button>
-      <a class="btn" href="{{if .D.IsNew}}/customers{{else}}/customers/{{.D.Customer.ID}}{{end}}">取消</a>
+      <a class="btn btn-soft" href="{{if .D.IsNew}}/customers{{else}}/customers/{{.D.Customer.ID}}{{end}}">取消</a>
     </div>
   </form>
 </div>

internal/web/templates/pages/customers.html

@@ -3,39 +3,42 @@
   <header class="page-head">
     <div>
       <h1>客户</h1>
-      <p class="muted">共 {{.D.Total}} 位 · 输入手机尾号可快速定位</p>
+      <p>共 {{.D.Total}} 位 · 输入手机尾号可快速定位</p>
     </div>
     <div class="page-actions">
+      {{if .D.ShowArchived}}
+      <a class="btn btn-ghost" href="/customers?q={{.D.Q}}">隐藏已停用</a>
+      {{else}}
+      <a class="btn btn-ghost" href="/customers?q={{.D.Q}}&archived=1">显示已停用{{if gt .D.ArchivedCount 0}} ({{.D.ArchivedCount}}){{end}}</a>
+      {{end}}
       <a class="btn btn-primary" href="/customers/new">＋ 新建客户</a>
     </div>
   </header>
 
   <form class="filterbar" method="get" action="/customers">
-    <input type="search" name="q" value="{{.D.Q}}" placeholder="手机尾号 / 姓名 / 游戏名 / 联系方式" autocomplete="off">
+    <input type="search" name="q" value="{{.D.Q}}" placeholder="手机尾号 / 姓名 / 游戏名 / 联系方式" autocomplete="off" aria-label="搜索客户">
-    <button class="btn" type="submit">搜索</button>
+    <button class="btn btn-soft" type="submit">搜索</button>
     {{if .D.Q}}<a class="btn btn-ghost" href="/customers">清除</a>{{end}}
   </form>
 
   {{if .D.List}}
   <div class="table-wrap">
-    <table class="table">
+    <table class="table table-customers">
       <thead>
-        <tr><th>尾号</th><th>客户</th><th>联系方式</th><th>订阅与剩余</th><th>标签</th><th></th></tr>
+        <tr><th scope="col">尾号</th><th scope="col">客户</th><th scope="col">联系方式</th><th scope="col">订阅与剩余</th><th scope="col">标签</th><th scope="col"><span class="visually-hidden">操作</span></th></tr>
       </thead>
       <tbody>
         {{range .D.List}}
-        <tr>
+        <tr{{if .Archived}} class="archived"{{end}}>
           <td><a class="tail" href="/customers/{{.ID}}">{{.Tail}}</a></td>
           <td>
-            <a class="name" href="/customers/{{.ID}}">{{.Name}}</a>
+            <a class="name" href="/customers/{{.ID}}">{{.Name}}</a>{{if .Archived}} <span class="chip chip-closed">已停用</span>{{end}}
             {{if .GameName}}<div class="muted small">{{.GameName}}{{if .GameServer}} · {{.GameServer}}{{end}}</div>{{end}}
           </td>
           <td class="muted small">{{if .Contact}}{{.Contact}}{{else}}—{{end}}</td>
-          <td>
+          <td><span class="summary due-{{.Level}}">{{.Summary}}</span></td>
-            <span class="summary due-{{.Level}}">{{.Summary}}</span>
-          </td>
           <td>{{range .TagList}}<span class="tagchip">{{.}}</span>{{end}}</td>
-          <td class="right"><a class="btn btn-sm" href="/customers/{{.ID}}">详情</a></td>
+          <td class="right"><a class="btn btn-soft btn-sm" href="/customers/{{.ID}}">详情</a></td>
         </tr>
         {{end}}
       </tbody>
@@ -47,7 +50,7 @@
     <div class="empty-mark">票</div>
     {{if .D.Q}}
     <p>没有匹配「{{.D.Q}}」的客户。</p>
-    <a class="btn" href="/customers">看全部客户</a>
+    <a class="btn btn-soft" href="/customers">看全部客户</a>
     {{else}}
     <p>还没有客户。先建一位，再给他开套餐。</p>
     <a class="btn btn-primary" href="/customers/new">＋ 新建客户</a>

internal/web/templates/pages/login.html

@@ -1,20 +1,21 @@
 {{define "content"}}
 <div class="auth">
+  <button class="theme-toggle auth-theme" type="button" data-theme-toggle aria-label="切换亮色/暗色" aria-pressed="false"><span class="ic-moon" aria-hidden="true">☾</span><span class="ic-sun" aria-hidden="true">☀</span></button>
   <div class="auth-card">
-    <div class="auth-brand"><span class="brand-mark">代</span><span>代打台</span></div>
+    <div class="auth-brand"><span class="brand-mark" aria-hidden="true">代</span><span>代打台-L</span></div>
     <h1>登录</h1>
-    <p class="muted">所有账户均为管理员，任何操作都会留痕。</p>
+    <p>只有一个管理员账户，任何操作都会留痕。</p>
-    <form method="post" action="/login" class="form">
+    <form method="post" action="/login" class="stack">
       <input type="hidden" name="next" value="{{.Next}}">
       <label class="field"><span>用户名</span>
-        <input type="text" name="username" required autofocus autocomplete="username">
+        <input class="form-control" id="username" type="text" name="username" required autofocus autocomplete="username">
       </label>
       <label class="field"><span>密码</span>
-        <input type="password" name="password" required autocomplete="current-password">
+        <input class="form-control" id="password" type="password" name="password" required autocomplete="current-password">
       </label>
       <button type="submit" class="btn btn-primary btn-block">登录</button>
     </form>
-    <p class="auth-foot muted">代打台 · 单文件部署 · 数据只在本机</p>
+    <p class="auth-foot">代打台-L · 单文件部署 · 数据只在本机</p>
   </div>
 </div>
 {{end}}

internal/web/templates/pages/logs.html

@@ -3,20 +3,20 @@
   <header class="page-head">
     <div>
       <h1>操作日志</h1>
-      <p class="muted">共 {{.D.Total}} 条 · 谁在什么时候改了什么，都在这里</p>
+      <p>共 {{.D.Total}} 条 · 谁在什么时候改了什么，都在这里</p>
     </div>
   </header>
 
   <form class="filterbar" method="get" action="/logs">
-    <input type="search" name="q" value="{{.D.Q}}" placeholder="搜索摘要 / 动作 / 操作人" autocomplete="off">
+    <input type="search" name="q" value="{{.D.Q}}" placeholder="搜索摘要 / 动作 / 操作人" autocomplete="off" aria-label="搜索日志">
-    <button class="btn" type="submit">搜索</button>
+    <button class="btn btn-soft" type="submit">搜索</button>
     {{if .D.Q}}<a class="btn btn-ghost" href="/logs">清除</a>{{end}}
   </form>
 
   {{if .D.List}}
   <div class="table-wrap">
-    <table class="table tight">
+    <table class="table tight table-logs">
-      <thead><tr><th>时间</th><th>操作人</th><th>动作</th><th>对象</th><th>摘要</th><th>IP</th></tr></thead>
+      <thead><tr><th scope="col">时间</th><th scope="col">操作人</th><th scope="col">动作</th><th scope="col">对象</th><th scope="col">摘要</th><th scope="col">IP</th></tr></thead>
       <tbody>
         {{range .D.List}}
         <tr>

internal/web/templates/pages/package_detail.html

@@ -0,0 +1,69 @@
+{{define "content"}}
+<div class="page">
+  <header class="page-head">
+    <div>
+      <h1>{{.D.Package.Name}}</h1>
+      <p>
+        {{.D.Package.UnitLabel}} · {{.D.Package.AmountText}}
+        {{if .D.Package.Tag}} · 标签「{{.D.Package.Tag}}」{{end}}{{if .D.Package.CalendarSeparate}} · 独立日历{{end}}
+        {{if .D.Package.Archived}}<span class="chip chip-closed">已归档</span>{{end}}
+      </p>
+    </div>
+    <div class="page-actions">
+      <a class="btn btn-ghost" href="/packages">返回套餐</a>
+      <a class="btn btn-soft" href="/packages/{{.D.Package.ID}}/edit">编辑套餐</a>
+    </div>
+  </header>
+
+  {{if .D.Package.Note}}<div class="notice note">{{.D.Package.Note}}</div>{{end}}
+
+  <form class="filterbar" method="get" action="/packages/{{.D.Package.ID}}">
+    <input type="search" name="q" value="{{.D.Q}}" placeholder="按尾号 / 姓名筛选客户" aria-label="筛选客户">
+    <button class="btn btn-soft" type="submit">筛选</button>
+    {{if .D.Q}}<a class="btn btn-ghost" href="/packages/{{.D.Package.ID}}">清除</a>{{end}}
+    <span class="muted small">共 {{len .D.Customers}} 位客户</span>
+  </form>
+
+  <form method="post" action="/packages/{{.D.Package.ID}}/subscribe" class="section card">
+    <h2>批量开通</h2>
+    <p class="muted small">勾选客户后一次开通；已经是该套餐的客户会自动跳过。开始日期默认今天，天数默认取套餐设置，可改。</p>
+
+    <div class="grid-auto">
+      <label class="field"><span>开始日期</span>
+        <input type="date" name="start_date" value="{{.D.Today}}" required>
+      </label>
+      <label class="field"><span>天数</span>
+        <input type="number" name="days" min="1" max="3650" value="{{.D.Package.DefaultAmount}}">
+      </label>
+    </div>
+
+    <div class="table-wrap">
+      <table class="table tight">
+        <thead>
+          <tr>
+            <th style="width:44px"><input type="checkbox" data-select-all aria-label="全选可开通客户"></th>
+            <th scope="col">尾号</th><th scope="col">客户</th><th scope="col">当前订阅</th><th scope="col">状态</th>
+          </tr>
+        </thead>
+        <tbody>
+          {{range .D.Customers}}
+          {{$subscribed := index $.D.Subscribed .ID}}
+          <tr{{if $subscribed}} class="archived"{{end}}>
+            <td>{{if $subscribed}}<span class="muted small" title="已是此套餐">—</span>{{else}}<input type="checkbox" name="customer_ids" value="{{.ID}}" aria-label="选择 {{.Name}}" checked>{{end}}</td>
+            <td><a class="tail" href="/customers/{{.ID}}">{{.Tail}}</a></td>
+            <td>{{.Name}}</td>
+            <td class="summary due-{{.Level}}">{{.Summary}}</td>
+            <td>{{if $subscribed}}<span class="chip chip-closed">已是此套餐</span>{{else}}<span class="chip chip-plain">可开通</span>{{end}}</td>
+          </tr>
+          {{end}}
+        </tbody>
+      </table>
+    </div>
+
+    <div class="actions">
+      <button class="btn btn-primary" type="submit">开通选中的客户</button>
+      <span class="muted small">勾选框默认已按「未订阅」预选，可自行取消</span>
+    </div>
+  </form>
+</div>
+{{end}}

internal/web/templates/pages/package_form.html

@@ -3,31 +3,21 @@
   <header class="page-head">
     <div>
       <h1>{{if .D.IsNew}}新增套餐{{else}}编辑套餐{{end}}</h1>
-      <p class="muted">按日套餐用起止日期计算剩余天数；按次套餐记录剩余次数。</p>
+      <p>按日套餐用起止日期计算剩余天数；给客户开通时选择开始日与天数即可。</p>
     </div>
   </header>
 
   <form method="post" class="form card" data-package-form
         action="{{if .D.IsNew}}/packages{{else}}/packages/{{.D.Package.ID}}/edit{{end}}">
     <label class="field"><span>套餐名称 <i>*</i></span>
-      <input name="name" required maxlength="32" value="{{.D.Package.Name}}" placeholder="例如 包月日常 / 赛季深渊 / 10 次副本">
+      <input type="text" name="name" required maxlength="32" value="{{.D.Package.Name}}" placeholder="例如 包月日常 / 深渊日常">
     </label>
 
-    <fieldset class="field">
-      <span>计费方式 <i>*</i></span>
-      <div class="radios">
-        <label><input type="radio" name="unit" value="day"{{if eq .D.Package.Unit "day"}} checked{{end}}>
-          <b>按日</b><small>有开始日与结束日，每天一条待打任务，可打卡</small></label>
-        <label><input type="radio" name="unit" value="count"{{if eq .D.Package.Unit "count"}} checked{{end}}>
-          <b>按次</b><small>记录剩余次数，排期完成时自动扣 1 次，有效期可选</small></label>
-      </div>
-    </fieldset>
-
     <div class="grid-2">
-      <label class="field"><span>默认量 <i>*</i></span>
+      <label class="field" data-amount-wrap><span><span data-amount-title>默认天数</span> <i>*</i></span>
         <div class="input-suffix">
           <input type="number" name="default_amount" min="1" max="10000" value="{{.D.Package.DefaultAmount}}" required>
-          <b data-unit-label>{{if eq .D.Package.Unit "count"}}次{{else}}天{{end}}</b>
+          <b data-unit-label>天</b>
         </div>
       </label>
       <label class="field"><span>参考价（元，可空）</span>
@@ -35,22 +25,32 @@
       </label>
     </div>
 
-    <div class="grid-2">
+    <div class="grid-3">
       <label class="field"><span>日历色签</span>
         <input type="color" name="color" value="{{.D.Package.Color}}">
       </label>
+      <label class="field"><span>标签（可选）</span>
+        <input type="text" name="tag" value="{{.D.Package.Tag}}" maxlength="20" list="pkg-tags" placeholder="例如：包月活动托">
+        <datalist id="pkg-tags">{{range .D.Tags}}<option value="{{.}}"></option>{{end}}</datalist>
+        <small>相同标签的套餐在日历里会合并成同一个页签</small>
+      </label>
       <label class="field"><span>排序（小的靠前）</span>
         <input type="number" name="sort_order" value="{{.D.Package.SortOrder}}">
       </label>
     </div>
 
+    <label class="check-line">
+      <input type="checkbox" name="calendar_separate" value="1"{{if .D.Package.CalendarSeparate}} checked{{end}}>
+      <span>在日历中独立显示<small>勾选后会单独开一个标签页，和其他日常任务分开看</small></span>
+    </label>
+
     <label class="field"><span>说明</span>
       <textarea name="note" rows="2" maxlength="200" placeholder="套餐包含什么、怎么个打法">{{.D.Package.Note}}</textarea>
     </label>
 
     <div class="actions">
       <button class="btn btn-primary" type="submit">保存</button>
-      <a class="btn" href="/packages">取消</a>
+      <a class="btn btn-soft" href="/packages">取消</a>
     </div>
   </form>
 </div>

internal/web/templates/pages/packages.html

@@ -3,16 +3,16 @@
   <header class="page-head">
     <div>
       <h1>套餐</h1>
-      <p class="muted">新增套餐只需加一行配置，不会影响任何已有客户与订阅</p>
+      <p>新增套餐只需加一行配置，不会影响任何已有客户与订阅</p>
     </div>
     <div class="page-actions"><a class="btn btn-primary" href="/packages/new">＋ 新增套餐</a></div>
   </header>
 
   {{if .D.List}}
   <div class="table-wrap">
-    <table class="table">
+    <table class="table table-packages">
       <thead>
-        <tr><th class="col-dot"></th><th>名称</th><th>类型</th><th>默认量</th><th>参考价</th><th>订阅中 / 总数</th><th>状态</th><th></th></tr>
+        <tr><th class="col-dot" scope="col"><span class="visually-hidden">颜色</span></th><th scope="col">名称</th><th scope="col">类型</th><th scope="col">默认量</th><th scope="col">参考价</th><th scope="col">订阅中 / 总数</th><th scope="col">状态</th><th scope="col"><span class="visually-hidden">操作</span></th></tr>
       </thead>
       <tbody>
         {{range .D.List}}
@@ -20,17 +20,19 @@
           <td><span class="dot big" style="background:{{.Color}}"></span></td>
           <td>
             <b>{{.Name}}</b>
+            {{if .Tag}}<span class="tagchip">{{.Tag}}</span>{{end}}{{if .CalendarSeparate}}<span class="tagchip">独立日历</span>{{end}}
             {{if .Note}}<div class="muted small">{{.Note}}</div>{{end}}
           </td>
           <td>{{.UnitLabel}}</td>
-          <td class="mono">{{.DefaultAmount}}{{if eq .Unit "day"}} 天{{else}} 次{{end}}</td>
+          <td class="mono">{{.AmountText}}</td>
           <td class="mono">{{if .HasPrice}}¥{{money .PriceCents}}{{else}}—{{end}}</td>
           <td class="mono">{{.ActiveCount}} / {{.SubCount}}</td>
           <td>{{if .Archived}}<span class="chip chip-closed">已归档</span>{{else}}<span class="chip chip-active">启用中</span>{{end}}</td>
           <td class="actions-cell">
-            <a class="btn btn-sm" href="/packages/{{.ID}}/edit">编辑</a>
+            <a class="btn btn-soft btn-sm" href="/packages/{{.ID}}">详情/批量</a>
+            <a class="btn btn-ghost btn-sm" href="/packages/{{.ID}}/edit">编辑</a>
             <form method="post" action="/packages/{{.ID}}/archive"{{if not .Archived}} data-confirm="归档后不能再新建该套餐的订阅，已有订阅不受影响。继续？"{{end}}>
-              <button class="btn btn-sm btn-ghost">{{if .Archived}}恢复{{else}}归档{{end}}</button>
+              <button class="btn btn-ghost btn-sm">{{if .Archived}}恢复{{else}}归档{{end}}</button>
             </form>
           </td>
         </tr>

internal/web/templates/pages/screen.html

@@ -1,113 +0,0 @@
-{{define "content"}}
-<div class="scr">
-  <header class="scr-head">
-    <div class="scr-brand"><span class="mark">代</span>代打台<em>控制台</em></div>
-    <div class="scr-clock"><b data-clock>--:--:--</b><span data-date></span></div>
-    <div class="scr-links">每 {{.D.Refresh}} 秒刷新 · <a href="/calendar">进入工作台</a></div>
-  </header>
-
-  <section class="scr-kpis">
-    <div class="kpi">
-      <span>客户</span><b>{{.D.Stats.Customers}}</b><i>位</i>
-    </div>
-    <div class="kpi">
-      <span>活跃订阅</span><b>{{.D.Stats.ActiveSubs}}</b><i>条</i>
-    </div>
-    <div class="kpi kpi-hot">
-      <span>今日到期</span><b>{{.D.Stats.DueToday}}</b><i>条</i>
-    </div>
-    <div class="kpi kpi-warm">
-      <span>7 天内到期</span><b>{{.D.Stats.Due7}}</b><i>条</i>
-    </div>
-  </section>
-
-  <section class="scr-main">
-    <div class="panel panel-cal">
-      <div class="panel-head">
-        <h2>到期热力</h2>
-        <span>{{.D.MonthTitle}} · 本月 {{.D.Stats.MonthDue}} 条到期</span>
-      </div>
-      <div class="heat-grid">
-        <div class="heat-dow">{{range .D.Weekdays}}<span>{{.}}</span>{{end}}</div>
-        {{range .D.Weeks}}
-        <div class="heat-row">
-          {{range .}}
-          <div class="heat-cell h{{.Heat}}{{if not .InMonth}} out{{end}}{{if .IsToday}} today{{end}}">
-            <span>{{.Day}}</span>
-            {{if .Due}}<b>{{.Due}}</b>{{end}}
-          </div>
-          {{end}}
-        </div>
-        {{end}}
-      </div>
-      <div class="heat-legend">
-        <span>到期数</span><i class="h0"></i><i class="h1"></i><i class="h2"></i><i class="h3"></i><i class="h4"></i>
-      </div>
-    </div>
-
-    <div class="panel panel-top">
-      <div class="panel-head"><h2>即将到期 TOP 10</h2><span>按剩余量排序</span></div>
-      {{if .D.Top}}
-      <ol class="top-list">
-        {{range $i, $s := .D.Top}}
-        <li class="top-item lv-{{$s.Eval.Level}}">
-          <span class="rank">{{add $i 1}}</span>
-          <span class="top-tail">{{$s.CustomerTail}}</span>
-          <span class="top-name">{{$s.CustomerName}}</span>
-          <span class="top-pkg" style="--tag:{{$s.PackageColor}}">{{$s.PackageName}}</span>
-          <span class="top-remain">{{$s.RemainShort}}</span>
-          <span class="top-bar"><i style="width:{{$s.Progress}}%"></i></span>
-        </li>
-        {{end}}
-      </ol>
-      {{else}}
-      <p class="scr-empty">暂无订阅数据</p>
-      {{end}}
-    </div>
-  </section>
-
-  <section class="scr-bottom">
-    <div class="panel">
-      <div class="panel-head">
-        <h2>今日待打</h2>
-        <span>{{.D.TodayDone}} / {{.D.TodayTasks}} 已完成</span>
-      </div>
-      {{if .D.TodayList}}
-      <ul class="today-list">
-        {{range .D.TodayList}}
-        <li class="lv-{{.Eval.Level}}">
-          <span class="tchip" style="--tag:{{.PackageColor}}"><b>{{.CustomerTail}}</b>{{.CustomerName}}</span>
-          <span class="pkg">{{.PackageName}}</span>
-          <span class="rem">{{.RemainShort}}</span>
-        </li>
-        {{end}}
-      </ul>
-      {{else}}
-      <p class="scr-empty">今天没有待打任务</p>
-      {{end}}
-    </div>
-
-    <div class="panel">
-      <div class="panel-head"><h2>最近追加</h2><span>服务时长变更流水</span></div>
-      {{if .D.Recent}}
-      <ul class="recent-list">
-        {{range .D.Recent}}
-        <li>
-          <span class="time mono">{{.CreatedAt}}</span>
-          <span class="who"><b>{{.CustomerTail}}</b>{{.CustomerName}}</span>
-          <span class="pkg">{{.PackageName}}</span>
-          {{if gt .DaysAdded 0}}<em class="plus">+{{.DaysAdded}} 天</em>{{end}}
-          {{if gt .CountAdded 0}}<em class="plus">+{{.CountAdded}} 次</em>{{end}}
-          <span class="op">{{.OperatorName}}</span>
-        </li>
-        {{end}}
-      </ul>
-      {{else}}
-      <p class="scr-empty">还没有追加记录</p>
-      {{end}}
-    </div>
-  </section>
-
-  <footer class="scr-foot">代打台 v{{.D.Version}} · 数据每 {{.D.Refresh}} 秒自动刷新 · 按 F 进入全屏</footer>
-</div>
-{{end}}

internal/web/templates/pages/settings.html

@@ -3,63 +3,21 @@
   <header class="page-head">
     <div>
       <h1>设置</h1>
-      <p class="muted">预警天数、备份、账户与数据导出</p>
+      <p>预警天数、备份与数据导出</p>
     </div>
   </header>
 
   <section class="section card">
     <h2>基础设置</h2>
     <form method="post" action="/settings" class="form">
-      <div class="grid-2">
+      <label class="field field-narrow"><span>到期预警（天）</span>
-        <label class="field"><span>到期预警（天）</span>
+        <input type="number" name="warn_days" min="0" max="60" value="{{.D.WarnDays}}">
-          <input type="number" name="warn_days" min="0" max="60" value="{{.D.WarnDays}}">
+      </label>
-        </label>
-        <label class="field"><span>大屏自动刷新（秒）</span>
-          <input type="number" name="screen_refresh" min="5" max="600" value="{{.D.ScreenRefresh}}">
-        </label>
-      </div>
       <p class="muted small">监听地址、端口、数据库、备份、日志、时区等部署参数在 <code>daili.ini</code> 里配置，改完重启生效。</p>
       <div class="actions"><button class="btn btn-primary" type="submit">保存设置</button></div>
     </form>
   </section>
 
-  <section class="section card">
-    <h2>管理员</h2>
-    <p class="muted small">所有账户权限相同，任何操作都会记在日志里。</p>
-    <div class="table-wrap">
-      <table class="table tight">
-        <thead><tr><th>用户名</th><th>显示名称</th><th>状态</th><th>创建时间</th><th>最近登录</th><th></th></tr></thead>
-        <tbody>
-          {{$me := .User}}
-          {{range .D.Users}}
-          <tr>
-            <td class="mono">{{.Username}}</td>
-            <td>{{.DisplayName}}</td>
-            <td>{{if .IsActive}}<span class="chip chip-active">启用</span>{{else}}<span class="chip chip-closed">停用</span>{{end}}</td>
-            <td class="mono small">{{.CreatedAt}}</td>
-            <td class="mono small">{{if .LastLoginAt}}{{.LastLoginAt}}{{else}}—{{end}}</td>
-            <td class="actions-cell">
-              {{if eq .ID $me.ID}}
-              <span class="muted small">当前账户</span>
-              {{else}}
-              <form method="post" action="/settings/users/{{.ID}}/toggle">
-                <button class="btn btn-sm btn-ghost">{{if .IsActive}}停用{{else}}启用{{end}}</button>
-              </form>
-              {{end}}
-            </td>
-          </tr>
-          {{end}}
-        </tbody>
-      </table>
-    </div>
-    <form method="post" action="/settings/users" class="inline-form">
-      <label class="inline-field">用户名 <input name="username" required minlength="3" maxlength="32" autocomplete="off"></label>
-      <label class="inline-field">显示名称 <input name="display_name" maxlength="32"></label>
-      <label class="inline-field">初始密码 <input type="password" name="password" required minlength="6" autocomplete="new-password"></label>
-      <button class="btn btn-primary" type="submit">新增管理员</button>
-    </form>
-  </section>
-
   <section class="section card">
     <h2>修改我的密码</h2>
     <form method="post" action="/settings/password" class="form">
@@ -78,16 +36,15 @@
       <div><dt>配置文件</dt><dd class="mono small">{{.D.ConfigPath}} <span class="muted">（修改后重启生效）</span></dd></div>
       <div><dt>数据库</dt><dd class="mono small">{{.D.DBPath}}</dd></div>
       <div><dt>备份</dt><dd class="mono small">{{.D.BackupDir}} · 保留 {{.D.BackupKeep}} 份 · {{if .D.BackupEnabled}}自动备份已开启{{else}}自动备份已关闭{{end}}</dd></div>
-      <div><dt>大屏</dt><dd class="mono small">/screen {{if .D.ScreenPublic}}免登录{{else}}需登录{{end}}</dd></div>
+      <div><dt>局域网地址</dt><dd class="mono small">http://{{if .D.Addrs}}{{index .D.Addrs 0}}{{else}}127.0.0.1{{end}}:{{.D.Port}}</dd></div>
-      <div><dt>局域网地址</dt><dd class="mono small">http://{{if .D.Addrs}}{{index .D.Addrs 0}}{{else}}127.0.0.1{{end}}:{{.D.Port}}/screen</dd></div>
       <div><dt>已运行</dt><dd class="mono">{{.D.Uptime}}</dd></div>
       <div><dt>数据量</dt><dd>{{.D.CustomerCount}} 位客户 · {{.D.PackageCount}} 个套餐 · {{.D.LogCount}} 条日志</dd></div>
     </dl>
     <div class="actions wrap">
-      <form method="post" action="/settings/backup"><button class="btn" type="submit">立即备份</button></form>
+      <form method="post" action="/settings/backup"><button class="btn btn-soft" type="submit">立即备份</button></form>
-      <a class="btn" href="/export/customers.csv">导出客户 CSV</a>
+      <a class="btn btn-soft" href="/export/customers.csv">导出客户 CSV</a>
-      <a class="btn" href="/export/subscriptions.csv">导出订阅 CSV</a>
+      <a class="btn btn-soft" href="/export/subscriptions.csv">导出订阅 CSV</a>
-      <a class="btn" href="/export/logs.csv">导出日志 CSV</a>
+      <a class="btn btn-soft" href="/export/logs.csv">导出日志 CSV</a>
     </div>
     {{if .D.Backups}}
     <details class="backups">

internal/web/templates/pages/setup.html

@@ -1,25 +1,25 @@
 {{define "content"}}
 <div class="auth">
+  <button class="theme-toggle auth-theme" type="button" data-theme-toggle aria-label="切换亮色/暗色" aria-pressed="false"><span class="ic-moon" aria-hidden="true">☾</span><span class="ic-sun" aria-hidden="true">☀</span></button>
   <div class="auth-card">
-    <div class="auth-brand"><span class="brand-mark">代</span><span>代打台</span></div>
+    <div class="auth-brand"><span class="brand-mark" aria-hidden="true">代</span><span>代打台-L</span></div>
-    <h1>创建第一个管理员</h1>
+    <h1>创建管理员</h1>
-    <p class="muted">数据库里还没有账户。设置好账号后即可开始录入套餐与客户。</p>
+    <p>数据库里还没有账户。创建后不能再添加其他管理员。</p>
-    <form method="post" action="/setup" class="form">
+    <form method="post" action="/setup" class="stack">
       <label class="field"><span>用户名</span>
-        <input type="text" name="username" required minlength="3" maxlength="32" autocomplete="username" placeholder="建议用拼音或英文名">
+        <input class="form-control" id="username" type="text" name="username" required minlength="3" maxlength="32" autocomplete="username" placeholder="建议用拼音或英文名">
       </label>
       <label class="field"><span>显示名称</span>
-        <input type="text" name="display_name" maxlength="32" placeholder="例如：老王（可留空）">
+        <input class="form-control" id="display_name" type="text" name="display_name" maxlength="32" placeholder="例如：老王（可留空）">
-      </label>
+      </label>      <label class="field"><span>密码（至少 6 位）</span>
-      <label class="field"><span>密码（至少 6 位）</span>
+        <input class="form-control" id="password" type="password" name="password" required minlength="6" autocomplete="new-password">
-        <input type="password" name="password" required minlength="6" autocomplete="new-password">
       </label>
       <label class="field"><span>再输一次密码</span>
-        <input type="password" name="password2" required minlength="6" autocomplete="new-password">
+        <input class="form-control" id="password2" type="password" name="password2" required minlength="6" autocomplete="new-password">
       </label>
       <button type="submit" class="btn btn-primary btn-block">创建并登录</button>
     </form>
-    <p class="auth-foot muted">忘记密码只能手动改数据库，请妥善保管。</p>
+    <p class="auth-foot">忘记密码只能手动改数据库，请妥善保管。</p>
   </div>
 </div>
 {{end}}

internal/web/templates/pages/subscriptions.html

@@ -3,11 +3,11 @@
   <header class="page-head">
     <div>
       <h1>订阅</h1>
-      <p class="muted">共 {{.D.Total}} 条 · 剩余时长各自独立计算</p>
+      <p>共 {{.D.Total}} 条 · 剩余时长各自独立计算</p>
     </div>
   </header>
 
-  <div class="tabs">
+  <nav class="tabs" aria-label="订阅状态">
     <a href="/subscriptions?state=active" class="{{if eq .D.State "active"}}on{{end}}">进行中</a>
     <a href="/subscriptions?state=due7" class="{{if eq .D.State "due7"}}on{{end}}">7 天内到期</a>
     <a href="/subscriptions?state=due_today" class="{{if eq .D.State "due_today"}}on{{end}}">今天到期</a>
@@ -15,25 +15,25 @@
     <a href="/subscriptions?state=paused" class="{{if eq .D.State "paused"}}on{{end}}">暂停中</a>
     <a href="/subscriptions?state=closed" class="{{if eq .D.State "closed"}}on{{end}}">已结束</a>
     <a href="/subscriptions?state=all" class="{{if eq .D.State "all"}}on{{end}}">全部</a>
-  </div>
+  </nav>
 
   <form class="filterbar" method="get" action="/subscriptions">
     <input type="hidden" name="state" value="{{.D.State}}">
-    <input type="search" name="q" value="{{.D.Q}}" placeholder="尾号 / 姓名 / 套餐" autocomplete="off">
+    <input type="search" name="q" value="{{.D.Q}}" placeholder="尾号 / 姓名 / 套餐" autocomplete="off" aria-label="搜索订阅">
-    <select name="package_id">
+    <select name="package_id" aria-label="按套餐筛选">
       <option value="0">全部套餐</option>
       {{range .D.Packages}}
       <option value="{{.ID}}"{{if eq $.D.PackageID .ID}} selected{{end}}>{{.Name}}</option>
       {{end}}
     </select>
-    <button class="btn" type="submit">筛选</button>
+    <button class="btn btn-soft" type="submit">筛选</button>
   </form>
 
   {{if .D.List}}
   <div class="table-wrap">
-    <table class="table">
+    <table class="table table-subs">
       <thead>
-        <tr><th>客户</th><th>套餐</th><th>状态</th><th>剩余</th><th>时间</th><th>操作</th></tr>
+        <tr><th scope="col">客户</th><th scope="col">套餐</th><th scope="col">状态</th><th scope="col">剩余</th><th scope="col">时间</th><th scope="col">操作</th></tr>
       </thead>
       <tbody>
         {{range .D.List}}
@@ -49,14 +49,14 @@
           <td class="mono small">{{.PeriodText}}</td>
           <td class="actions-cell">
             {{if ne .Status "closed"}}
-            <a class="btn btn-sm" href="/customers/{{.CustomerID}}?extend={{.ID}}#extend">追加</a>
+                        <a class="btn btn-soft btn-sm" href="/customers/{{.CustomerID}}?extend={{.ID}}#extend">追加</a>
             {{if eq .Status "active"}}
-            <form method="post" action="/subscriptions/{{.ID}}/pause"><button class="btn btn-sm btn-ghost">暂停</button></form>
+            <form method="post" action="/subscriptions/{{.ID}}/pause"><button class="btn btn-ghost btn-sm">暂停</button></form>
             {{else if eq .Status "paused"}}
-            <form method="post" action="/subscriptions/{{.ID}}/resume"><button class="btn btn-sm">恢复</button></form>
+            <form method="post" action="/subscriptions/{{.ID}}/resume"><button class="btn btn-soft btn-sm">恢复</button></form>
             {{end}}
             {{else}}
-            <form method="post" action="/subscriptions/{{.ID}}/reopen"><button class="btn btn-sm">重新启用</button></form>
+            <form method="post" action="/subscriptions/{{.ID}}/reopen"><button class="btn btn-soft btn-sm">重新启用</button></form>
             {{end}}
           </td>
         </tr>
@@ -69,7 +69,7 @@
   <div class="empty">
     <div class="empty-mark">票</div>
     <p>这个筛选下没有订阅。</p>
-    <a class="btn" href="/subscriptions?state=all">看全部</a>
+    <a class="btn btn-soft" href="/subscriptions?state=all">看全部</a>
   </div>
   {{end}}
 </div>

internal/web/view.go

@@ -41,8 +41,6 @@ func stateLabel(state string) (string, string) {
 		return "暂停中", "paused"
 	case domain.StateExpired:
 		return "已到期", "expired"
-	case domain.StateUsedUp:
-		return "次数用尽", "usedup"
 	case domain.StateClosed:
 		return "已结束", "closed"
 	}
@@ -57,30 +55,15 @@ func newSubView(s store.Subscription, today time.Time, warnDays int) SubView {
 		Eval:         e,
 		StateLabel:   label,
 		StateClass:   class,
+		UnitLabel:    "按日",
 		Today:        domain.Date(today),
 	}
-	if s.Unit == domain.UnitDay {
+	v.RemainText = fmt.Sprintf("剩 %d 天", e.RemainingDays)
-		v.UnitLabel = "按日"
+	v.RemainShort = fmt.Sprintf("%d 天", e.RemainingDays)
-		v.RemainText = fmt.Sprintf("剩 %d 天", e.RemainingDays)
+	v.PeriodText = s.StartDate + " → " + s.EndDate
-		v.RemainShort = fmt.Sprintf("%d 天", e.RemainingDays)
+	total := domain.DayDiff(domain.ParseDateOr(s.StartDate, today), domain.ParseDateOr(s.EndDate, today)) + 1
-		v.PeriodText = s.StartDate + " → " + s.EndDate
+	if total > 0 {
-		total := domain.DayDiff(domain.ParseDateOr(s.StartDate, today), domain.ParseDateOr(s.EndDate, today)) + 1
+		v.Progress = clampPct(e.RemainingDays * 100 / total)
-		if total > 0 {
-			v.Progress = clampPct(e.RemainingDays * 100 / total)
-		}
-	} else {
-		v.UnitLabel = "按次"
-		v.RemainText = fmt.Sprintf("剩 %d / %d 次", e.RemainingCount, s.TotalCount)
-		v.RemainShort = fmt.Sprintf("%d 次", e.RemainingCount)
-		v.PeriodText = s.StartDate + " 起"
-		if s.EndDate != "" {
-			v.PeriodText += " · 有效期至 " + s.EndDate
-		} else {
-			v.PeriodText += " · 无有效期"
-		}
-		if s.TotalCount > 0 {
-			v.Progress = clampPct(e.RemainingCount * 100 / s.TotalCount)
-		}
 	}
 
 	switch e.Level {
@@ -92,10 +75,8 @@ func newSubView(s store.Subscription, today time.Time, warnDays int) SubView {
 			v.DueText = "明天到期"
 		case e.DaysLeft > 1:
 			v.DueText = fmt.Sprintf("%d 天后到期", e.DaysLeft)
-		case s.Unit == domain.UnitDay:
-			v.DueText = fmt.Sprintf("还剩 %d 天", e.RemainingDays)
 		default:
-			v.DueText = fmt.Sprintf("%d 天后到期", e.DaysLeft)
+			v.DueText = fmt.Sprintf("还剩 %d 天", e.RemainingDays)
 		}
 	case domain.LevelExpired:
 		if s.EndDate != "" {
@@ -105,13 +86,10 @@ func newSubView(s store.Subscription, today time.Time, warnDays int) SubView {
 			} else {
 				v.DueText = "已到期"
 			}
-		} else {
-			v.DueText = "次数已用尽"
 		}
 	}
-	// 今天能否打卡：进行中且（按日或有剩余次数）
+	// 今天能否打卡：进行中且在有效区间内
-	v.CanCheckinToday = e.State == domain.StateActive &&
+	v.CanCheckinToday = e.State == domain.StateActive
-		(s.Unit == domain.UnitDay || e.RemainingCount > 0)
 	return v
 }
 
@@ -135,11 +113,10 @@ func subViews(subs []store.Subscription, today time.Time, warnDays int) []SubVie
 
 // ---------- 追加面板 ----------
 
-// ExtendPanel 是「追加时长/次数」面板数据。
+// ExtendPanel 是「追加时长」面板数据。
 type ExtendPanel struct {
 	Sub           store.Subscription
 	View          SubView
-	IsDay         bool
 	Today         string
 	OldEnd        string
 	Base          string
@@ -171,7 +148,6 @@ func buildExtendPanel(s *store.Subscription, pkg *store.Package, today time.Time
 	p := &ExtendPanel{
 		Sub:           *s,
 		View:          newSubView(*s, today, warnDays),
-		IsDay:         s.Unit == domain.UnitDay,
 		Today:         domain.Date(today),
 		Back:          back,
 		DefaultAmount: pkg.DefaultAmount,
@@ -179,9 +155,6 @@ func buildExtendPanel(s *store.Subscription, pkg *store.Package, today time.Time
 	if p.DefaultAmount <= 0 {
 		p.DefaultAmount = 30
 	}
-	if s.Unit != domain.UnitDay {
-		return p
-	}
 	oldEnd := domain.ParseDateOr(s.EndDate, today)
 	plan := domain.PlanExtend(oldEnd, oldEnd, today)
 	suggested := domain.AddDays(plan.Base, p.DefaultAmount-1)
@@ -329,13 +302,13 @@ func buildTimeline(subs []store.Subscription, pauses map[int64][]store.Pause, to
 			en = st
 		}
 		b := Bar{
-			SubID: s.ID,
+			SubID:  s.ID,
-			Name:  s.PackageName,
+			Name:   s.PackageName,
-			Color: s.PackageColor,
+			Color:  s.PackageColor,
-			Left:  pos(st),
+			Left:   pos(st),
-			Width: float64(domain.DayDiff(st, en)+1) / float64(totalDays) * 100,
+			Width:  float64(domain.DayDiff(st, en)+1) / float64(totalDays) * 100,
-			Label: domain.Date(st) + " → " + domain.Date(en),
+			Label:  domain.Date(st) + " → " + domain.Date(en),
-			State: s.Status,
+			State:  s.Status,
 			HasDue: s.EndDate != "",
 		}
 		b.DueLeft = pos(en)

main.go

@@ -17,6 +17,7 @@ import (
 	"path/filepath"
 	"runtime"
 	"strconv"
+	"strings"
 	"syscall"
 	"time"
 
@@ -26,7 +27,7 @@ import (
 	"daili/internal/web"
 )
 
-const version = "1.1.0"
+const version = "1.11.5-L"
 
 func main() {
 	cfgFlag := flag.String("config", "", "配置文件路径（默认：exe 同级的 "+config.FileName+"）")
@@ -41,7 +42,7 @@ func main() {
 	flag.Visit(func(f *flag.Flag) { flagsSet[f.Name] = true })
 
 	log.SetFlags(log.LstdFlags)
-	log.SetPrefix("[代打台] ")
+	log.SetPrefix("[代打台-L] ")
 
 	exeDir := executableDir()
 	cfgPath := *cfgFlag
@@ -51,7 +52,7 @@ func main() {
 	cfg, err := config.Load(cfgPath, exeDir)
 	if err != nil {
 		// 配置写错时不要吞掉，直接指向具体行
-		fmt.Fprintf(os.Stderr, "\n[代打台] 配置文件有问题，已停止启动：\n\n%v\n\n", err)
+		fmt.Fprintf(os.Stderr, "\n[代打台-L] 配置文件有问题，已停止启动：\n\n%v\n\n", err)
 		os.Exit(1)
 	}
 
@@ -130,7 +131,6 @@ func main() {
 		BackupKeep:    cfg.BackupKeep,
 		BackupDir:     cfg.BackupDir,
 		BackupEnabled: cfg.BackupEnabled,
-		ScreenPublic:  cfg.ScreenPublic,
 		ConfigPath:    cfg.Path,
 		Version:       version,
 	})
@@ -200,7 +200,7 @@ func main() {
 }
 
 func fatal(format string, args ...any) {
-	fmt.Fprintf(os.Stderr, "\n[代打台] "+format+"\n\n", args...)
+	fmt.Fprintf(os.Stderr, "\n[代打台-L] "+format+"\n\n", args...)
 	os.Exit(1)
 }
 
@@ -239,10 +239,11 @@ func executableDir() string {
 
 func printBanner(cfg *config.Config, dbPath string) string {
 	port := strconv.Itoa(cfg.ListenPort)
+	const inner = 47
 	fmt.Println()
-	fmt.Println("  ┌───────────────────────────────────────────────┐")
+	fmt.Println("  ┌" + strings.Repeat("─", inner) + "┐")
-	fmt.Println("  │            代 打 台 · 代打管理平台             │")
+	fmt.Println("  " + bannerRow("代 打 台 - L · 代打管理平台", inner))
-	fmt.Println("  └───────────────────────────────────────────────┘")
+	fmt.Println("  └" + strings.Repeat("─", inner) + "┘")
 	fmt.Printf("   版本 %s   配置文件 %s\n", version, filepath.Base(cfg.Path))
 	fmt.Printf("   数据库 %s\n", dbPath)
 	fmt.Println("   访问地址：")
@@ -264,19 +265,35 @@ func printBanner(cfg *config.Config, dbPath string) string {
 		fmt.Printf("     地址   %s\n", primary)
 	}
 
-	if cfg.ScreenPublic {
-		fmt.Printf("     大屏   %s/screen（免登录）\n", primary)
-	} else {
-		fmt.Printf("     大屏   %s/screen（需登录）\n", primary)
-	}
-	if cfg.PublicBind() && cfg.ScreenPublic {
-		fmt.Println("   注意：大屏免登录且监听所有网卡，同局域网内任何人都能打开 /screen")
-	}
 	fmt.Println("   按 Ctrl+C 停止服务")
 	fmt.Println()
 	return primary
 }
 
+// bannerRow 把一行标题居中放进方框；中文按两列宽计算，保证不歪。
+func bannerRow(text string, inner int) string {
+	w := displayWidth(text)
+	if w >= inner {
+		return "│" + text + "│"
+	}
+	left := (inner - w) / 2
+	right := inner - w - left
+	return "│" + strings.Repeat(" ", left) + text + strings.Repeat(" ", right) + "│"
+}
+
+// displayWidth 估算终端显示宽度：非 ASCII 一律按两列算。
+func displayWidth(s string) int {
+	w := 0
+	for _, r := range s {
+		if r < 0x1100 {
+			w++
+			continue
+		}
+		w += 2
+	}
+	return w
+}
+
 func openBrowser(url string) {
 	var cmd *exec.Cmd
 	switch runtime.GOOS {

scripts/acceptance.ps1

@@ -229,7 +229,7 @@ $r = Send $admin 'POST' "/customers/$custID/subscriptions" @{ package_id = '2';
 Check 'U-02' '开通按次订阅（10 次 / 有效期 T+10）' ((Has $r.Content '已开通')) "flash=$(Flash $r.Content)"
 $r = Send $admin 'GET' "/customers/$custID"
 $p2ID = (SubIDs $r.Content)[1]
-Check 'U-02b' '按次剩余 10/10 次' ((Has $r.Content '剩 10 / 10 次')) ""
+Check 'U-02b' '按次已完成 0/10 次' ((Has $r.Content '已完成 0 / 10 次')) ""
 
 $r = Send $admin 'POST' "/customers/$custID/subscriptions" @{ package_id = '1'; start_date = $today; days = '30' }
 Check 'U-03' '重复订阅被拦截' ((Has $r.Content '已订阅此套餐')) "flash=$(Flash $r.Content)"
@@ -239,7 +239,7 @@ $before = (Send $admin 'GET' "/customers/$custID").Content
 $r = Send $admin 'POST' '/packages' @{ name = '副本五次'; unit = 'count'; default_amount = '5'; price = '120'; color = '#41556B'; note = '无有效期'; sort_order = '3' }
 Check 'P-05' '新增套餐 D 成功' ((Has $r.Content '套餐已创建')) ""
 $after = (Send $admin 'GET' "/customers/$custID").Content
-Check 'P-05b' '新增套餐后既有订阅剩余量不变' ((Has $after '剩 30 天') -and (Has $after '剩 10 / 10 次')) ""
+Check 'P-05b' '新增套餐后既有订阅进度不变' ((Has $after '剩 30 天') -and (Has $after '已完成 0 / 10 次')) ""
 
 $r = Send $admin 'POST' "/customers/$custID/subscriptions" @{ package_id = '3'; start_date = $today; total_count = '5' }
 Check 'U-04' '开通第三个套餐（无有效期按次）' ((Has $r.Content '已开通')) "flash=$(Flash $r.Content)"
@@ -313,7 +313,7 @@ Check 'E-07' '已结束订阅不可追加' ((Has $r.Content '请先「重新启
 
 $r = Send $admin 'POST' "/subscriptions/$p2ID/extend" @{ add_count = '5'; note = '加购 5 次'; back = "/customers/$custID" }
 $d4 = (Send $admin 'GET' "/customers/$custID").Content
-Check 'E-08' '按次追加次数' ((Has $r.Content '已追加 5 次') -and (Has $d4 '剩 15 / 15 次')) "flash=$(Flash $r.Content)"
+Check 'E-08' '按次追加次数' ((Has $r.Content '已追加 5 次') -and (Has $d4 '已完成 0 / 15 次')) "flash=$(Flash $r.Content)"
 
 $r = Send $admin 'POST' "/subscriptions/$p2ID/extend" @{ add_count = '5'; new_end_opt = (D 30); note = '加次并延期'; back = "/customers/$custID" }
 $d5 = (Send $admin 'GET' "/customers/$custID").Content
@@ -365,22 +365,22 @@ Check 'K-02' '按日打卡不扣天数' ((Has $d '剩 30 天')) ""
 
 $r = Send $admin 'POST' "/subscriptions/$p2ID/checkin" @{ date = $today; status = 'done'; back = "/customers/$custID" }
 $d = (Send $admin 'GET' "/customers/$custID").Content
-Check 'K-03' '按次打卡扣 1 次' ((Has $d '剩 19 / 20 次')) ""
+Check 'K-03' '按次打卡扣 1 次' ((Has $d '已完成 1 / 20 次')) ""
 
 $r = Send $admin 'POST' "/subscriptions/$p2ID/checkin" @{ date = $today; status = 'done'; back = "/customers/$custID" }
 $d = (Send $admin 'GET' "/customers/$custID").Content
-Check 'K-04' '同日重复打卡不重复扣次' ((Has $d '剩 19 / 20 次')) ""
+Check 'K-04' '同日重复打卡不重复扣次' ((Has $d '已完成 1 / 20 次')) ""
 
 $r = Send $admin 'POST' "/subscriptions/$p2ID/checkin" @{ date = $today; status = 'skipped'; back = "/customers/$custID" }
 $d = (Send $admin 'GET' "/customers/$custID").Content
-Check 'K-05' '改为跳过返还 1 次' ((Has $d '剩 20 / 20 次')) ""
+Check 'K-05' '改为跳过返还 1 次' ((Has $d '已完成 0 / 20 次')) ""
 
 Send $admin 'POST' "/subscriptions/$p2ID/checkin" @{ date = $today; status = 'done'; back = "/customers/$custID" } | Out-Null
 $d = (Send $admin 'GET' "/customers/$custID").Content
 $ciID = (Dbtool @('scalar', $Db, "SELECT id FROM checkins WHERE sub_id=$p2ID AND service_date='$today'")).Trim()
 $r = Send $admin 'POST' "/checkins/$ciID/delete" @{ back = "/customers/$custID" }
 $d = (Send $admin 'GET' "/customers/$custID").Content
-Check 'K-06' '撤销打卡返还次数' ((Has $r.Content '已撤销') -and (Has $d '剩 20 / 20 次')) "flash=$(Flash $r.Content)"
+Check 'K-06' '撤销打卡返还次数' ((Has $r.Content '已撤销') -and (Has $d '已完成 0 / 20 次')) "flash=$(Flash $r.Content)"
 
 Dbtool @('exec', $Db, "UPDATE subscriptions SET used_count=total_count WHERE id=$p2ID") | Out-Null
 $r = Send $admin 'POST' "/subscriptions/$p2ID/checkin" @{ date = $today; status = 'done'; back = "/customers/$custID" }
@@ -395,7 +395,7 @@ Check 'K-11' '无有效期订阅卡片有「今日打卡」按钮' ((Has $r.Cont
 
 $r = Send $admin 'POST' "/subscriptions/$p3ID/checkin" @{ date = $today; status = 'done'; back = "/customers/$custID" }
 $d = (Send $admin 'GET' "/customers/$custID").Content
-Check 'K-09' '无有效期按次订阅可打卡扣次' ((Has $d '剩 4 / 5 次')) "flash=$(Flash $r.Content)"
+Check 'K-09' '无有效期按次订阅可打卡扣次' ((Has $d '已完成 1 / 5 次')) "flash=$(Flash $r.Content)"
 Check 'K-10' '打卡历史含日期/备注/操作人' ((Has $d '今日已打') -or (Has $d '完成')) ""
 
 Write-Host "`n=== 11. 日历（L） ===" -ForegroundColor Cyan
@@ -410,7 +410,7 @@ $r = Send $admin 'GET' '/calendar?y=2020&m=1'
 Check 'L-03' '「回到今天」入口存在' ((Has $r.Content '回到今天')) ""
 $cal = (Send $admin 'GET' "/calendar?d=$today").Content
 Check 'L-04' '格子显示色签与负荷' ((Has $cal '单测') -and (Has $cal '包月') -and (Has $cal 'heat-')) ""
-Check 'L-05' '点日期切换抽屉' ((Has $cal ($T.ToString('M 月 d 日'))) -and (Has $cal '当日待打')) ""
+Check 'L-05' '点日期切换抽屉' ((Has $cal ($T.ToString('M 月 d 日'))) -and (Has $cal '当日待完成')) ""
 $r = Send $admin 'GET' "/calendar?d=$(D -1)"
 Check 'L-06' '过去日期标记已过去' ((Has $r.Content '已过去')) ""
 Check 'L-07' '近 7 天到期区块' ((Has $cal '近 7 天到期')) ""
@@ -433,11 +433,12 @@ $kpiCust = [regex]::Match($screen, '(?s)客户</span>\s*<b>(\d+)</b>').Groups[1]
 $kpiDue = [regex]::Match($screen, '(?s)今日到期</span>\s*<b>(\d+)</b>').Groups[1].Value
 $kpi7 = [regex]::Match($screen, '(?s)7 天内到期</span>\s*<b>(\d+)</b>').Groups[1].Value
 Check 'D-02' '四张 KPI 与后台一致' (($kpiCust -eq $custN) -and ($kpiDue -eq $dueToday) -and ($kpi7 -eq $due7)) "cust=$kpiCust/$custN due=$kpiDue/$dueToday 7=$kpi7/$due7"
-Check 'D-03' '热力月历渲染' ((Has $screen '到期热力') -and (Has $screen 'heat-cell')) ""
+$screenDue = (Send $admin 'GET' '/screen?heat=due').Content
+Check 'D-03' '热力月历渲染（默认待完成，可切到期）' ((Has $screen '每日待完成') -and (Has $screen 'heat-cell') -and (Has $screenDue '到期热力')) ""
 $topN = [regex]::Matches($screen, 'class="top-item').Count
 Check 'D-04' 'TOP 榜不超过 10 条' ((Has $screen '即将到期 TOP 10') -and ($topN -ge 1) -and ($topN -le 10)) "count=$topN"
-$todayTasks = [regex]::Match($cal, '(\d+) 待打').Groups[1].Value
+$todayTasks = [regex]::Match($cal, '(\d+) 待完成').Groups[1].Value
-$screenTasks = [regex]::Match($screen, '<span>(\d+) / (\d+) 已完成</span>').Groups[2].Value
+$screenTasks = [regex]::Match($screen, '(\d+) / (\d+) 已完成').Groups[2].Value
 Check 'D-05' '今日待打数与日历一致' ($todayTasks -eq $screenTasks -and $todayTasks -ne '') "calendar=$todayTasks screen=$screenTasks"
 Check 'D-06' '最近追加流水渲染' ((Has $screen '最近追加')) ""
 Check 'D-07' '自动刷新秒数取自设置' ((Has $screen '<meta http-equiv="refresh" content="30">')) ""

scripts/smoke-lite.ps1

@@ -0,0 +1,126 @@
+# lite 版冒烟：起一个隔离实例，把所有页面都渲染一遍（用 curl.exe，绕开受约束语言模式）
+$ErrorActionPreference = 'Stop'
+$root = if ($PSScriptRoot) { $PSScriptRoot } else { (Get-Location).Path }
+if (-not (Test-Path (Join-Path $root 'go.mod'))) { $root = Join-Path $root 'subtrack' }
+
+$port = 17779
+$exe  = Join-Path $root 'daili-lite-smoke.exe'
+$db   = Join-Path $root '.gotmp\smoke-lite.db'
+$jar  = Join-Path $root '.gotmp\cookies.txt'
+$base = "http://127.0.0.1:$port"
+$resp = @{}
+$i = 0
+$fail = 0
+
+New-Item -ItemType Directory -Force -Path (Join-Path $root '.gotmp') | Out-Null
+foreach ($f in @($db, $jar)) { if (Test-Path $f) { Remove-Item $f -Force } }
+
+$env:GOFLAGS='-mod=mod'; $env:GOPROXY='off'; $env:GOSUMDB='off'
+$env:GOCACHE=(Join-Path $root '.gocache'); $env:GOTMPDIR=(Join-Path $root '.gotmp')
+Push-Location $root
+go build -o $exe .
+$buildOk = ($LASTEXITCODE -eq 0)
+Pop-Location
+if (-not $buildOk) { Write-Output 'BUILD FAILED'; exit 1 }
+Write-Output 'build ok'
+
+$logFile = Join-Path $root '.gotmp\smoke-server.log'
+$proc = Start-Process -FilePath $exe -ArgumentList @('-addr', "127.0.0.1:$port", '-db', $db, '-no-open', '-no-backup') -PassThru -RedirectStandardOutput $logFile -RedirectStandardError ($logFile + '.err') -WindowStyle Hidden
+Start-Sleep -Seconds 2
+
+function Req($name, $path, $method = 'GET', $data = $null) {
+  $body = Join-Path $root ('.gotmp\resp-{0}.html' -f $global:i)
+  $global:i = $global:i + 1
+  $a = @('-s', '-o', $body, '-w', '%{http_code}', '-b', $global:jar, '-c', $global:jar, '-L', '--max-time', '20')
+  if ($method -eq 'POST') {
+    # 不要用 -X POST：curl 会在 303 重定向后继续 POST，导致下一跳 405
+    foreach ($k in $data.Keys) { $a = $a + @('--data-urlencode', ($k + '=' + $data[$k])) }
+  }
+  $a = $a + @($global:base + $path)
+  $code = (& curl.exe @a) -join ''
+  $text = ''
+  if (Test-Path $body) { $text = (Get-Content -Raw -Encoding utf8 $body) }
+  if ($null -eq $text) { $text = '' }
+  $bad = $text -match '页面渲染失败|模板不存在'
+  $status = if ($bad) { 'TEMPLATE-ERROR' } else { 'ok' }
+  if ($bad -or $code -ne '200') { $global:fail = $global:fail + 1 }
+  Write-Output ('{0,-26} {1} {2} len={3}' -f $name, $code, $status, $text.Length)
+  $global:resp[$name] = $text
+}
+
+function Post($name, $path, $data) { Req $name $path 'POST' $data }
+
+Write-Output '--- 页面渲染 ---'
+Req 'GET /login' '/login'
+Req 'GET /setup' '/setup'
+Post 'POST /setup' '/setup' @{ username = 'admin'; display_name = 'boss'; password = 'daili123'; password2 = 'daili123' }
+
+Req 'GET /calendar' '/calendar'
+Req 'GET /settings' '/settings'
+Req 'GET /logs' '/logs'
+Req 'GET /packages' '/packages'
+Req 'GET /packages/new' '/packages/new'
+Post 'POST /packages' '/packages' @{ name = 'monthly'; default_amount = '30'; price = '300'; color = '#3B6EA5'; sort_order = '0'; note = 'smoke' }
+Req 'GET /packages/1' '/packages/1'
+Req 'GET /packages/1/edit' '/packages/1/edit'
+Req 'GET /customers' '/customers'
+Req 'GET /customers/new' '/customers/new'
+Post 'POST /customers' '/customers' @{ tail = '1234'; name = 'laozhang'; game_name = 'wzry'; game_server = 'wx'; contact = 'wx'; source = 'douyin'; tags = 'vip'; note = 'smoke' }
+Req 'GET /customers/1' '/customers/1'
+Req 'GET /customers/1/edit' '/customers/1/edit'
+Post 'POST /sub-create' '/customers/1/subscriptions' @{ package_id = '1'; start_date = '2026-01-01'; days = '30'; end_date = ''; note = 'smoke' }
+Req 'GET /subscriptions' '/subscriptions'
+Req 'GET /calendar?extend' '/calendar?extend=1'
+Req 'GET /calendar?pick' '/calendar?pick=1234'
+Post 'POST /checkin' '/subscriptions/1/checkin' @{ date = '2026-01-01'; status = 'done'; note = '' }
+Post 'POST /settings' '/settings' @{ warn_days = '5' }
+Post 'POST /password' '/settings/password' @{ old_password = 'daili123'; password = 'daili456'; password2 = 'daili456' }
+
+Write-Output '--- 真实数据（今天开通 → 日历应有待打任务）---'
+$today = (Get-Date).ToString('yyyy-MM-dd')
+Post 'POST /packages2' '/packages' @{ name = 'weekly'; default_amount = '7'; price = '80'; color = '#884422'; sort_order = '0' }
+Post 'POST /sub2' '/customers/1/subscriptions' @{ package_id = '2'; start_date = $today; days = '30'; end_date = '' }
+Req 'GET /calendar-live' '/calendar'
+$live = $resp['GET /calendar-live']
+
+Write-Output '--- 已移除的路由 ---'
+foreach ($gone in @('/screen', '/customer', '/api/screen/day')) {
+  $code = (& curl.exe -s -o NUL -w '%{http_code}' -b $jar --max-time 10 ($base + $gone)) -join ''
+  $tag = if ($code -eq '404') { 'ok (404)' } else { 'UNEXPECTED'; }
+  if ($code -ne '404') { $fail = $fail + 1 }
+  Write-Output ('{0,-26} {1} {2}' -f ('GONE ' + $gone), $code, $tag)
+}
+
+Write-Output '--- 内容断言 ---'
+$cal = $resp['GET /calendar']
+function Assert($label, $haystack, $pattern, $expectFound) {
+  $found = $haystack -match $pattern
+  $pass = ($found -eq $expectFound)
+  if (-not $pass) { $global:fail = $global:fail + 1 }
+  $verdict = if ($pass) { 'ok' } else { 'FAIL' }
+  $what = if ($expectFound) { 'present' } else { 'absent' }
+  Write-Output ('{0,-34} {1} ({2} expected)' -f $label, $verdict, $what)
+}
+Assert '盲水印 Powered by Baka春秋' $cal 'Powered by Baka春秋' $true
+Assert 'wm-blind 容器' $cal 'class="wm-blind"' $true
+Assert '品牌 代打台-L' $cal '代打台-L' $true
+Assert '页脚版本 v1.11.5-L' $cal 'v1\.11\.5-L' $true
+Assert '大屏入口' $cal '大屏' $false
+Assert '/screen 链接' $cal '/screen' $false
+Assert '通行证' $cal '通行证' $false
+Assert '深渊' $cal '深渊' $false
+Assert '按次' $cal '按次' $false
+Assert '小键盘' $cal '小键盘' $false
+Assert '打手' $cal '打手' $false
+Assert 'keypad 标记' $cal 'data-keypad' $false
+
+Write-Output '--- 实时数据断言 ---'
+Assert '日历有待打任务' $live '今日打卡|当日待完成' $true
+Assert '剩余 30 天' $live '剩 30 天' $true
+Assert '客户尾号 1234' $live '1234' $true
+Assert '今天到期徽标' $live '今日到期' $true
+
+Stop-Process -Id $proc.Id -Force -ErrorAction SilentlyContinue
+Write-Output '--- server log ---'
+if (Test-Path $logFile) { Get-Content $logFile -Encoding utf8 | Select-Object -First 30 }
+Write-Output ('SMOKE-FAILURES=' + $fail)