Megghy/vtsuru.live
1
0
Fork 0
mirror of https://github.com/Megghy/vtsuru.live.git synced 2025-12-06 18:36:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

update url, improve queue and songrequest

Browse Source
This commit is contained in:
Megghy
2023-12-15 16:29:08 +08:00
parent 82a0e72122
commit c530c3b126
36 changed files with 411 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/obs/LiveLotteryOBS.vue
View File

@@ -30,7 +30,7 @@ const isMoreThanContainer = computed(() => {
async function getUsers() {
try {
const data = await QueryGetAPI<UpdateLiveLotteryUsersModel>(LOTTERY_API_URL() + 'live/get-users', {
const data = await QueryGetAPI<UpdateLiveLotteryUsersModel>(LOTTERY_API_URL + 'live/get-users', {
code: currentCode.value,
})
if (data.code == 200) {

25
src/views/obs/QueueOBS.vue
View File

@@ -54,7 +54,7 @@ const activeItems = computed(() => {
async function get() {
try {
const data = await QueryGetAPI<{ queue: ResponseQueueModel[]; setting: Setting_Queue }>(QUEUE_API_URL() + 'get-active-and-settings', {
const data = await QueryGetAPI<{ queue: ResponseQueueModel[]; setting: Setting_Queue }>(QUEUE_API_URL + 'get-active-and-settings', {
id: currentId.value,
})
if (data.code == 200) {
@@ -111,7 +111,7 @@ onUnmounted(() => {
<img class="queue-singing-avatar" :src="AVATAR_URL + progressing?.user?.uid" referrerpolicy="no-referrer" />
<p class="queue-singing-name">{{ progressing?.user?.name }}</p>
</template>
<div v-else class="queue-singing-empty">空闲中</div>
<div v-else class="queue-singing-empty">等待中</div>
<div class="queue-singing-suffix"></div>
</div>
<div class="queue-content" ref="listContainerRef">
@@ -122,12 +122,15 @@ onUnmounted(() => {
:from="(item.from as number)"
:status="(item.status as number)"
:payment="item.giftPrice ?? 0"
v-for="item in activeItems"
v-for="(item, index) in activeItems"
:key="item.id"
:style="`height: ${itemHeight}px`"
>
<div class="queue-list-item-index" :index="index + 1">
{{ index + 1 }}
</div>
<div class="queue-list-item-level" :has-level="(item.user?.fans_medal_level ?? 0) > 0">
{{ item.user?.fans_medal_level }}
{{ `${item.user?.fans_medal_name} ${item.user?.fans_medal_level}` }}
</div>
<div class="queue-list-item-user-name">
{{ item.user?.name }}
@@ -140,7 +143,7 @@ onUnmounted(() => {
<NEmpty class="queue-empty" description="暂无人排队" />
</div>
</div>
<div class="queue-footer" ref="footerRef">
<div class="queue-footer" ref="footerRef" v-if="settings.showRequireInfo">
<Vue3Marquee :key="key" ref="footerListRef" class="queue-footer-marquee" :pause="footerSize.width < footerListSize.width" :duration="20">
<span class="queue-tag" type="prefix">
<div class="queue-tag-key">关键词</div>
@@ -204,7 +207,7 @@ onUnmounted(() => {
text-shadow: 0 0 10px #ca7b7b6e, 0 0 20px #ffffff8e, 0 0 30px #61606086, 0 0 40px rgba(64, 156, 179, 0.555);
}
.queue-header-count {
color: #ffffffbd;
color: #ffffff;
text-align: center;
font-size: 14px;
}
@@ -321,6 +324,16 @@ onUnmounted(() => {
margin-left: auto;
}
.queue-list-item-index {
text-align: center;
height: 18px;
padding: 2px;
min-width: 15px;
border-radius: 5px;
background-color: #0f0f0f48;
color: rgba(204, 204, 204, 0.993);
font-size: 12px;
}
.queue-list-item-level {
text-align: center;
height: 18px;

21
src/views/obs/SongRequestOBS.vue
View File

@@ -39,7 +39,7 @@ const activeSongs = computed(() => {
async function get() {
try {
const data = await QueryGetAPI<{ songs: SongRequestInfo[]; setting: Setting_SongRequest }>(SONG_REQUEST_API_URL() + 'get-active-and-settings', {
const data = await QueryGetAPI<{ songs: SongRequestInfo[]; setting: Setting_SongRequest }>(SONG_REQUEST_API_URL + 'get-active-and-settings', {
id: currentId.value,
})
if (data.code == 200) {
@@ -103,13 +103,16 @@ onUnmounted(() => {
<div class="song-request-content" ref="listContainerRef">
<template v-if="activeSongs.length > 0">
<Vue3Marquee class="song-request-list" :key="key" vertical :pause="!isMoreThanContainer" :duration="20" :style="`height: ${height}px;width: ${width}px;`">
<span class="song-request-list-item" :from="(song.from as number)" :status="(song.status as number)" v-for="song in activeSongs" :key="song.id" :style="`height: ${itemHeight}px`">
<span class="song-request-list-item" :from="(song.from as number)" :status="(song.status as number)" v-for="(song, index) in activeSongs" :key="song.id" :style="`height: ${itemHeight}px`">
<div class="song-request-list-item-index" :index="index + 1">
{{ index + 1 }}
</div>
<div class="song-request-list-item-song-name">
{{ song.songName }}
</div>
<p class="song-request-list-item-name">{{ song.from == SongRequestFrom.Manual ? '主播添加' : song.user?.name }}</p>
<div class="song-request-list-item-level" :has-level="(song.user?.fans_medal_level ?? 0) > 0">
{{ song.user?.fans_medal_level }}
{{ `${song.user?.fans_medal_name} ${song.user?.fans_medal_level}` }}
</div>
</span>
</Vue3Marquee>
@@ -118,7 +121,7 @@ onUnmounted(() => {
<NEmpty class="song-request-empty" description="暂无人点歌" />
</div>
</div>
<div class="song-request-footer" ref="footerRef">
<div class="song-request-footer" v-if="settings.showRequireInfo" ref="footerRef">
<Vue3Marquee :key="key" ref="footerListRef" class="song-request-footer-marquee" :pause="footerSize.width < footerListSize.width" :duration="20">
<span class="song-request-tag" type="prefix">
<div class="song-request-tag-key">前缀</div>
@@ -290,6 +293,16 @@ onUnmounted(() => {
margin-left: auto;
}
.song-request-list-item-index {
text-align: center;
height: 18px;
padding: 2px;
min-width: 15px;
border-radius: 5px;
background-color: #0f0f0f48;
color: rgba(204, 204, 204, 0.993);
font-size: 12px;
}
.song-request-list-item-level {
text-align: center;
height: 18px;