From f21420de1349548fe15a03ef4cd5ffa55191931c Mon Sep 17 00:00:00 2001
From: Megghy <megghy@qq.com>
Date: Wed, 15 Nov 2023 21:59:11 +0800
Subject: [PATCH] fix wrong check

---
 src/api/api-models.ts                | 31 ++++++++++++++++++++++++++++
 src/views/open_live/MusicRequest.vue | 26 ++++++++++++++++-------
 src/views/open_live/OpenLottery.vue  |  2 +-
 3 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/src/api/api-models.ts b/src/api/api-models.ts
index 75e0fdb..32e56de 100644
--- a/src/api/api-models.ts
+++ b/src/api/api-models.ts
@@ -255,4 +255,35 @@ export interface UpdateLiveLotteryUsersModel {
   users: OpenLiveLotteryUserInfo[]
   resultUsers: OpenLiveLotteryUserInfo[]
   type: OpenLiveLotteryType
+}
+export interface SongRequestInfo {
+  songName: string
+  song?: SongsInfo
+  status: SongRequestStatus
+  from: SongRequestFrom
+  scPrice?: number
+  user?: SongRequestUserInfo
+  createAt: number
+}
+export interface SongRequestUserInfo {
+  name: string
+  uId: number
+  guardLevel: number
+  fansMedalLevel: number
+  fansMedalName: string
+  fansMedalWearingStatus: boolean
+}
+
+export enum SongRequestFrom {
+  Manual,
+  Danmaku,
+  SC,
+  Web,
+}
+
+export enum SongRequestStatus {
+  Waiting,
+  Singing,
+  Finish,
+  Cancel,
 }
\ No newline at end of file
diff --git a/src/views/open_live/MusicRequest.vue b/src/views/open_live/MusicRequest.vue
index 01cd663..403562d 100644
--- a/src/views/open_live/MusicRequest.vue
+++ b/src/views/open_live/MusicRequest.vue
@@ -1,8 +1,9 @@
 <script setup lang="ts">
 import { useAccount } from '@/api/account'
+import { SongRequestInfo } from '@/api/api-models'
 import DanmakuClient, { AuthInfo, DanmakuInfo, RoomAuthInfo, SCInfo } from '@/data/DanmakuClient'
-import { useMessage } from 'naive-ui'
-import { onMounted, onUnmounted } from 'vue'
+import { NList, NTabPane, NTabs, useMessage } from 'naive-ui'
+import { onMounted, onUnmounted, ref } from 'vue'
 import { useRoute } from 'vue-router'
 
 const route = useRoute()
@@ -15,6 +16,8 @@ const props = defineProps<{
   code: string | undefined
 }>()
 
+const activeSongs = ref<SongRequestInfo[]>([])
+
 function onGetDanmaku(danmaku: DanmakuInfo) {
 
 }
@@ -23,11 +26,6 @@ function onGetSC(danmaku: SCInfo) {
 }
 
 onMounted(() => {
-  const authInfo = route.query as unknown as AuthInfo
-  if (!authInfo?.Code && !accountInfo.value?.isBiliVerified) {
-    message.warning('你并不是从幻星平台进入此页面, 且本站账号也未进行 Bilibili 账号认证, 此功能将不可用')
-    return
-  }
   props.client.on('danmaku', onGetDanmaku)
   props.client.on('sc', onGetSC)
 })
@@ -37,4 +35,16 @@ onUnmounted(() => {
 })
 </script>
 
-<template>开发中...</template>
+<template>
+  开发中...
+  <NTabs animated>
+    <NTabPane name="list" tab="列表">
+      <NList>
+
+      </NList>
+    </NTabPane>
+    <NTabPane name="history" tab="历史">
+
+    </NTabPane>
+  </NTabs>
+</template>
diff --git a/src/views/open_live/OpenLottery.vue b/src/views/open_live/OpenLottery.vue
index 0782e0c..aebecd3 100644
--- a/src/views/open_live/OpenLottery.vue
+++ b/src/views/open_live/OpenLottery.vue
@@ -334,7 +334,7 @@ onUnmounted(() => {
 
 <template>
   <NLayoutContent style="height: 100vh; padding: 20px">
-    <NResult v-if="code && !accountInfo" status="403" title="403" description="该页面只能从饭贩访问或者注册用户使用" />
+    <NResult v-if="!code && !accountInfo" status="403" title="403" description="该页面只能从幻星平台访问或者注册用户使用" />
     <template v-else>
       <NCard>
         <template #header>