1) 全站亮色 / 暗色 - 管理端与大屏都提供切换按钮(顶栏 ☾/☀、大屏右上角),偏好写 cookie,服务端首屏直出,不闪 - 未选择时跟随系统(prefers-color-scheme);两套配色都改成 CSS 变量,色签、热力、表格、抽屉全部适配 - 大屏默认仍是深色记分板,浅色为纸感背景 2) 工作台 → 当日待完成:按手机尾号快速完成 - 输入尾号回车:唯一匹配直接完成并提示 - 同尾号多客户 / 一单多服务:跳到选择面板,默认全选,可多选后一次完成 - 新增 POST /checkins/quick 与 POST /checkins/batch;抽屉标题改为「未完成数 / 总单数」 3) 加急 - 每条任务右侧可勾选/取消加急;加急任务红 tag + 置顶(抽屉与大屏「今日待打」) - 日历格子出现红点,单据色签加红边;大屏热力格也带红点 - 新增表 task_flags(sub_id, service_date, urgent),按 订阅+日期 存,避免和打卡状态耦合 4) 套餐「在日历中独立显示」 - 套餐表单新增勾选项,列表页显示「独立日历」标记 - 勾选后工作台与大屏顶部出现套餐标签页(全部 / 每日任务 / …),可只看某类委托的排单、热量与待办 - 新增列 packages.calendar_separate;老库打开时自动 ALTER,无需手工迁移 5) 大屏 - 热力默认改为「每日待完成单量」,右上角可切回「到期热力」 - 鼠标悬停任意日期格,浮出当日待办明细(客户、套餐、剩余、加急),数据来自 GET /api/screen/day - 底部面板改为「今日到期」(左)+「今日待打」(右,加急置顶),最近追加改为最底部细条 数据库兼容性: - 只做加法:新增 task_flags 表与 packages.calendar_separate 列,原有表结构、字段、接口与已有数据均不变 - 迁移可重复执行(CREATE TABLE IF NOT EXISTS + PRAGMA 检查后 ALTER) 测试: - 新增单元测试:套餐独立日历标记、加急增删查、旧库自动加列与重复迁移 - 新增功能冒烟 33 项(主题 cookie、套餐标签、快速完成单/多匹配、加急排序、大屏接口)全部通过 - 原有 119 项验收回归全绿(3 条断言按新 UI 更新:抽屉标题、热力默认口径、今日待打数取值方式) - go vet / go test ./... 通过;版本号 1.2.0
158 lines
4.3 KiB
Go
158 lines
4.3 KiB
Go
package web
|
|
|
|
import (
|
|
"net/http"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"daili/internal/domain"
|
|
"daili/internal/store"
|
|
)
|
|
|
|
type packagesData struct {
|
|
List []store.Package
|
|
}
|
|
|
|
func (s *Server) handlePackages(w http.ResponseWriter, r *http.Request) {
|
|
list, err := s.db.ListPackages(true)
|
|
if err != nil {
|
|
http.Error(w, "读取套餐失败", http.StatusInternalServerError)
|
|
return
|
|
}
|
|
p := s.newPage(r, "套餐", "packages")
|
|
p.D = &packagesData{List: list}
|
|
s.render(w, r, "packages", p)
|
|
}
|
|
|
|
type packageFormData struct {
|
|
Package *store.Package
|
|
IsNew bool
|
|
}
|
|
|
|
func (s *Server) handlePackageNewPage(w http.ResponseWriter, r *http.Request) {
|
|
p := s.newPage(r, "新增套餐", "packages")
|
|
p.D = &packageFormData{
|
|
Package: &store.Package{Unit: domain.UnitDay, DefaultAmount: 30, Color: "#2F5D50"},
|
|
IsNew: true,
|
|
}
|
|
s.render(w, r, "package_form", p)
|
|
}
|
|
|
|
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")),
|
|
SortOrder: 0,
|
|
}
|
|
if v, err := strconv.Atoi(strings.TrimSpace(r.PostFormValue("default_amount"))); err == nil {
|
|
p.DefaultAmount = v
|
|
}
|
|
if v, err := strconv.Atoi(strings.TrimSpace(r.PostFormValue("sort_order"))); err == nil {
|
|
p.SortOrder = v
|
|
}
|
|
if price := strings.TrimSpace(r.PostFormValue("price")); price != "" {
|
|
if f, err := strconv.ParseFloat(price, 64); err == nil {
|
|
p.PriceCents = int(f*100 + 0.5)
|
|
p.HasPrice = true
|
|
}
|
|
}
|
|
if p.Unit == "" {
|
|
p.Unit = domain.UnitDay
|
|
}
|
|
p.CalendarSeparate = r.PostFormValue("calendar_separate") != ""
|
|
return p
|
|
}
|
|
|
|
func validatePackage(p *store.Package) string {
|
|
if p.Name == "" {
|
|
return "套餐名称不能为空"
|
|
}
|
|
if len([]rune(p.Name)) > 32 {
|
|
return "套餐名称最长 32 字"
|
|
}
|
|
if p.Unit != domain.UnitDay && p.Unit != domain.UnitCount {
|
|
return "套餐类型不正确"
|
|
}
|
|
if p.DefaultAmount <= 0 {
|
|
return "默认天数/次数必须大于 0"
|
|
}
|
|
if p.Color == "" || !strings.HasPrefix(p.Color, "#") {
|
|
return "请选择套餐颜色"
|
|
}
|
|
return ""
|
|
}
|
|
|
|
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}
|
|
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}
|
|
s.fail(w, r, "package_form", "保存失败:"+err.Error(), p)
|
|
return
|
|
}
|
|
s.logOp(r, "新增套餐", "package", id, "新增套餐 "+pkg.Name)
|
|
s.redirect(w, r, "/packages", "套餐已创建,现在可以给客户开通了")
|
|
}
|
|
|
|
func (s *Server) handlePackageEditPage(w http.ResponseWriter, r *http.Request) {
|
|
id := pathID(r)
|
|
pkg, err := s.db.Package(id)
|
|
if err != nil {
|
|
http.NotFound(w, r)
|
|
return
|
|
}
|
|
p := s.newPage(r, "编辑套餐", "packages")
|
|
p.D = &packageFormData{Package: pkg, IsNew: false}
|
|
s.render(w, r, "package_form", p)
|
|
}
|
|
|
|
func (s *Server) handlePackageUpdate(w http.ResponseWriter, r *http.Request) {
|
|
id := pathID(r)
|
|
pkg := readPackageForm(r)
|
|
pkg.ID = id
|
|
p := s.newPage(r, "编辑套餐", "packages")
|
|
if msg := validatePackage(pkg); msg != "" {
|
|
p.D = &packageFormData{Package: pkg, IsNew: false}
|
|
s.fail(w, r, "package_form", msg, p)
|
|
return
|
|
}
|
|
if err := s.db.UpdatePackage(pkg); err != nil {
|
|
p.D = &packageFormData{Package: pkg, IsNew: false}
|
|
s.fail(w, r, "package_form", "保存失败:"+err.Error(), p)
|
|
return
|
|
}
|
|
s.logOp(r, "编辑套餐", "package", id, "修改套餐 "+pkg.Name)
|
|
s.redirect(w, r, "/packages", "套餐已保存")
|
|
}
|
|
|
|
func (s *Server) handlePackageArchive(w http.ResponseWriter, r *http.Request) {
|
|
id := pathID(r)
|
|
pkg, err := s.db.Package(id)
|
|
if err != nil {
|
|
http.NotFound(w, r)
|
|
return
|
|
}
|
|
archived := !pkg.Archived
|
|
if err := s.db.SetPackageArchived(id, archived); err != nil {
|
|
s.redirect(w, r, "/packages", "操作失败:"+err.Error())
|
|
return
|
|
}
|
|
action := "归档套餐"
|
|
msg := "套餐已归档,不再允许新订阅(已有订阅不受影响)"
|
|
if !archived {
|
|
action = "取消归档"
|
|
msg = "套餐已恢复"
|
|
}
|
|
s.logOp(r, action, "package", id, action+" "+pkg.Name)
|
|
s.redirect(w, r, "/packages", msg)
|
|
}
|