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
@@ -84,6 +84,31 @@ func (r *Repository) List(ctx context.Context, query AnnouncementListQuery) (*Pa
}, nil
}
// PublicPopup 取当前站点范围内优先级最高的弹窗公告;没有可弹公告时返回 nil, nil。
//
// 只取 published 且 is_popup = 1 的公告,按 priority DESC(其次发布时间/ID)排序取第一条,
// 因此「多条同时生效只弹优先级最高的一条」由这里保证,前台无需再筛选。
func (r *Repository) PublicPopup(ctx context.Context, allowedSiteIDs []uint64) (*AnnouncementDTO, error) {
query := r.db.WithContext(ctx).
Where("status = ? AND is_popup = ?", "published", true)
if len(allowedSiteIDs) > 0 {
query = query.Where("distribution_site_id IN ?", allowedSiteIDs)
}
var announcement model.Announcement
if err := query.
Order("priority DESC, published_at DESC, id DESC").
First(&announcement).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, nil
}
return nil, err
}
dto := toAnnouncementDTO(announcement)
return &dto, nil
}
// GetByID 获取公告详情(限前台可见的站点范围,避免跨站按 ID 读取)
func (r *Repository) GetByID(ctx context.Context, id uint64, allowedSiteIDs []uint64) (*AnnouncementDTO, error) {
var announcement model.Announcement
@@ -136,7 +161,7 @@ func (r *Repository) AdminList(ctx context.Context, query AnnouncementListQuery)
// adminListBase 管理端公告列表基础查询:带站点名,支持状态/分类/站点筛选。
func (r *Repository) adminListBase(ctx context.Context, query AnnouncementListQuery) *gorm.DB {
base := r.db.WithContext(ctx).Table("announcements AS a").
Select("a.id, a.distribution_site_id, COALESCE(s.site_name, '') AS distribution_site_name, a.title, a.content, a.category, a.priority, a.is_pinned, a.is_important, a.view_count, a.status, a.published_at, a.created_at, a.updated_at").
Select("a.id, a.distribution_site_id, COALESCE(s.site_name, '') AS distribution_site_name, a.title, a.content, a.category, a.priority, a.is_pinned, a.is_important, a.is_popup, a.view_count, a.status, a.published_at, a.created_at, a.updated_at").
Joins("LEFT JOIN distribution_sites AS s ON s.id = a.distribution_site_id")
if query.Status != "" {
@@ -175,6 +200,7 @@ func (r *Repository) Create(ctx context.Context, req CreateAnnouncementRequest,
Priority: req.Priority,
IsPinned: req.IsPinned,
IsImportant: req.IsImportant,
IsPopup: req.IsPopup,
Status: "draft",
CreatedBy: &createdBy,
}
@@ -203,6 +229,7 @@ func (r *Repository) Update(ctx context.Context, id uint64, req UpdateAnnounceme
updates["priority"] = req.Priority
updates["is_pinned"] = req.IsPinned
updates["is_important"] = req.IsImportant
updates["is_popup"] = req.IsPopup
if err := r.db.WithContext(ctx).Model(&model.Announcement{}).Where("id = ?", id).Updates(updates).Error; err != nil {
return nil, err
@@ -255,6 +282,7 @@ func toAnnouncementDTO(a model.Announcement) AnnouncementDTO {
Priority: a.Priority,
IsPinned: a.IsPinned,
IsImportant: a.IsImportant,
IsPopup: a.IsPopup,
ViewCount: a.ViewCount,
Status: a.Status,
PublishedAt: a.PublishedAt,