diff --git a/src/views/AboutView.vue b/src/views/AboutView.vue index 2e9f3f3..5ee2fba 100644 --- a/src/views/AboutView.vue +++ b/src/views/AboutView.vue @@ -33,6 +33,7 @@ import { NButton, NCard, NDivider, NLayoutContent, NSpace, NText, NTimeline, NTi 更新日志 + diff --git a/src/views/IndexView.vue b/src/views/IndexView.vue index d62bc7e..4da9972 100644 --- a/src/views/IndexView.vue +++ b/src/views/IndexView.vue @@ -10,17 +10,17 @@ const { width } = useWindowSize() const functions = [ { name: '直播事件记录', - desc: '能够记录并查询上舰和SC记录 (需要另外部署脚本', + desc: '能够记录并查询上舰和SC记录', icon: VehicleShip24Filled, }, { name: '日程表', - desc: '提供多种样式的日程表 (样式还没做完', + desc: '提供多种样式的日程表', icon: Calendar, }, { name: '歌单', - desc: '可以放自己的歌单或者能唱的歌, 支持多种样式 (样式也还没做完', + desc: '可以放自己的歌单或者能唱的歌, 支持多种样式', icon: MusicalNote, }, { diff --git a/src/views/manage/SettingsManageView.vue b/src/views/manage/SettingsManageView.vue index 1d37f0c..fa54d8e 100644 --- a/src/views/manage/SettingsManageView.vue +++ b/src/views/manage/SettingsManageView.vue @@ -2,7 +2,7 @@ import { SaveAccountSettings, SaveEnableFunctions, useAccount } from '@/api/account' import { NButton, NCard, NCheckbox, NCheckboxGroup, NDivider, NForm, NModal, NSelect, NSpace, NSpin, NSwitch, NTabPane, NTabs, SelectOption, useMessage } from 'naive-ui' import { Ref, computed, h, onMounted, ref, defineAsyncComponent, onActivated } from 'vue' -import { FunctionTypes, ScheduleWeekInfo, SongFrom, SongLanguage, SongsInfo } from '@/api/api-models' +import { FunctionTypes, ScheduleWeekInfo, SongFrom, SongLanguage, SongRequestOption, SongsInfo } from '@/api/api-models' import { QueryPostAPI } from '@/api/query' import { ACCOUNT_API_URL, FETCH_API, IndexTemplateMap, ScheduleTemplateMap, SongListTemplateMap } from '@/data/constants' import { useRoute } from 'vue-router' @@ -100,6 +100,8 @@ const templates = { key: 'song1', name: '歌曲1', author: ['作者1'], + tags: ['标签1', '标签2'], + description: '这是一段描述', url: 'https://example.com/song1.mp3', from: SongFrom.Custom, language: [SongLanguage.Chinese], @@ -110,20 +112,29 @@ const templates = { id: 2, key: 'song2', name: '歌曲2', - author: ['作者2'], + author: ['作者1'], + tags: ['标签1', '标签2'], url: 'https://example.com/song2.mp3', from: SongFrom.Custom, language: [SongLanguage.Chinese], createTime: Date.now(), updateTime: Date.now(), + description: '这还是一段描述', + options: { + scMinPrice: 30, + fanMedalMinLevel: 5, + needJianzhang: true, + } as SongRequestOption }, { id: 3, key: 'song3', name: '歌曲3', + tags: ['标签3', '很长很长很长很长很长很长很长很长很长很长的标签'], author: ['作者3'], url: 'https://example.com/song3.mp3', from: SongFrom.Custom, + description: '这是一段很长很长很长很长很长很长很长很长很长很长的描述', language: [SongLanguage.Chinese], createTime: Date.now(), updateTime: Date.now(), @@ -144,6 +155,7 @@ const templates = { key: 'song5', name: '歌曲5', author: ['作者5'], + tags: ['标签1', '标签5', '标签6', '标签7', '标签8', '标签9', '标签10'], url: 'https://example.com/song5.mp3', from: SongFrom.Custom, language: [SongLanguage.Chinese], diff --git a/src/views/manage/SongListManageView.vue b/src/views/manage/SongListManageView.vue index 2890b94..c9c3784 100644 --- a/src/views/manage/SongListManageView.vue +++ b/src/views/manage/SongListManageView.vue @@ -379,6 +379,7 @@ onMounted(async () => { > 刷新 + 修改模板 diff --git a/src/views/open_live/OpenLiveIndex.vue b/src/views/open_live/OpenLiveIndex.vue index 98d584a..e1b5f40 100644 --- a/src/views/open_live/OpenLiveIndex.vue +++ b/src/views/open_live/OpenLiveIndex.vue @@ -49,6 +49,9 @@ const accountInfo = useAccount() 详见 VTsuru.live + + + 关于本站 diff --git a/src/views/view/songListTemplate/SimpleSongListTemplate.vue b/src/views/view/songListTemplate/SimpleSongListTemplate.vue index 23d89fb..17b819a 100644 --- a/src/views/view/songListTemplate/SimpleSongListTemplate.vue +++ b/src/views/view/songListTemplate/SimpleSongListTemplate.vue @@ -7,7 +7,7 @@ import SongRequestOBS from '@/views/obs/SongRequestOBS.vue' import { CloudAdd20Filled, Play24Filled } from '@vicons/fluent' import { useDebounceFn, useElementSize, useInfiniteScroll, useWindowSize } from '@vueuse/core' import { debounce, throttle } from 'lodash' -import { NGridItem, NGrid, NCard, NSpace, NDivider, NButton, NCollapseTransition, NInput, NText, NEllipsis, NSelect, NEmpty, NIcon, NTag, NScrollbar, NTooltip } from 'naive-ui' +import { NGridItem, NGrid, NCard, NSpace, NDivider, NButton, NCollapseTransition, NInput, NText, NEllipsis, NSelect, NEmpty, NIcon, NTag, NScrollbar, NTooltip, NPopover } from 'naive-ui' import { computed, ref } from 'vue' const props = defineProps<{ @@ -127,7 +127,7 @@ function loadMore() { - + @@ -138,23 +138,25 @@ function loadMore() { - + - - {{ item.description }} - - - - SC | {{ item.options?.scMinPrice }} - 粉丝牌 | {{ item.options?.fanMedalMinLevel }} - 总督 - 提督 - 舰长 - - + + + {{ item.description }} + + + + SC | {{ item.options?.scMinPrice }} + 粉丝牌 | {{ item.options?.fanMedalMinLevel }} + 总督 + 提督 + 舰长 + + + - + @@ -176,7 +178,7 @@ function loadMore() { isLoading = '' } " - :type="!songRequestSettings.allowFromWeb || item.options ? 'warning' : 'info'" + :type="songRequestSettings?.allowFromWeb == false || item.options ? 'warning' : 'info'" :loading="isLoading == item.key" > @@ -184,8 +186,46 @@ function loadMore() { - {{ !songRequestSettings.allowFromWeb || item.options ? '点歌 | 用户或此歌曲不允许从网页点歌, 点击后将复制点歌内容到剪切板' : !accountInfo ? '点歌 | 你需要登录后才能点歌' : '点歌' }} + {{ + songRequestSettings?.allowFromWeb == false || item.options + ? '点歌 | 用户或此歌曲不允许从网页点歌, 点击后将复制点歌内容到剪切板' + : !accountInfo + ? '点歌 | 你需要登录后才能点歌' + : '点歌' + }} + + + + 标签 + + + (selectedTag == tag ? (selectedTag = '') : (selectedTag = tag))" + :type="selectedTag == tag ? 'primary' : 'default'" + > + + {{ tag }} + + + + + + (selectedTag == tag ? (selectedTag = '') : (selectedTag = tag))" + :type="selectedTag == tag ? 'primary' : 'default'" + > + + {{ tag }} + + +
详见 VTsuru.live + + + 关于本站