update. 完成前端页面展示、列表和详情页

update. 调整融合主菜单与板块
update. 分离新闻模块

article/models.py

@@ -1,79 +1,22 @@
 from django.db import models
 from django_ckeditor_5.fields import CKEditor5Field
 
+from base.models import MainMenu
+from common.base import BaseEntity
 from users.models import User, Department
 
 
 # Create your models here.
 
-from django.db import models
-from django.core.exceptions import ValidationError
-
-class Section(models.Model):
-    name = models.CharField('板块名称', max_length=100, unique=True)
-    code = models.SlugField('唯一标识', max_length=50, unique=True, help_text='用于模板或URL识别，建议英文')
-    parent = models.ForeignKey(
-        'self',
-        on_delete=models.CASCADE,
-        null=True,
-        blank=True,
-        related_name='subsections',
-        verbose_name='所属主板块'
-    )
-    order = models.PositiveSmallIntegerField('排序权重', default=0)
-    enabled = models.BooleanField('启用状态', default=True)
-
-    class Meta:
-        verbose_name = '板块'
-        verbose_name_plural = '板块管理'
-        ordering = ('order', 'name')
-
-    def __str__(self):
-        if self.parent:
-            return f"{self.parent.name} → {self.name}"
-        return self.name
-
-    def clean(self):
-        super().clean()
-        # 禁止子板块再设父级（即最多两级）
-        if self.parent and self.parent.parent:
-            raise ValidationError('子板块不能再设置子级，最多只允许一级嵌套。')
-        # 防止自引用
-        if self.pk and self.parent and self.parent.pk == self.pk:
-            raise ValidationError('板块不能以自身为父级。')
-
-    @property
-    def is_sub(self):
-        """是否为子板块"""
-        return self.parent is not None
-
-    @property
-    def is_main(self):
-        """是否为主板块（无父级）"""
-        return self.parent is None
-
-
-class Carousel(models.Model):
-    title = models.CharField("轮播标题", max_length=100)
-    image = models.ImageField("图片", upload_to='carousel/')
-    link_url = models.URLField("跳转链接", blank=True)
-    order = models.IntegerField("排序", default=0)
-    active = models.BooleanField("启用", default=True)
-
-    class Meta:
-        verbose_name = "轮播图"
-        verbose_name_plural = "轮播管理"
-
-
-class Article(models.Model):
+class Article(BaseEntity):
     title = models.CharField("标题", max_length=200)
-    section = models.ForeignKey(Section, on_delete=models.CASCADE, verbose_name="所属板块")
+    section = models.ForeignKey(MainMenu, on_delete=models.SET_NULL, null=True, blank=True, verbose_name="所属板块")
     author = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, verbose_name="作者")
     content = CKEditor5Field("正文")  # 需安装 django-ckeditor
-    cover = models.ImageField("封面图", upload_to='articles/', blank=True)
+    cover = models.ImageField("封面图", upload_to='articles/%Y/%m/%d/', blank=True)
+    # 标记是否为投稿（决定是否需要审核）
+    is_contribution = models.BooleanField("是否投稿", default=False)
     is_published = models.BooleanField("已发布", default=True)
-    created_at = models.DateTimeField("创建时间", auto_now_add=True)
-    updated_at = models.DateTimeField("更新时间", auto_now=True)
 
     class Meta:
         verbose_name = "文章"
@@ -83,7 +26,38 @@ class Article(models.Model):
         return self.title
 
 
-class Notice(models.Model):
+# --- 新增：附件模型 ---
+class ArticleAttachment(BaseEntity):
+    # 关联文章：related_name='attachments' 允许我们通过 article.attachments.all() 访问
+    article = models.ForeignKey(
+        Article,
+        on_delete=models.CASCADE,
+        related_name='attachments',
+        verbose_name="所属文章"
+    )
+    file = models.FileField("附件文件", upload_to='articles/attachments/%Y/%m/%d/')
+
+    class Meta:
+        verbose_name = "文章附件"
+        verbose_name_plural = "文章附件管理"
+
+    def __str__(self):
+        return f"{self.article.title} - {self.file.name}"
+
+
+class Carousel(BaseEntity):
+    title = models.CharField("轮播标题", max_length=100)
+    image = models.ImageField("图片", upload_to='carousel/%Y/%m/%d/')
+    link_url = models.URLField("跳转链接", blank=True)
+    order = models.IntegerField("排序", default=0)
+    active = models.BooleanField("启用", default=True)
+
+    class Meta:
+        verbose_name = "轮播图"
+        verbose_name_plural = "轮播管理"
+
+
+class Notice(BaseEntity):
     title = models.CharField("通知标题", max_length=200)
     content = CKEditor5Field("通知内容")
     publisher = models.ForeignKey(User, on_delete=models.SET_NULL, null=True, verbose_name="发布人")
@@ -101,7 +75,7 @@ class Notice(models.Model):
         return self.title
 
 
-class NoticeReceipt(models.Model):
+class NoticeReceipt(BaseEntity):
     """签收记录"""
     notice = models.ForeignKey(Notice, on_delete=models.CASCADE, related_name='receipts')
     user = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name="签收人")