From 9ea4c2b9d0609df90f1859d5e016ccf9595bff0f Mon Sep 17 00:00:00 2001
From: Megghy <megghy@qq.com>
Date: Tue, 12 Mar 2024 19:09:16 +0800
Subject: [PATCH] fix canbuy check, allow both live-request and music-request

---
 src/views/open_live/MusicRequest.vue    | 4 ++--
 src/views/pointViews/PointGoodsView.vue | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/views/open_live/MusicRequest.vue b/src/views/open_live/MusicRequest.vue
index 8db35c8..6b25b6e 100644
--- a/src/views/open_live/MusicRequest.vue
+++ b/src/views/open_live/MusicRequest.vue
@@ -260,10 +260,10 @@ async function downloadConfig() {
     })
 }
 function startListen() {
-  if (accountInfo.value?.settings.enableFunctions.includes(FunctionTypes.SongRequest)) {
+  /*if (accountInfo.value?.settings.enableFunctions.includes(FunctionTypes.SongRequest)) {
     message.warning('使用这个点歌则需要先关闭歌势点歌 (SongRequest)')
     return
-  }
+  }*/
   listening.value = true
   message.success('开始监听')
 }
diff --git a/src/views/pointViews/PointGoodsView.vue b/src/views/pointViews/PointGoodsView.vue
index 1c4eb75..d8fe260 100644
--- a/src/views/pointViews/PointGoodsView.vue
+++ b/src/views/pointViews/PointGoodsView.vue
@@ -77,7 +77,6 @@ const addressOptions = computed(() => {
 
 const canBuy = computed(() => {
   if (!biliAuth.value.id) return false
-  if (!currentPoint.value) return false
   return true
 })
 function getTooltip(goods: ResponsePointGoodModel) {
@@ -213,7 +212,7 @@ onMounted(async () => {
             <NFlex justify="space-between" align="center">
               <NTooltip>
                 <template #trigger>
-                  <NButton :disabled="!canBuy" size="small" type="primary" @click="onBuyClick(item)">兑换</NButton>
+                  <NButton :disabled="getTooltip(item) != '开始兑换'" size="small" type="primary" @click="onBuyClick(item)">兑换</NButton>
                 </template>
                 {{ getTooltip(item) }}
               </NTooltip>