feat(announcement): 新增首页弹窗公告功能并完成弹窗UI视觉重构

- 数据库与后端:announcements 表增加 is_popup 字段及迁移脚本,提供前台弹窗接口与多公告优先级选取,补全选优单测
- 管理后台:总后台与分销后台公告编辑新增「弹窗公告」开关与列表标签展示
- 前台交互:前台 PC/移动端首页引入 AnnouncementPopup,支持同一用户同一天同一公告仅弹一次的关闭记录
- 视觉优化:重构弹窗结构,顶栏镶嵌品牌橙流光细条与浅暖橙通知徽标,中间内嵌浅灰舒适阅读卡片,底部搭配大锤橙实心主操作按钮
- 验证方式:后端 announcement 单测通过,前端 npm run build 编译无报错,浏览器实机截图验证
This commit is contained in:
yml2213
2026-10-12 18:33:44 +08:00
parent 41d7ffd073
commit 4a9e5f9d66
20 changed files with 758 additions and 14 deletions
@@ -174,3 +174,80 @@ func TestAdminListFiltersBySite(t *testing.T) {
t.Fatalf("站点信息未透出: %+v", items[0])
}
}
// TestPublicPopupSelection 覆盖弹窗公告的选取口径:
// 只有 published + is_popup 才参与,站点范围内按优先级取最高的一条,无候选时返回 nil。
func TestPublicPopupSelection(t *testing.T) {
db := database.NewTestDB()
repo := NewRepository(db)
ctx := context.Background()
// 主站:非弹窗公告(不应参与) + 两条弹窗公告(优先级不同)
plain := model.Announcement{
Title: "普通公告", Content: "内容", Category: "notice", Status: "published",
}
lowPriority := model.Announcement{
Title: "低优先级弹窗", Content: "内容", Category: "notice",
Status: "published", IsPopup: true, Priority: 1,
}
highPriority := model.Announcement{
Title: "高优先级弹窗", Content: "内容", Category: "notice",
Status: "published", IsPopup: true, Priority: 9,
}
// 弹窗但未发布:不应参与
draftPopup := model.Announcement{
Title: "草稿弹窗", Content: "内容", Category: "notice",
Status: "draft", IsPopup: true, Priority: 99,
}
for _, row := range []*model.Announcement{&plain, &lowPriority, &highPriority, &draftPopup} {
if err := db.Create(row).Error; err != nil {
t.Fatal(err)
}
}
popup, err := repo.PublicPopup(ctx, []uint64{0})
if err != nil {
t.Fatal(err)
}
if popup == nil {
t.Fatal("主站应弹出一条弹窗公告, got nil")
}
if popup.ID != highPriority.ID || popup.Title != "高优先级弹窗" {
t.Fatalf("应取优先级最高的弹窗公告, got %+v", popup)
}
if !popup.IsPopup {
t.Fatalf("返回的公告应带 is_popup 标记: %+v", popup)
}
// 站点隔离:独立站只看到本站公告,主站弹窗不可见
site := model.DistributionSite{
SiteCode: "ann_popup_site", SiteName: "弹窗站", Domain: "ann-popup.example.com",
Status: "active", AnnouncementMode: model.AnnouncementModeOwnOnly,
}
if err := db.Create(&site).Error; err != nil {
t.Fatal(err)
}
none, err := repo.PublicPopup(ctx, []uint64{site.ID})
if err != nil {
t.Fatal(err)
}
if none != nil {
t.Fatalf("本站没有弹窗公告时应返回 nil, got %+v", none)
}
// 本站有自己的弹窗公告时应生效
sitePopup := model.Announcement{
DistributionSiteID: site.ID, Title: "本站弹窗", Content: "内容",
Category: "notice", Status: "published", IsPopup: true, Priority: 5,
}
if err := db.Create(&sitePopup).Error; err != nil {
t.Fatal(err)
}
got, err := repo.PublicPopup(ctx, []uint64{site.ID})
if err != nil {
t.Fatal(err)
}
if got == nil || got.ID != sitePopup.ID {
t.Fatalf("应取本站弹窗公告, got %+v", got)
}
}