Merge branch 'main' into main

2026-03-03 10:30:47 +08:00 · 2025-10-23 17:06:25 +08:00
parent 458b125834 8a256e167d
commit efe4b97d83
29 changed files with 965 additions and 109 deletions
--- a/frontend_nuxt/components/PollForm.vue
+++ b/frontend_nuxt/components/PollForm.vue
@@ -4,11 +4,7 @@
      <span class="poll-row-title">投票选项</span>
      <div class="poll-option-item" v-for="(opt, idx) in data.options" :key="idx">
        <BaseInput v-model="data.options[idx]" placeholder="选项内容" />
-        <i
-          v-if="data.options.length > 2"
-          class="fa-solid fa-xmark remove-option-icon"
-          @click="removeOption(idx)"
-        ></i>
+        <close-icon class="remove-option-icon" @click="removeOption(idx)" />
      </div>
      <div class="add-option" @click="addOption">添加选项</div>
    </div>
--- a/frontend_nuxt/components/PostPoll.vue
+++ b/frontend_nuxt/components/PostPoll.vue
@@ -2,6 +2,30 @@
  <div class="post-poll-container" v-if="poll">
    <div class="poll-top-container">
      <div class="poll-options-container">
+        <div class="poll-title-section">
+          <div class="poll-title-section-row">
+            <div class="poll-option-title" v-if="poll.multiple">多选</div>
+            <div class="poll-option-title" v-else-if="isProposal">
+              拟议分类：{{ poll.proposedName }}
+              <ToolTip
+                content="🗳️ 提案提交后将开放3天投票，需达到至少60%的赞成率并满10人参与方可通过。"
+                placement="bottom"
+                v-if="isProposal"
+              >
+                <info-icon class="info-icon" />
+              </ToolTip>
+            </div>
+            <div class="poll-option-title" v-else>单选</div>
+            <div class="poll-left-time">
+              <stopwatch class="poll-left-time-icon" />
+              <div class="poll-left-time-title">离结束</div>
+              <div class="poll-left-time-value">{{ countdown }}</div>
+            </div>
+          </div>
+          <div class="poll-title-section-row">
+            <div v-if="poll.description" class="proposal-description">{{ poll.description }}</div>
+          </div>
+        </div>
        <div v-if="showPollResult || pollEnded || hasVoted">
          <div v-for="(opt, idx) in poll.options" :key="idx" class="poll-option-result">
            <div class="poll-option-info-container">
@@ -29,16 +53,6 @@
          </div>
        </div>
        <div v-else>
-          <div class="poll-title-section">
-            <div class="poll-option-title" v-if="poll.multiple">多选</div>
-            <div class="poll-option-title" v-else>单选</div>
-
-            <div class="poll-left-time">
-              <stopwatch class="poll-left-time-icon" />
-              <div class="poll-left-time-title">离结束</div>
-              <div class="poll-left-time-value">{{ countdown }}</div>
-            </div>
-          </div>
          <template v-if="poll.multiple">
            <div
              v-for="(opt, idx) in poll.options"
@@ -103,11 +117,6 @@
      <div v-else-if="pollEnded" class="poll-option-hint"><stopwatch /> 投票已结束</div>
      <div v-else class="poll-option-hint">
        <div>您已投票，等待结束查看结果</div>
-        <div class="poll-left-time">
-          <stopwatch class="poll-left-time-icon" />
-          <div class="poll-left-time-title">离结束</div>
-          <div class="poll-left-time-value">{{ countdown }}</div>
-        </div>
      </div>
    </div>
  </div>
@@ -130,6 +139,9 @@ const emit = defineEmits(['refresh'])
 const loggedIn = computed(() => authState.loggedIn)
 const showPollResult = ref(false)

+const isProposal = computed(() =>
+  Object.prototype.hasOwnProperty.call(props.poll || {}, 'proposedName'),
+)
 const pollParticipants = computed(() => props.poll?.participants || [])
 const pollOptionParticipants = computed(() => props.poll?.optionParticipants || {})
 const pollVotes = computed(() => props.poll?.votes || {})
@@ -233,6 +245,34 @@ const submitMultiPoll = async () => {
  padding: 10px;
 }

+.proposal-info {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  padding: 8px 10px;
+  border-radius: 8px;
+  background-color: var(--background-color);
+  color: var(--text-color);
+}
+
+.proposal-name {
+  font-weight: 600;
+  font-size: 16px;
+}
+
+.proposal-status {
+  font-size: 14px;
+  opacity: 0.8;
+}
+
+.proposal-description {
+  font-size: 16px;
+  margin-top: 10px;
+  line-height: 1.5;
+  white-space: pre-wrap;
+  opacity: 0.8;
+}
+
 .poll-option-button {
  color: var(--text-color);
  padding: 5px 10px;
@@ -385,12 +425,20 @@ const submitMultiPoll = async () => {
 }

 .poll-title-section {
-  display: flex;
-  gap: 30px;
-  flex-direction: row;
  margin-bottom: 20px;
 }

+.poll-title-section-row {
+  display: flex;
+  align-items: center;
+  flex-direction: row;
+  gap: 30px;
+}
+
+.info-icon {
+  margin-right: 20px;
+}
+
 .poll-option-title {
  font-size: 18px;
  font-weight: bold;
--- a/frontend_nuxt/components/PostTypeSelect.vue
+++ b/frontend_nuxt/components/PostTypeSelect.vue
@@ -34,6 +34,7 @@ export default {
        { id: 'NORMAL', name: '普通帖子', icon: 'file-text' },
        { id: 'LOTTERY', name: '抽奖帖子', icon: 'gift' },
        { id: 'POLL', name: '投票帖子', icon: 'ranking-list' },
+        { id: 'PROPOSAL', name: '分类提案', icon: 'tag-one' },
      ]
    }

--- a/frontend_nuxt/components/ProposalForm.vue
+++ b/frontend_nuxt/components/ProposalForm.vue
@@ -0,0 +1,77 @@
+<template>
+  <div class="proposal-section">
+    <div class="proposal-row">
+      <span class="proposal-row-title rule">
+        <info-icon class="proposal-description-title-icon" />提案规则说明</span
+      >
+      <div class="proposal-description-content">
+        <p>📛 拟议分类名称需保持唯一，请勿与现有分类或正在提案中的名称重复。</p>
+        <p>📝 请在下方详细说明提案目的、预期价值及补充材料，方便大家快速理解。</p>
+        <p>🗳️ 提案提交后将开放 3 天投票，需达到至少 60% 的赞成率并满 10 人参与方可通过。</p>
+        <p>🤝 讨论请遵循社区守则，保持礼貌和善，欢迎附上相关案例或参考链接。</p>
+      </div>
+    </div>
+    <div class="proposal-row">
+      <span class="proposal-row-title">拟议分类名称</span>
+      <BaseInput v-model="data.proposedName" placeholder="请输入分类名称" />
+    </div>
+    <div class="proposal-row">
+      <span class="proposal-row-title">提案描述</span>
+      <BaseInput v-model="data.proposalDescription" placeholder="简要说明提案目的与理由" />
+    </div>
+  </div>
+</template>
+
+<script setup>
+import BaseInput from '~/components/BaseInput.vue'
+
+defineProps({
+  data: { type: Object, required: true },
+})
+</script>
+
+<style scoped>
+.proposal-section {
+  margin-top: 20px;
+  display: flex;
+  flex-direction: column;
+  gap: 20px;
+  margin-bottom: 200px;
+}
+
+.proposal-row-title {
+  font-size: 16px;
+  color: var(--text-color);
+  font-weight: bold;
+  margin-bottom: 10px;
+}
+
+.proposal-row-title.rule {
+  margin-bottom: 0;
+}
+
+.proposal-row {
+  display: flex;
+  flex-direction: column;
+}
+
+.proposal-activity {
+  margin-top: 20px;
+  padding: 20px;
+}
+
+.proposal-description-title-text {
+  font-size: 14px;
+  font-weight: bold;
+  margin-left: 5px;
+}
+
+.proposal-description-title-icon {
+  margin-right: 5px;
+}
+
+.proposal-description-content {
+  font-size: 12px;
+  opacity: 0.8;
+}
+</style>
--- a/frontend_nuxt/pages/index.vue
+++ b/frontend_nuxt/pages/index.vue
@@ -1,10 +1,5 @@
 <template>
  <div class="home-page">
-    <!-- <div v-if="!isMobile" class="search-container">
-      <div class="search-title">一切可能，从此刻启航，在此遇见灵感与共鸣</div>
-      <SearchDropdown />
-    </div> -->
-
    <div class="topic-container">
      <div class="topic-item-container">
        <div
@@ -72,6 +67,7 @@
              <pin v-if="article.pinned" theme="outline" class="pinned-icon" />
              <gift v-if="article.type === 'LOTTERY'" class="lottery-icon" />
              <ranking-list v-else-if="article.type === 'POLL'" class="poll-icon" />
+              <hands v-else-if="article.type === 'PROPOSAL'" class="proposal-icon" />
              <star v-if="!article.rssExcluded" class="featured-icon" />
              {{ article.title }}
            </NuxtLink>
@@ -116,7 +112,7 @@
      </div>
      <div v-else class="placeholder-container">分类浏览功能开发中，敬请期待。</div>

-      <!-- ✅ 通用“底部加载更多”组件（自管 loading/observer/并发） -->
+      <!-- 通用“底部加载更多”组件（自管 loading/observer/并发） -->
      <InfiniteLoadMore
        v-if="articles.length > 0"
        :key="ioKey"
@@ -572,6 +568,7 @@ watch([selectedCategory, selectedTags], ([newCategory, newTags]) => {
 .pinned-icon,
 .lottery-icon,
 .featured-icon,
+.proposal-icon,
 .poll-icon {
  margin-right: 4px;
  color: var(--primary-color);
--- a/frontend_nuxt/pages/message.vue
+++ b/frontend_nuxt/pages/message.vue
@@ -75,7 +75,9 @@
                          @click="markRead(item.id)"
                          :to="`/posts/${item.post.id}#comment-${item.parentComment.id}`"
                        >
-                          <span v-html="stripMarkdownWithTiebaMoji(item.parentComment.content, 500)"></span>
+                          <span
+                            v-html="stripMarkdownWithTiebaMoji(item.parentComment.content, 500)"
+                          ></span>
                        </NuxtLink>
                      </span>
                      回复了
@@ -85,7 +87,9 @@
                          @click="markRead(item.id)"
                          :to="`/posts/${item.post.id}#comment-${item.comment.id}`"
                        >
-                        <span v-html="stripMarkdownWithTiebaMoji(item.comment.content, 500)"></span>
+                          <span
+                            v-html="stripMarkdownWithTiebaMoji(item.comment.content, 500)"
+                          ></span>
                        </NuxtLink>
                      </span>
                    </NotificationContainer>
@@ -115,7 +119,9 @@
                          @click="markRead(item.id)"
                          :to="`/posts/${item.post.id}#comment-${item.comment.id}`"
                        >
-                        <span v-html="stripMarkdownWithTiebaMoji(item.comment.content, 500)"></span>
+                          <span
+                            v-html="stripMarkdownWithTiebaMoji(item.comment.content, 500)"
+                          ></span>
                        </NuxtLink>
                      </span>
                    </NotificationContainer>
@@ -162,7 +168,9 @@
                          @click="markRead(item.id)"
                          :to="`/posts/${item.post.id}#comment-${item.comment.id}`"
                        >
-                          <span v-html="stripMarkdownWithTiebaMoji(item.comment.content, 500)"></span>
+                          <span
+                            v-html="stripMarkdownWithTiebaMoji(item.comment.content, 500)"
+                          ></span>
                        </NuxtLink>
                      </span>
                      进行了表态
@@ -251,6 +259,38 @@
                      已出结果
                    </NotificationContainer>
                  </template>
+                  <template v-else-if="item.type === 'CATEGORY_PROPOSAL_RESULT_OWNER'">
+                    <NotificationContainer :item="item" :markRead="markRead">
+                      你的分类提案
+                      <NuxtLink
+                        class="notif-content-text"
+                        @click="markRead(item.id)"
+                        :to="`/posts/${item.post.id}`"
+                      >
+                        {{ stripMarkdownLength(item.post.title, 100) }}
+                      </NuxtLink>
+                      <span v-if="item.approved">已通过</span>
+                      <span v-else>
+                        未通过<span v-if="item.content">，原因：{{ item.content }}</span>
+                      </span>
+                    </NotificationContainer>
+                  </template>
+                  <template v-else-if="item.type === 'CATEGORY_PROPOSAL_RESULT_PARTICIPANT'">
+                    <NotificationContainer :item="item" :markRead="markRead">
+                      你参与的分类提案
+                      <NuxtLink
+                        class="notif-content-text"
+                        @click="markRead(item.id)"
+                        :to="`/posts/${item.post.id}`"
+                      >
+                        {{ stripMarkdownLength(item.post.title, 100) }}
+                      </NuxtLink>
+                      <span v-if="item.approved">已通过</span>
+                      <span v-else>
+                        未通过<span v-if="item.content">，原因：{{ item.content }}</span>
+                      </span>
+                    </NotificationContainer>
+                  </template>
                  <template v-else-if="item.type === 'POST_UPDATED'">
                    <NotificationContainer :item="item" :markRead="markRead">
                      您关注的帖子
@@ -287,7 +327,9 @@
                        @click="markRead(item.id)"
                        :to="`/posts/${item.post.id}#comment-${item.parentComment.id}`"
                      >
-                        <span v-html="stripMarkdownWithTiebaMoji(item.parentComment.content, 500)"></span>                      
+                        <span
+                          v-html="stripMarkdownWithTiebaMoji(item.parentComment.content, 500)"
+                        ></span>
                      </NuxtLink>
                      回复了
                      <NuxtLink
@@ -295,7 +337,7 @@
                        @click="markRead(item.id)"
                        :to="`/posts/${item.post.id}#comment-${item.comment.id}`"
                      >
-                        <span v-html="stripMarkdownWithTiebaMoji(item.comment.content, 500)"></span>                      
+                        <span v-html="stripMarkdownWithTiebaMoji(item.comment.content, 500)"></span>
                      </NuxtLink>
                    </NotificationContainer>
                  </template>
@@ -775,6 +817,10 @@ const formatType = (t) => {
      return '发布的投票结果已公布'
    case 'POLL_RESULT_PARTICIPANT':
      return '参与的投票结果已公布'
+    case 'CATEGORY_PROPOSAL_RESULT_OWNER':
+      return '分类提案结果已公布'
+    case 'CATEGORY_PROPOSAL_RESULT_PARTICIPANT':
+      return '参与的分类提案结果已公布'
    default:
      return t
  }
--- a/frontend_nuxt/pages/new-post.vue
+++ b/frontend_nuxt/pages/new-post.vue
@@ -38,6 +38,7 @@
      </div>
      <LotteryForm v-if="postType === 'LOTTERY'" :data="lottery" />
      <PollForm v-if="postType === 'POLL'" :data="poll" />
+      <ProposalForm v-if="postType === 'PROPOSAL'" :data="proposal" />
    </div>
  </div>
 </template>
@@ -51,6 +52,7 @@ import PostTypeSelect from '~/components/PostTypeSelect.vue'
 import TagSelect from '~/components/TagSelect.vue'
 import LotteryForm from '~/components/LotteryForm.vue'
 import PollForm from '~/components/PollForm.vue'
+import ProposalForm from '~/components/ProposalForm.vue'
 import { toast } from '~/main'
 import { authState, getToken } from '~/utils/auth'
 import PostVisibleScopeSelect from '~/components/PostVisibleScopeSelect.vue'
@@ -79,6 +81,10 @@ const poll = reactive({
  endTime: null,
  multiple: false,
 })
+const proposal = reactive({
+  proposedName: '',
+  proposalDescription: '',
+})
 const startTime = ref(null)
 const isWaitingPosting = ref(false)
 const isAiLoading = ref(false)
@@ -128,6 +134,8 @@ const clearPost = async () => {
  poll.options = ['', '']
  poll.endTime = null
  poll.multiple = false
+  proposal.proposedName = ''
+  proposal.proposalDescription = ''

  // 删除草稿
  const token = getToken()
@@ -289,6 +297,12 @@ const submitPost = async () => {
      return
    }
  }
+  if (postType.value === 'PROPOSAL') {
+    if (!proposal.proposedName.trim()) {
+      toast.error('请填写拟议分类名称')
+      return
+    }
+  }
  try {
    const token = getToken()
    await ensureTags(token)
@@ -309,37 +323,46 @@ const submitPost = async () => {
      }
      prizeIconUrl = uploadData.data.url
    }
+    const toUtcString = (value) => {
+      if (!value) return undefined
+      return new Date(new Date(value).getTime() + 8.02 * 60 * 60 * 1000).toISOString()
+    }
+
+    const payload = {
+      title: title.value,
+      content: content.value,
+      categoryId: selectedCategory.value,
+      tagIds: selectedTags.value,
+      type: postType.value,
+      postVisibleScopeType: postVisibleScope.value,
+    }
+
+    if (postType.value === 'LOTTERY') {
+      payload.prizeIcon = prizeIconUrl
+      payload.prizeName = lottery.prizeName
+      payload.prizeCount = lottery.prizeCount
+      payload.prizeDescription = lottery.prizeDescription
+      payload.pointCost = lottery.pointCost
+      payload.startTime = startTime.value ? new Date(startTime.value).toISOString() : undefined
+      payload.endTime = toUtcString(lottery.endTime)
+    } else if (postType.value === 'POLL') {
+      payload.options = poll.options
+      payload.multiple = poll.multiple
+      payload.endTime = toUtcString(poll.endTime)
+    } else if (postType.value === 'PROPOSAL') {
+      payload.proposedName = proposal.proposedName
+      payload.proposalDescription = proposal.proposalDescription
+    }
+
    const res = await fetch(`${API_BASE_URL}/api/posts`, {
      method: 'POST',
      headers: {
        'Content-Type': 'application/json',
        Authorization: `Bearer ${token}`,
      },
-      body: JSON.stringify({
-        title: title.value,
-        content: content.value,
-        categoryId: selectedCategory.value,
-        tagIds: selectedTags.value,
-        postVisibleScopeType: postVisibleScope.value,
-        type: postType.value,
-        prizeIcon: postType.value === 'LOTTERY' ? prizeIconUrl : undefined,
-        prizeName: postType.value === 'LOTTERY' ? lottery.prizeName : undefined,
-        prizeCount: postType.value === 'LOTTERY' ? lottery.prizeCount : undefined,
-        prizeDescription: postType.value === 'LOTTERY' ? lottery.prizeDescription : undefined,
-        options: postType.value === 'POLL' ? poll.options : undefined,
-        multiple: postType.value === 'POLL' ? poll.multiple : undefined,
-        startTime:
-          postType.value === 'LOTTERY' ? new Date(startTime.value).toISOString() : undefined,
-        pointCost: postType.value === 'LOTTERY' ? lottery.pointCost : undefined,
-        // 将时间转换为 UTC+8.5 时区 todo: 需要优化
-        endTime:
-          postType.value === 'LOTTERY'
-            ? new Date(new Date(lottery.endTime).getTime() + 8.02 * 60 * 60 * 1000).toISOString()
-            : postType.value === 'POLL'
-              ? new Date(new Date(poll.endTime).getTime() + 8.02 * 60 * 60 * 1000).toISOString()
-              : undefined,
-      }),
+      body: JSON.stringify(payload),
    })
+    
    const data = await res.json()
    if (res.ok) {
      if (data.reward && data.reward > 0) {
--- a/frontend_nuxt/plugins/iconpark.client.ts
+++ b/frontend_nuxt/plugins/iconpark.client.ts
@@ -81,6 +81,7 @@ import {
  CheckOne,
  Share,
  Financing,
+  Hands,
 } from '@icon-park/vue-next'

 export default defineNuxtPlugin((nuxtApp) => {
@@ -165,4 +166,5 @@ export default defineNuxtPlugin((nuxtApp) => {
  nuxtApp.vueApp.component('CheckOne', CheckOne)
  nuxtApp.vueApp.component('Share', Share)
  nuxtApp.vueApp.component('Financing', Financing)
+  nuxtApp.vueApp.component('Hands', Hands)
 })
--- a/frontend_nuxt/utils/notification.js
+++ b/frontend_nuxt/utils/notification.js
@@ -28,6 +28,8 @@ const iconMap = {
  POLL_VOTE: 'ChartHistogram',
  POLL_RESULT_OWNER: 'RankingList',
  POLL_RESULT_PARTICIPANT: 'ChartLine',
+  CATEGORY_PROPOSAL_RESULT_OWNER: 'TagOne',
+  CATEGORY_PROPOSAL_RESULT_PARTICIPANT: 'TagOne',
  MENTION: 'HashtagKey',
  POST_DELETED: 'ClearIcon',
  POST_FEATURED: 'Star',
@@ -254,7 +256,9 @@ function createFetchNotifications() {
        } else if (
          n.type === 'POLL_VOTE' ||
          n.type === 'POLL_RESULT_OWNER' ||
-          n.type === 'POLL_RESULT_PARTICIPANT'
+          n.type === 'POLL_RESULT_PARTICIPANT' ||
+          n.type === 'CATEGORY_PROPOSAL_RESULT_OWNER' ||
+          n.type === 'CATEGORY_PROPOSAL_RESULT_PARTICIPANT'
        ) {
          arr.push({
            ...n,