mirror of
https://github.com/ialley-workshop-open/uni-halo.git
synced 2026-11-13 22:11:42 +08:00
feat: 新增文章投票功能,优化多项页面细节
1. 新增文章详情页投票组件,支持投票插件检查、展开收起 2. 新增下划线文本、投票卡片、投票列表页组件 3. 优化自定义tabbar样式与返回逻辑 4. 更新投票工具类与投票详情页逻辑 5. 优化公告详情页样式与功能 6. 修复部分样式与类型定义问题
This commit is contained in:
@@ -456,6 +456,11 @@
|
||||
})
|
||||
|
||||
const globalAppSettings = computed(() => settingStore.settings)
|
||||
|
||||
onMounted(() => {
|
||||
console.log('获取当前所有的页面')
|
||||
console.log(getCurrentPages())
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
@@ -566,6 +571,9 @@
|
||||
</template>
|
||||
</view>
|
||||
|
||||
<!-- 相关投票(容器内置插件检查/展开收起,无数据或插件未激活自动不渲染) -->
|
||||
<uh-article-vote :vote-ids="result?._voteIds || []" />
|
||||
|
||||
<view class="box-border px-1">
|
||||
<!-- 版权声明 -->
|
||||
<view v-if="postDetailConfig?.copyrightEnabled" class="box-border px-2 mb-3">
|
||||
|
||||
+116
-133
@@ -1,154 +1,137 @@
|
||||
<script lang="ts" setup>
|
||||
/**
|
||||
/**
|
||||
* 公告详情页(plugin-uni-halo 通知公告,2026-09-03 客户端接入)
|
||||
* 公开 GET /notices/{name} 返回完整 Notice extension(metadata+spec,spec 内嵌
|
||||
* typeDisplayName/typeColor);正文 content 为富文本 HTML,mp-html 渲染。
|
||||
* 不存在/删除中返回 404 → 空态提示。UIUX 见 .docs/notice-module-client-design.md
|
||||
*/
|
||||
import { computed, ref } from 'vue'
|
||||
import { onLoad } from '@dcloudio/uni-app'
|
||||
import { getNoticeDetail } from '@/api/uni-halo'
|
||||
import { DataLoadingStatusEnum, useDataLoadingStatus } from '@/hooks/useDataLoadingStatus'
|
||||
import { checkIsUrl } from '@/utils/url'
|
||||
import { markdownConfig } from '@/config/markdown'
|
||||
import type { INoticeDetail } from '@/api/types/uni-halo'
|
||||
import { computed, ref } from 'vue'
|
||||
import { onLoad } from '@dcloudio/uni-app'
|
||||
import { getNoticeDetail } from '@/api/uni-halo'
|
||||
import { DataLoadingStatusEnum, useDataLoadingStatus } from '@/hooks/useDataLoadingStatus'
|
||||
import { checkImageUrl, checkIsUrl } from '@/utils/url'
|
||||
import { markdownConfig } from '@/config/markdown'
|
||||
import type { INoticeDetail } from '@/api/types/uni-halo'
|
||||
|
||||
definePage({
|
||||
style: {
|
||||
navigationBarTitleText: '公告详情',
|
||||
navigationStyle: 'custom',
|
||||
},
|
||||
})
|
||||
definePage({
|
||||
style: {
|
||||
navigationBarTitleText: '公告详情',
|
||||
navigationStyle: 'custom',
|
||||
},
|
||||
})
|
||||
|
||||
const { loadingStatus, updateLoadingStatus } = useDataLoadingStatus()
|
||||
const name = ref('')
|
||||
const detail = ref<INoticeDetail | null>(null)
|
||||
const { loadingStatus, updateLoadingStatus } = useDataLoadingStatus()
|
||||
const name = ref('')
|
||||
const detail = ref<INoticeDetail | null>(null)
|
||||
|
||||
const spec = computed(() => detail.value?.spec)
|
||||
const content = computed(() => spec.value?.content || '')
|
||||
const title = computed(() => spec.value?.title || '')
|
||||
const typeColor = computed(() => spec.value?.typeColor || '')
|
||||
const typeDisplayName = computed(() => spec.value?.typeDisplayName || '')
|
||||
const cover = computed(() => spec.value?.cover || '')
|
||||
const publishTime = computed(() => formatDate(spec.value?.publishTime))
|
||||
const hasLink = computed(() => !!spec.value?.link && checkIsUrl(spec.value?.link || ''))
|
||||
const spec = computed(() => detail.value?.spec)
|
||||
const content = computed(() => spec.value?.content || '')
|
||||
const title = computed(() => spec.value?.title || '')
|
||||
const typeColor = computed(() => spec.value?.typeColor || '')
|
||||
const typeDisplayName = computed(() => spec.value?.typeDisplayName || '')
|
||||
/** 封面图:相对路径(如 /upload/...)经 checkImageUrl 补全为完整地址后再渲染 */
|
||||
const cover = computed(() => {
|
||||
const raw = spec.value?.cover || ''
|
||||
return raw ? checkImageUrl(raw) : ''
|
||||
})
|
||||
const publishTime = computed(() => formatDate(spec.value?.publishTime))
|
||||
const hasLink = computed(() => !!spec.value?.link && checkIsUrl(spec.value?.link || ''))
|
||||
|
||||
function formatDate(value?: string): string {
|
||||
if (!value)
|
||||
return ''
|
||||
const date = new Date(value)
|
||||
if (Number.isNaN(date.getTime()))
|
||||
return ''
|
||||
const pad = (n: number) => String(n).padStart(2, '0')
|
||||
return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}`
|
||||
}
|
||||
function formatDate(value ?: string) : string {
|
||||
if (!value) { return '' }
|
||||
const date = new Date(value)
|
||||
if (Number.isNaN(date.getTime())) { return '' }
|
||||
const pad = (n : number) => String(n).padStart(2, '0')
|
||||
return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}`
|
||||
}
|
||||
|
||||
function handleToExternal() {
|
||||
if (!spec.value?.link)
|
||||
return
|
||||
uni.navigateTo({
|
||||
url: `/pages-blog/website/website?data=${JSON.stringify({
|
||||
title: title.value || '公告原文',
|
||||
url: encodeURIComponent(spec.value.link),
|
||||
})}`,
|
||||
})
|
||||
}
|
||||
function handleCopy() {
|
||||
if (!spec.value?.link) { return }
|
||||
uni.setClipboardData({
|
||||
data: `${title.value} ${spec.value.link}`,
|
||||
success: () => {
|
||||
uni.showToast({
|
||||
title: '复制成功',
|
||||
icon: 'none',
|
||||
})
|
||||
},
|
||||
fail: () => {
|
||||
uni.showToast({
|
||||
title: '复制失败',
|
||||
icon: 'none',
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
/** 加载公告详情(状态机;404/无数据 → 空态,其余错误 → error 态,可重试) */
|
||||
async function loadDetail() {
|
||||
updateLoadingStatus(DataLoadingStatusEnum.Loading)
|
||||
if (!name.value) {
|
||||
updateLoadingStatus(DataLoadingStatusEnum.Empty)
|
||||
return
|
||||
}
|
||||
try {
|
||||
const res = await getNoticeDetail(name.value)
|
||||
detail.value = res.data || null
|
||||
updateLoadingStatus(
|
||||
detail.value?.spec ? DataLoadingStatusEnum.Success : DataLoadingStatusEnum.Empty,
|
||||
)
|
||||
}
|
||||
catch (err) {
|
||||
console.error('公告详情加载失败', err)
|
||||
const code = (err as { code?: number }).code
|
||||
updateLoadingStatus(code === 404 ? DataLoadingStatusEnum.Empty : DataLoadingStatusEnum.Error)
|
||||
}
|
||||
}
|
||||
/** 加载公告详情(状态机;404/无数据 → 空态,其余错误 → error 态,可重试) */
|
||||
async function loadDetail() {
|
||||
updateLoadingStatus(DataLoadingStatusEnum.Loading)
|
||||
if (!name.value) {
|
||||
updateLoadingStatus(DataLoadingStatusEnum.Empty)
|
||||
return
|
||||
}
|
||||
try {
|
||||
const res = await getNoticeDetail(name.value)
|
||||
detail.value = res.data || null
|
||||
updateLoadingStatus(
|
||||
detail.value?.spec ? DataLoadingStatusEnum.Success : DataLoadingStatusEnum.Empty,
|
||||
)
|
||||
}
|
||||
catch (err) {
|
||||
console.error('公告详情加载失败', err)
|
||||
const code = (err as { code ?: number }).code
|
||||
updateLoadingStatus(code === 404 ? DataLoadingStatusEnum.Empty : DataLoadingStatusEnum.Error)
|
||||
}
|
||||
}
|
||||
|
||||
onLoad((options) => {
|
||||
name.value = options?.name || ''
|
||||
loadDetail()
|
||||
})
|
||||
onLoad((options) => {
|
||||
name.value = options?.name || ''
|
||||
loadDetail()
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<view class="notice-detail min-h-screen w-screen bg-white pb-12">
|
||||
<!-- 自定义导航 -->
|
||||
<uh-navbar default-title="公告详情" title-color="text-gray-900" />
|
||||
<view class="box-border min-h-screen w-screen bg-page pb-safe">
|
||||
<!-- 自定义导航 -->
|
||||
<uh-navbar default-title="公告详情" title-color="text-gray-900" />
|
||||
|
||||
<!-- 加载/错误/空态(状态机) -->
|
||||
<uh-data-loading
|
||||
v-if="loadingStatus !== 'success'" :loading-status="loadingStatus" min-height="55vh"
|
||||
error-text="公告加载失败" empty-text="公告不存在或已下线" empty-sub-text=""
|
||||
@refresh="loadDetail"
|
||||
/>
|
||||
<!-- 加载/错误/空态(状态机) -->
|
||||
<uh-data-loading v-if="loadingStatus !== 'success'" :loading-status="loadingStatus" min-height="55vh"
|
||||
error-text="公告加载失败" empty-text="公告不存在或已下线" empty-sub-text="" @refresh="loadDetail" />
|
||||
|
||||
<!-- 正文 -->
|
||||
<view v-else class="px-6 py-6">
|
||||
<image
|
||||
v-if="cover"
|
||||
class="mb-5 h-[320rpx] w-full rounded-xl"
|
||||
:src="cover"
|
||||
mode="aspectFill"
|
||||
/>
|
||||
<view class="text-[36rpx] font-bold leading-snug text-[#222]">
|
||||
{{ title }}
|
||||
</view>
|
||||
<!-- 正文 -->
|
||||
<view v-else class="box-border p-4">
|
||||
<image v-if="cover" class="mb-5 h-[320rpx] w-full rounded-xl" :src="cover" mode="aspectFill" />
|
||||
<view class="text-[36rpx] font-bold leading-snug text-gray-900">
|
||||
{{ title }}
|
||||
</view>
|
||||
|
||||
<view class="mt-3 flex items-center gap-2">
|
||||
<view
|
||||
v-if="typeDisplayName"
|
||||
class="rounded px-2 py-0.5 text-[20rpx]"
|
||||
:style="{
|
||||
color: typeColor || '#f83856',
|
||||
backgroundColor: typeColor ? `${typeColor}1a` : '#fdeef1',
|
||||
}"
|
||||
>
|
||||
{{ typeDisplayName }}
|
||||
</view>
|
||||
<text class="text-[22rpx] text-[#bbb]">
|
||||
{{ publishTime }}
|
||||
</text>
|
||||
</view>
|
||||
<view class="mt-3 flex items-center gap-2">
|
||||
<view v-if="typeDisplayName" class="rounded px-2 py-0.5 text-[20rpx]" :style="{
|
||||
color: typeColor || '#f83856',
|
||||
backgroundColor: typeColor ? `${typeColor}1a` : '#fdeef1',
|
||||
}">
|
||||
{{ typeDisplayName }}
|
||||
</view>
|
||||
<text class="text-[22rpx] text-gray-500">
|
||||
{{ publishTime }}
|
||||
</text>
|
||||
</view>
|
||||
|
||||
<view class="mt-4 border-t border-[#f0f0f0] pt-5">
|
||||
<mp-html
|
||||
:content="content"
|
||||
lazy-load
|
||||
:domain="markdownConfig.domain ?? ''"
|
||||
scroll-table
|
||||
selectable
|
||||
:tag-style="markdownConfig.tagStyle"
|
||||
:container-style="markdownConfig.containStyle"
|
||||
:show-line-number="false"
|
||||
copy-by-long-press
|
||||
/>
|
||||
</view>
|
||||
<view class="box-border w-full mt-2 pt-4 pb-6">
|
||||
<mp-html :content="content" lazy-load :domain="markdownConfig.domain ?? ''" scroll-table selectable
|
||||
:tag-style="markdownConfig.tagStyle" :container-style="markdownConfig.containStyle"
|
||||
:show-line-number="false" copy-by-long-press />
|
||||
</view>
|
||||
|
||||
<view v-if="hasLink" class="mt-10">
|
||||
<wd-button type="primary" block round @click="handleToExternal">
|
||||
查看原文 ↗
|
||||
</wd-button>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.notice-detail {
|
||||
:deep(img) {
|
||||
max-width: 100%;
|
||||
border-radius: 8rpx;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
<view v-if="hasLink" class="fixed left-0 right-0 bottom-0 pb-safe px-4 box-border">
|
||||
<view class="w-full h-full uh-global-card-glass border rounded-full mb-4">
|
||||
<uh-button custom-class="w-full !rounded-full py-2.5 font-medium" @click="handleCopy">
|
||||
复制原文地址
|
||||
</uh-button>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -7,7 +7,7 @@ import { computed, ref } from 'vue'
|
||||
import { onLoad, onPullDownRefresh, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app'
|
||||
import { getVoteDetail, submitVote } from '@/api/uni-halo'
|
||||
import { DataLoadingStatusEnum, useDataLoadingStatus } from '@/hooks/useDataLoadingStatus'
|
||||
import { calcVotePercent, VOTE_TYPES, voteCacheUtil } from '@/utils/vote'
|
||||
import { calcVotePercent, calcVoteState, VOTE_TYPES, voteCacheUtil } from '@/utils/vote'
|
||||
import { formatTime as formatTimeUtil } from '@/utils/formatTime'
|
||||
import type { IVote, IVoteDetail, IVoteOption } from '@/api/types/uni-halo'
|
||||
|
||||
@@ -85,27 +85,17 @@ async function handleGetData() {
|
||||
const detailRes = res.data as IVoteDetail
|
||||
const tempVote = detailRes.vote as typeof vote.value
|
||||
if (tempVote) {
|
||||
const typeKey = ((tempVote.spec?.type || 'SINGLE') as string).toUpperCase()
|
||||
pageTitle.value = `投票详情(${VOTE_TYPES[typeKey as keyof typeof VOTE_TYPES] || tempVote.spec?.type})`
|
||||
const typeKey = ((tempVote.spec?.type || 'single') as string).toLowerCase()
|
||||
pageTitle.value = `投票详情(${VOTE_TYPES[typeKey] || tempVote.spec?.type})`
|
||||
tempVote.spec = tempVote.spec || {}
|
||||
tempVote.spec.isVoted = isVoted.value
|
||||
tempVote.spec.disabled = isVoted.value
|
||||
tempVote.spec._uh_type = VOTE_TYPES[typeKey as keyof typeof VOTE_TYPES] || tempVote.spec.type
|
||||
tempVote.spec._uh_type = VOTE_TYPES[typeKey] || tempVote.spec.type
|
||||
|
||||
// 计算状态
|
||||
const startTime = tempVote.spec.startDate ? new Date(tempVote.spec.startDate).getTime() : Date.now()
|
||||
const endTime = tempVote.spec.endDate ? new Date(tempVote.spec.endDate).getTime() : Date.now()
|
||||
const now = Date.now()
|
||||
if (endTime < now) {
|
||||
tempVote.spec._uh_state = { state: '已结束', color: 'red' }
|
||||
// 计算状态(与旧项目 calcVoteState 一致,含 timeLimit 非 custom 时 hasEnded 兜底)
|
||||
tempVote.spec._uh_state = calcVoteState(tempVote)
|
||||
if (tempVote.spec._uh_state.state === '已结束')
|
||||
tempVote.spec.hasEnded = true
|
||||
}
|
||||
else if (startTime > now) {
|
||||
tempVote.spec._uh_state = { state: '未开始', color: 'orange' }
|
||||
}
|
||||
else {
|
||||
tempVote.spec._uh_state = { state: '进行中', color: 'green' }
|
||||
}
|
||||
|
||||
// 选项计算
|
||||
// 插件选项为 {id,title},票数在 VoteDetail.voteDataList / Vote.stats.voteDataList
|
||||
@@ -272,7 +262,7 @@ onShareTimeline(() => ({
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<view class="app-page box-border min-h-screen w-screen flex flex-col pb-[160rpx]" style="background-color: #fafafd;">
|
||||
<view class="app-page box-border min-h-screen w-screen flex flex-col bg-page pb-[160rpx]">
|
||||
<!-- 自定义导航 -->
|
||||
<uh-navbar :default-title="pageTitle" title-color="text-gray-900" />
|
||||
|
||||
@@ -288,11 +278,11 @@ onShareTimeline(() => ({
|
||||
<block v-else>
|
||||
<template v-if="vote">
|
||||
<!-- 投票信息 -->
|
||||
<view class="vote-card mx-6 mb-6 flex flex-col overflow-hidden rounded-xl bg-white p-6 shadow-sm">
|
||||
<view class="uh-global-card-glass box-border mx-6 mb-6 flex flex-col rounded-2xl p-6">
|
||||
<view class="sub-title relative box-border pl-6 text-[30rpx]">
|
||||
投票信息
|
||||
</view>
|
||||
<view class="vote-card-body flex flex-col gap-3 rounded-xl bg-[#f3f4f6] p-6 text-[28rpx] text-[#3f3f3f]">
|
||||
<view class="vote-card-body mt-3 flex flex-col gap-3 rounded-xl bg-page p-6 text-[28rpx] text-[#3f3f3f]">
|
||||
<view class="info-row">
|
||||
<text>投票类型:</text>
|
||||
<text class="tag">{{ vote.spec?._uh_type }}</text>
|
||||
@@ -303,7 +293,7 @@ onShareTimeline(() => ({
|
||||
</view>
|
||||
<view class="info-row">
|
||||
<text>投票方式:</text>
|
||||
<text class="tag" :class="vote.spec?.canAnonymously ? 'text-[#03a9f4]' : 'text-[#f44336]'">
|
||||
<text class="tag" :class="vote.spec?.canAnonymously ? 'text-primary' : 'text-[#f44336]'">
|
||||
{{ vote.spec?.canAnonymously ? '匿名' : '不匿名' }}
|
||||
</text>
|
||||
</view>
|
||||
@@ -318,7 +308,7 @@ onShareTimeline(() => ({
|
||||
</view>
|
||||
|
||||
<!-- 投票内容 -->
|
||||
<view class="vote-card mx-6 mb-6 flex flex-col overflow-hidden rounded-xl bg-white p-6 shadow-sm">
|
||||
<view class="uh-global-card-glass box-border mx-6 mb-6 flex flex-col rounded-2xl p-6">
|
||||
<view class="sub-title relative box-border pl-6 text-[30rpx]">
|
||||
投票内容
|
||||
</view>
|
||||
@@ -333,18 +323,33 @@ onShareTimeline(() => ({
|
||||
<text v-if="vote.spec?.type === 'multiple'" class="sub-title-count text-[24rpx] font-normal">(最多选择 {{ vote.spec?.maxVotes }} 项)</text>
|
||||
</view>
|
||||
<view class="options mt-6 flex flex-col gap-4">
|
||||
<!-- PK 对抗条(与旧项目 pk-container 一致) -->
|
||||
<view v-if="vote.spec?.type === 'pk'" class="pk-container box-border flex w-full">
|
||||
<view
|
||||
v-for="(option, optionIndex) in vote.spec?.options"
|
||||
:key="optionIndex"
|
||||
class="radio-item flex-grow"
|
||||
:class="optionIndex === 0 ? 'radio-left' : 'radio-right'"
|
||||
:style="{ width: `${option._uh_percent}%` }"
|
||||
>
|
||||
<view class="option-item box-border w-full rounded-xl p-6" :class="optionIndex === 0 ? 'option-item-left' : 'option-item-right'">
|
||||
{{ option._uh_percent }}%
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<template v-if="isVoted || isEnded">
|
||||
<view
|
||||
v-for="(option, optionIndex) in vote.spec?.options"
|
||||
:key="optionIndex"
|
||||
class="is-voted-item relative box-border min-h-[72rpx] overflow-hidden rounded-xl text-[24rpx]"
|
||||
:class="option.checked ? 'bg-[#03a9f4]/35 text-white' : 'bg-[#e5e5e5]/75'"
|
||||
:class="option.checked ? 'bg-primary/40 text-[#4d7c0f] font-bold' : 'bg-[#e5e5e5]/75'"
|
||||
:style="{ '--percent': `${option._uh_percent}%` }"
|
||||
>
|
||||
<view class="is-voted-item-content relative z-2 box-border min-h-[72rpx] px-6 py-3">
|
||||
<view class="flex items-center justify-between">
|
||||
<view class="flex-1 text-left">
|
||||
{{ option.title }}
|
||||
{{ vote.spec?.type === 'pk' ? `选项${optionIndex + 1}:` : '' }}{{ option.title }}
|
||||
</view>
|
||||
<view class="shrink-0">
|
||||
{{ option._uh_percent }}%
|
||||
@@ -358,7 +363,7 @@ onShareTimeline(() => ({
|
||||
v-for="(option, optionIndex) in vote.spec?.options"
|
||||
:key="optionIndex"
|
||||
class="vote-select-option box-border rounded-xl bg-[#f3f4f6] px-6 py-5 text-[24rpx]"
|
||||
:class="option.checked ? 'border-2 border-[#03a9f4] bg-[#03a9f4]/15 text-[#03a9f4]' : ''"
|
||||
:class="option.checked ? 'border-2 border-primary bg-primary/15 text-primary font-bold' : ''"
|
||||
@click="vote.spec?.type === 'multiple' ? handleSelectCheckboxOption(option) : handleSelectSingleOption(option)"
|
||||
>
|
||||
{{ vote.spec?.type === 'pk' ? `选项${optionIndex + 1}:` : '' }}{{ option.title }}
|
||||
@@ -368,7 +373,7 @@ onShareTimeline(() => ({
|
||||
</view>
|
||||
|
||||
<!-- 投票统计 -->
|
||||
<view class="vote-card mx-6 mb-6 flex flex-col overflow-hidden rounded-xl bg-white p-6 shadow-sm">
|
||||
<view class="uh-global-card-glass box-border mx-6 mb-6 flex flex-col rounded-2xl p-6">
|
||||
<view class="sub-title relative box-border pl-6 text-[30rpx]">
|
||||
投票统计
|
||||
</view>
|
||||
@@ -378,7 +383,7 @@ onShareTimeline(() => ({
|
||||
</view>
|
||||
|
||||
<!-- 提交按钮 -->
|
||||
<view class="vote-submit fixed bottom-0 left-0 z-99 box-border w-screen border-t-2 border-[#eee] bg-white/98 px-9 py-6 shadow-sm" :style="{ paddingBottom: `${safeAreaBottom}rpx` }">
|
||||
<view class="vote-submit fixed bottom-0 left-0 z-99 box-border w-screen border-t border-black/5 bg-white/90 px-9 py-6 shadow-sm backdrop-blur" :style="{ paddingBottom: `${safeAreaBottom}rpx` }">
|
||||
<wd-button v-if="isVoted" disabled block>
|
||||
您已参与投票
|
||||
</wd-button>
|
||||
@@ -413,7 +418,7 @@ onShareTimeline(() => ({
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 6rpx;
|
||||
background: #03a9f4;
|
||||
background: var(--wot-color-theme, #b9e424);
|
||||
border-radius: 6rpx;
|
||||
}
|
||||
}
|
||||
@@ -431,5 +436,25 @@ onShareTimeline(() => ({
|
||||
border-radius: 6rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.pk-container {
|
||||
.radio-item {
|
||||
min-width: 30%;
|
||||
max-width: 70%;
|
||||
}
|
||||
|
||||
.option-item-left {
|
||||
background: linear-gradient(90deg, #3b82f6, #60a5fa);
|
||||
color: white;
|
||||
clip-path: polygon(0 0, calc(100% - 40rpx) 0, 100% 100%, 0 100%);
|
||||
}
|
||||
|
||||
.option-item-right {
|
||||
background: linear-gradient(90deg, #f87171, #ef4444);
|
||||
color: white;
|
||||
clip-path: polygon(0 0, 100% 0, 100% 100%, 40rpx 100%);
|
||||
text-align: right;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
+219
-10
@@ -1,7 +1,7 @@
|
||||
<script lang="ts" setup>
|
||||
/**
|
||||
* 投票列表页(源自旧项目 pagesA/votes,新建复刻)
|
||||
* 展示投票列表,每个投票项用 uh-vote-card 渲染
|
||||
* 展示投票列表,支持搜索 + 类型/状态/排序/是否已投筛选,每个投票项用 uh-vote-card 渲染
|
||||
*/
|
||||
import { computed, ref } from 'vue'
|
||||
import { onLoad, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
|
||||
@@ -9,6 +9,8 @@ import { getVoteList } from '@/api/uni-halo'
|
||||
import { DataLoadingStatusEnum, useDataLoadingStatus } from '@/hooks/useDataLoadingStatus'
|
||||
import { NeedPluginIds } from '@/hooks/usePluginAvailable'
|
||||
import { useAppConfigStore } from '@/store/appConfig'
|
||||
import { debounce } from '@/utils/debounce'
|
||||
import { calcVoteState, VOTE_TYPES, voteCacheUtil } from '@/utils/vote'
|
||||
import type { IVoteItem } from '@/api/types/uni-halo'
|
||||
|
||||
definePage({
|
||||
@@ -38,10 +40,129 @@ async function handlePluginRefresh() {
|
||||
const { loadingStatus, updateLoadingStatus } = useDataLoadingStatus()
|
||||
const dataList = ref<IVoteItem[]>([])
|
||||
const hasNext = ref(false)
|
||||
const queryParams = ref({ page: 1, size: 10 })
|
||||
const isLoadMore = ref(false)
|
||||
const loadMoreText = ref('加载中...')
|
||||
/** 是否已投过滤(前端过滤,接口无此参数) */
|
||||
const filterIsVoted = ref<boolean | undefined>(undefined)
|
||||
const queryParams = ref<Record<string, unknown>>({
|
||||
keyword: '',
|
||||
page: 1,
|
||||
size: 10,
|
||||
sort: undefined,
|
||||
type: undefined,
|
||||
hasEnded: undefined,
|
||||
})
|
||||
|
||||
/* ---------------- 筛选 ---------------- */
|
||||
interface IFilterOption {
|
||||
label: string
|
||||
value: string
|
||||
}
|
||||
|
||||
interface IFilterItem {
|
||||
key: 'type' | 'hasEnded' | 'sort' | 'isVoted'
|
||||
label: string
|
||||
options: IFilterOption[]
|
||||
}
|
||||
|
||||
/** 筛选维度(与旧项目 tm-dropDownMenu 一致) */
|
||||
const filterConfig: IFilterItem[] = [
|
||||
{
|
||||
key: 'type',
|
||||
label: '类型',
|
||||
options: [
|
||||
{ label: '全部', value: '' },
|
||||
{ label: '单选', value: 'single' },
|
||||
{ label: '多选', value: 'multiple' },
|
||||
{ label: '双选PK', value: 'pk' },
|
||||
],
|
||||
},
|
||||
{
|
||||
key: 'hasEnded',
|
||||
label: '状态',
|
||||
options: [
|
||||
{ label: '全部', value: '' },
|
||||
{ label: '进行中', value: 'false' },
|
||||
{ label: '已结束', value: 'true' },
|
||||
],
|
||||
},
|
||||
{
|
||||
key: 'sort',
|
||||
label: '排序',
|
||||
options: [
|
||||
{ label: '默认排序', value: '' },
|
||||
{ label: '较近创建', value: 'metadata.creationTimestamp,desc' },
|
||||
{ label: '较早创建', value: 'metadata.creationTimestamp,asc' },
|
||||
],
|
||||
},
|
||||
{
|
||||
key: 'isVoted',
|
||||
label: '是否已投',
|
||||
options: [
|
||||
{ label: '全部', value: '' },
|
||||
{ label: '未投票', value: 'false' },
|
||||
{ label: '已投票', value: 'true' },
|
||||
],
|
||||
},
|
||||
]
|
||||
|
||||
/** 各维度当前选中值(空串 = 全部) */
|
||||
const filterValues = ref<Record<string, string>>({ type: '', hasEnded: '', sort: '', isVoted: '' })
|
||||
|
||||
/** 当前选中中文标签(用于筛选栏展示) */
|
||||
const filterLabels = computed(() => {
|
||||
const map: Record<string, string> = {}
|
||||
for (const f of filterConfig) {
|
||||
const cur = filterValues.value[f.key]
|
||||
map[f.key] = f.options.find(o => o.value === cur)?.label || '全部'
|
||||
}
|
||||
return map
|
||||
})
|
||||
|
||||
/** 筛选弹层 */
|
||||
const filterPopup = ref<{ show: boolean, item: IFilterItem | null }>({ show: false, item: null })
|
||||
|
||||
function handleOpenFilter(item: IFilterItem) {
|
||||
filterPopup.value = { show: true, item }
|
||||
}
|
||||
|
||||
function handleSelectFilter(option: IFilterOption) {
|
||||
const item = filterPopup.value.item
|
||||
if (!item)
|
||||
return
|
||||
filterValues.value[item.key] = option.value
|
||||
filterPopup.value.show = false
|
||||
|
||||
if (item.key === 'isVoted') {
|
||||
filterIsVoted.value = option.value === '' ? undefined : option.value === 'true'
|
||||
}
|
||||
else if (item.key === 'hasEnded') {
|
||||
queryParams.value.hasEnded = option.value === '' ? undefined : option.value === 'true'
|
||||
}
|
||||
else {
|
||||
queryParams.value[item.key] = option.value === '' ? undefined : option.value
|
||||
}
|
||||
|
||||
queryParams.value.page = 1
|
||||
isLoadMore.value = false
|
||||
handleGetData()
|
||||
}
|
||||
|
||||
/* ---------------- 搜索 ---------------- */
|
||||
/** 实时搜索:输入防抖 400ms 后触发(对应旧版 tm-search 的 @input) */
|
||||
const handleOnInput = debounce(() => {
|
||||
queryParams.value.page = 1
|
||||
isLoadMore.value = false
|
||||
handleGetData()
|
||||
}, 400)
|
||||
|
||||
function handleOnSearch() {
|
||||
queryParams.value.page = 1
|
||||
isLoadMore.value = false
|
||||
handleGetData()
|
||||
}
|
||||
|
||||
/* ---------------- 数据加载 ---------------- */
|
||||
async function handleGetData() {
|
||||
if (calcAuditModeEnabled.value) {
|
||||
updateLoadingStatus(
|
||||
@@ -61,9 +182,31 @@ async function handleGetData() {
|
||||
try {
|
||||
const res = await getVoteList({ ...queryParams.value })
|
||||
hasNext.value = res.data.hasNext || false
|
||||
|
||||
// 加工列表数据(与旧项目一致):isVoted/_uh_state/_uh_type
|
||||
const tempItems = res.data.items.map((item) => {
|
||||
item.spec = item.spec || {}
|
||||
item.spec.disabled = true
|
||||
item.spec.isVoted = voteCacheUtil.has(item.metadata?.name || '')
|
||||
item.spec._uh_state = calcVoteState(item)
|
||||
item.spec._uh_type = VOTE_TYPES[item.spec.type || ''] || item.spec.type
|
||||
return item
|
||||
})
|
||||
|
||||
dataList.value = isLoadMore.value
|
||||
? dataList.value.concat(res.data.items)
|
||||
: res.data.items
|
||||
? dataList.value.concat(tempItems)
|
||||
: tempItems
|
||||
|
||||
// 未投优先排序(与旧项目一致)
|
||||
dataList.value = dataList.value.sort((a, b) => {
|
||||
return Number(a.spec?.isVoted) - Number(b.spec?.isVoted)
|
||||
})
|
||||
|
||||
// 是否已投过滤(与旧项目一致)
|
||||
if (filterIsVoted.value !== undefined) {
|
||||
dataList.value = dataList.value.filter(x => x.spec?.isVoted === filterIsVoted.value)
|
||||
}
|
||||
|
||||
updateLoadingStatus(
|
||||
dataList.value.length === 0 ? DataLoadingStatusEnum.Empty : DataLoadingStatusEnum.Success,
|
||||
)
|
||||
@@ -82,8 +225,14 @@ async function handleGetData() {
|
||||
}
|
||||
}
|
||||
|
||||
function handleOnVoteSuccess() {
|
||||
uni.showToast({ icon: 'none', title: '投票成功!' })
|
||||
/** 卡片点击跳详情(与旧项目 VoteCard @on-click 一致) */
|
||||
function handleOnVoteClick(vote: IVoteItem) {
|
||||
const name = vote.metadata?.name
|
||||
if (!name)
|
||||
return
|
||||
uni.navigateTo({
|
||||
url: `/pages-blog/vote-detail/vote-detail?name=${name}`,
|
||||
})
|
||||
}
|
||||
|
||||
function handleToTopPage(duration = 500) {
|
||||
@@ -119,8 +268,12 @@ onPullDownRefresh(() => {
|
||||
onReachBottom(() => {
|
||||
if (!uniHaloPluginAvailable.value)
|
||||
return
|
||||
if (calcAuditModeEnabled.value) {
|
||||
uni.showToast({ icon: 'none', title: '没有更多数据了' })
|
||||
return
|
||||
}
|
||||
if (hasNext.value) {
|
||||
queryParams.value.page += 1
|
||||
queryParams.value.page = Number(queryParams.value.page) + 1
|
||||
isLoadMore.value = true
|
||||
handleGetData()
|
||||
}
|
||||
@@ -143,6 +296,39 @@ onReachBottom(() => {
|
||||
@on-refresh="handlePluginRefresh"
|
||||
/>
|
||||
<template v-else>
|
||||
<!-- 顶部搜索框 -->
|
||||
<view class="box-border w-screen px-3 pt-2">
|
||||
<view class="uh-global-card-glass flex h-9 items-center gap-3 rounded-full px-5">
|
||||
<wd-icon name="search" size="16px" />
|
||||
<input
|
||||
v-model="queryParams.keyword as string"
|
||||
class="flex-1 text-[26rpx] text-gray-900"
|
||||
placeholder="搜索投票..."
|
||||
placeholder-class="text-gray-400"
|
||||
confirm-type="search"
|
||||
@input="handleOnInput"
|
||||
@confirm="handleOnSearch"
|
||||
>
|
||||
<view v-if="queryParams.keyword" class="flex items-center" @click="queryParams.keyword = ''; handleOnSearch()">
|
||||
<wd-icon name="close" size="14px" />
|
||||
</view>
|
||||
</view>
|
||||
<!-- 筛选栏 -->
|
||||
<view class="flex items-center justify-between py-2">
|
||||
<view
|
||||
v-for="f in filterConfig"
|
||||
:key="f.key"
|
||||
class="flex flex-1 items-center justify-center gap-1"
|
||||
@click="handleOpenFilter(f)"
|
||||
>
|
||||
<text class="text-[24rpx]" :class="filterValues[f.key] ? 'text-primary font-bold' : 'text-gray-600'">
|
||||
{{ filterLabels[f.key] }}
|
||||
</text>
|
||||
<wd-icon name="arrow-down" size="10px" color="#9ca3af" />
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 加载/错误/空占位(状态机) -->
|
||||
<view v-if="loadingStatus !== 'success'">
|
||||
<uh-data-loading
|
||||
@@ -157,17 +343,40 @@ onReachBottom(() => {
|
||||
<uh-vote-card
|
||||
v-for="vote in dataList"
|
||||
:key="vote.metadata?.name"
|
||||
:vote-name="vote.metadata?.name || ''"
|
||||
@on-vote-success="handleOnVoteSuccess"
|
||||
:vote="vote"
|
||||
@click="handleOnVoteClick(vote)"
|
||||
/>
|
||||
<view class="load-text py-5 text-center text-[24rpx] text-gray-400">
|
||||
{{ loadMoreText }}
|
||||
</view>
|
||||
<view class="to-top-btn uh-global-card-glass fixed bottom-[100rpx] right-6 z-6 h-[72rpx] w-[72rpx] flex items-center justify-center rounded-full" @click="handleToTopPage()">
|
||||
<view
|
||||
class="to-top-btn uh-global-card-glass fixed bottom-[100rpx] right-6 z-6 flex h-[72rpx] w-[72rpx] items-center justify-center rounded-full"
|
||||
@click="handleToTopPage()"
|
||||
>
|
||||
<wd-icon name="arrow-up" size="20px" color="#6b7280" />
|
||||
</view>
|
||||
</block>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<!-- 筛选弹层 -->
|
||||
<wd-popup v-model="filterPopup.show" position="bottom" custom-style="border-radius: 24rpx 24rpx 0 0;">
|
||||
<view v-if="filterPopup.item" class="box-border p-6 pb-10">
|
||||
<view class="mb-4 text-center text-[30rpx] font-bold text-gray-900">
|
||||
{{ filterPopup.item.label }}
|
||||
</view>
|
||||
<view class="flex flex-col gap-2">
|
||||
<view
|
||||
v-for="opt in filterPopup.item.options"
|
||||
:key="opt.label"
|
||||
class="box-border rounded-xl px-5 py-3 text-center text-[28rpx]"
|
||||
:class="filterValues[filterPopup.item.key] === opt.value ? 'bg-primary/15 text-primary font-bold' : 'bg-[#f6f3ee] text-gray-700'"
|
||||
@click="handleSelectFilter(opt)"
|
||||
>
|
||||
{{ opt.label }}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</wd-popup>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
Reference in New Issue
Block a user