diff --git a/src/api/api-models.ts b/src/api/api-models.ts index 3489fe6..67c69ea 100644 --- a/src/api/api-models.ts +++ b/src/api/api-models.ts @@ -52,23 +52,23 @@ export interface AccountInfo extends UserInfo { biliBlackList: { [key: number]: string } streamerInfo?: StreamerModel } -export interface StreamerModel{ - name: string; - uId: number; - roomId: number; - faceUrl: string; - title: string; - coverUrl: string; - frameUrl: string; - area: string; - parentArea: string; - lastStreamAt: number; - totalDanmakuCount: number; - totalIncome: number; - totalStreamCount: number; - totalStreamTime: number; - lastDanmakuCount: number; - isStreaming: boolean; +export interface StreamerModel { + name: string + uId: number + roomId: number + faceUrl: string + title: string + coverUrl: string + frameUrl: string + area: string + parentArea: string + lastStreamAt: number + totalDanmakuCount: number + totalIncome: number + totalStreamCount: number + totalStreamTime: number + lastDanmakuCount: number + isStreaming: boolean } export enum BiliAuthCodeStatusType { NotBind, @@ -150,6 +150,9 @@ export interface Setting_Queue { jianzhangCooldownSecond: number showRequireInfo: boolean + showPayment: boolean + showFanMadelInfo: boolean + isReverse: boolean } @@ -175,7 +178,7 @@ export enum FunctionTypes { Schedule, SongRequest, Queue, - Point + Point, } export interface SongAuthorInfo { name: string @@ -185,7 +188,7 @@ export enum SongFrom { Custom, Netease, FiveSing, - Kugou + Kugou, } export interface SongsInfo { id: number @@ -441,7 +444,7 @@ export enum EventDataTypes { Message, Like, SCDel, - Enter + Enter, } export interface ResponseQueueModel { id: number @@ -502,16 +505,14 @@ export enum FeedbackStatus { Reject, Developing, } -export interface TagInfo -{ - name: string - color: string +export interface TagInfo { + name: string + color: string } -export enum GoodsStatus -{ - Normal, // 商品正常 - //OutOfStock, // 商品无货 - Discontinued // 商品下架 +export enum GoodsStatus { + Normal, // 商品正常 + //OutOfStock, // 商品无货 + Discontinued, // 商品下架 } export enum GoodsTypes { Physical, @@ -530,7 +531,7 @@ export interface ResponsePointGoodModel { status: GoodsStatus type: GoodsTypes } -export interface ImageUploadModel{ +export interface ImageUploadModel { existImages: string[] newImagesBase64: string[] } @@ -547,4 +548,4 @@ export interface PointGoodsModel { embedCollectUrl?: boolean description: string content?: string -} \ No newline at end of file +} diff --git a/src/views/AboutView.vue b/src/views/AboutView.vue index 19f33d2..af0bfbe 100644 --- a/src/views/AboutView.vue +++ b/src/views/AboutView.vue @@ -31,6 +31,7 @@ import { NButton, NCard, NDivider, NLayoutContent, NSpace, NText, NTimeline, NTi 更新日志 + diff --git a/src/views/obs/QueueOBS.vue b/src/views/obs/QueueOBS.vue index 1959397..c3bee1f 100644 --- a/src/views/obs/QueueOBS.vue +++ b/src/views/obs/QueueOBS.vue @@ -49,7 +49,7 @@ const activeItems = computed(() => { list = list.OrderByDescending((q) => q.giftPrice ?? 0).ThenBy((q) => q.createAt) } } - if(settings.value.isReverse){ + if (settings.value.isReverse) { list = list.Reverse() } return list.ToArray() @@ -108,7 +108,7 @@ onUnmounted(() => {

已有 {{ activeItems.length ?? 0 }} 人

-
+
@@ -207,7 +207,11 @@ onUnmounted(() => { text-align: center; font-size: 20px; font-weight: bold; - text-shadow: 0 0 10px #ca7b7b6e, 0 0 20px #ffffff8e, 0 0 30px #61606086, 0 0 40px rgba(64, 156, 179, 0.555); + 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: #ffffff; diff --git a/src/views/open_live/OpenQueue.vue b/src/views/open_live/OpenQueue.vue index 4e90281..01f9e02 100644 --- a/src/views/open_live/OpenQueue.vue +++ b/src/views/open_live/OpenQueue.vue @@ -88,6 +88,8 @@ const defaultSettings = { giftFilterType: QueueGiftFilterType.Or, showRequireInfo: true, isReverse: false, + showFanMadelInfo: true, + showPayment: true, } as Setting_Queue const STATUS_MAP = { [QueueStatus.Waiting]: '等待中', @@ -1049,6 +1051,8 @@ onUnmounted(() => { OBS 显示底部的需求信息 + 显示付费信息 + 显示用户粉丝牌 其他 自动关闭加入队列失败时的提示消息