diff --git a/src/api/api-models.ts b/src/api/api-models.ts
index 0202754..9cd7f05 100644
--- a/src/api/api-models.ts
+++ b/src/api/api-models.ts
@@ -543,6 +543,7 @@ export interface ResponseQueueModel {
status: QueueStatus
from: QueueFrom
giftPrice?: number
+ content?: string
user?: DanmakuUserInfo
createAt: number
finishAt?: number | null
diff --git a/src/components/FeedbackItem.vue b/src/components/FeedbackItem.vue
index 88cbc34..098c323 100644
--- a/src/components/FeedbackItem.vue
+++ b/src/components/FeedbackItem.vue
@@ -1,6 +1,6 @@
-
+
等待
@@ -77,14 +77,20 @@ defineProps<{
其他
- {{ item.message }}
+
+
+ {{ item.message }}
+
+
-
- {{ item.replyMessage }}
-
+
+
+ {{ item.replyMessage }}
+
+
diff --git a/src/views/manage/point/PointUserManage.vue b/src/views/manage/point/PointUserManage.vue
index fcdfcd9..3c8ac85 100644
--- a/src/views/manage/point/PointUserManage.vue
+++ b/src/views/manage/point/PointUserManage.vue
@@ -30,6 +30,7 @@ import {
import { computed, h, onMounted, ref } from 'vue'
import PointUserDetailCard from './PointUserDetailCard.vue'
import { Info24Filled } from '@vicons/fluent'
+import { objectsToCSV } from '@/Utils'
const props = defineProps<{
goods: ResponsePointGoodModel[]
diff --git a/src/views/obs/QueueOBS.vue b/src/views/obs/QueueOBS.vue
index 8a12ae6..7a2ed1b 100644
--- a/src/views/obs/QueueOBS.vue
+++ b/src/views/obs/QueueOBS.vue
@@ -17,6 +17,7 @@ import { useRoute } from 'vue-router'
import { Vue3Marquee } from 'vue3-marquee'
import { NCard, NDivider, NEmpty, NSpace, NText, useMessage } from 'naive-ui'
import { List } from 'linqts'
+import { isSameDay } from 'date-fns'
const props = defineProps<{
id?: number
@@ -63,7 +64,10 @@ const activeItems = computed(() => {
break
}
case QueueSortType.FansMedalFirst: {
- list = list.OrderByDescending(q => q.user?.fans_medal_wearing_status ? 1 : 0).ThenByDescending((q) => q.user?.fans_medal_level ?? 0).ThenBy((q) => q.createAt)
+ list = list
+ .OrderByDescending((q) => (q.user?.fans_medal_wearing_status ? 1 : 0))
+ .ThenByDescending((q) => q.user?.fans_medal_level ?? 0)
+ .ThenBy((q) => q.createAt)
break
}
}
@@ -198,7 +202,7 @@ onUnmounted(() => {
-
+
diff --git a/src/views/open_live/OpenQueue.vue b/src/views/open_live/OpenQueue.vue
index c1032c7..0a55cf1 100644
--- a/src/views/open_live/OpenQueue.vue
+++ b/src/views/open_live/OpenQueue.vue
@@ -156,7 +156,7 @@ const queue = computed(() => {
: q?.user?.name.toLowerCase() == filterName.value.toLowerCase()),
)
.Where((q) => (q?.status ?? QueueStatus.Cancel) < QueueStatus.Finish)
- //.OrderByDescending((q) => q.from == QueueFrom.Manual)
+ //.OrderByDescending((q) => q.from == QueueFrom.Manual)
switch (settings.value.sortType) {
case QueueSortType.TimeFirst: {
list = list.OrderBy((q) => q.createAt)
@@ -173,7 +173,10 @@ const queue = computed(() => {
break
}
case QueueSortType.FansMedalFirst: {
- list = list.OrderByDescending(q => q.user?.fans_medal_wearing_status ? 1 : 0).ThenByDescending((q) => q.user?.fans_medal_level ?? 0).ThenBy((q) => q.createAt)
+ list = list
+ .OrderByDescending((q) => (q.user?.fans_medal_wearing_status ? 1 : 0))
+ .ThenByDescending((q) => q.user?.fans_medal_level ?? 0)
+ .ThenBy((q) => q.createAt)
break
}
}
@@ -909,6 +912,22 @@ onUnmounted(() => {
+
+
+
+
+
+
+
+
+
+
+ {{ '来自' + (queueData?.from == QueueFrom.Gift ? '礼物' : '弹幕') + ': ' }}
+
+
+ {{ queueData?.content }}
+
+