From bf30517393777f37215b7e84f781ffcb7a96f448 Mon Sep 17 00:00:00 2001
From: RockYang <yangjian102621@gmail.com>
Date: Sat, 5 Oct 2024 11:45:44 +0800
Subject: [PATCH] fixed alipay mobile payment

---
 web/.env.development       | 4 ++--
 web/src/App.vue            | 2 +-
 web/src/store/sharedata.js | 2 +-
 web/src/views/Dalle.vue    | 2 +-
 web/src/views/Suno.vue     | 9 +++++----
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/web/.env.development b/web/.env.development
index 2d4761b3..99693506 100644
--- a/web/.env.development
+++ b/web/.env.development
@@ -1,5 +1,5 @@
-VUE_APP_API_HOST=http://www.geekai.me:6004
-VUE_APP_WS_HOST=ws://www.geekai.me:6004
+VUE_APP_API_HOST=http://localhost:5678
+VUE_APP_WS_HOST=ws://localhost:5678
 VUE_APP_USER=18888888888
 VUE_APP_PASS=12345678
 VUE_APP_ADMIN_USER=admin
diff --git a/web/src/App.vue b/web/src/App.vue
index a10fb64d..0ea27ad1 100644
--- a/web/src/App.vue
+++ b/web/src/App.vue
@@ -91,7 +91,7 @@ const connect = () => {
     // 移除事件监听
     for (const key in store.messageHandlers) {
       if (store.socket) {
-        store.socket.removeEventListener('message', this.messageHandlers[key])
+        store.socket.removeEventListener('message', store.messageHandlers[key])
       }
     }
     store.setSocket(null)
diff --git a/web/src/store/sharedata.js b/web/src/store/sharedata.js
index ca94943b..05dfc8c0 100644
--- a/web/src/store/sharedata.js
+++ b/web/src/store/sharedata.js
@@ -56,7 +56,7 @@ export const useSharedStore = defineStore('shared', {
             }
         },
         removeMessageHandler(key) {
-            if (this.socket) {
+            if (this.socket.readyState === WebSocket.OPEN) {
                 this.socket.removeEventListener('message', this.messageHandlers[key])
             }
             delete this.messageHandlers[key]
diff --git a/web/src/views/Dalle.vue b/web/src/views/Dalle.vue
index b0ff89d3..f1c039e3 100644
--- a/web/src/views/Dalle.vue
+++ b/web/src/views/Dalle.vue
@@ -156,7 +156,7 @@
                           <el-tooltip content="删除" placement="top" effect="light">
                             <el-button type="danger" :icon="Delete" @click="removeImage(slotProp.item)" circle/>
                           </el-tooltip>
-                          <el-tooltip content="取消分享" placement="top" effect="light" v-if="!slotProp.item.publish">
+                          <el-tooltip content="取消分享" placement="top" effect="light" v-if="slotProp.item.publish">
                             <el-button type="warning"
                                        @click="publishImage(slotProp.item, false)"
                                        circle>
diff --git a/web/src/views/Suno.vue b/web/src/views/Suno.vue
index b2105000..1866f0fb 100644
--- a/web/src/views/Suno.vue
+++ b/web/src/views/Suno.vue
@@ -345,8 +345,8 @@ const data = ref({
   extend_secs: 0,
   ref_song_id: "",
 })
-const loading = ref(true)
-const noData = ref(false)
+const loading = ref(false)
+const noData = ref(true)
 const playList = ref([])
 const playerRef = ref(null)
 const showPlayer = ref(false)
@@ -368,9 +368,9 @@ onMounted(() => {
     ElMessage.error('复制失败！');
   })
 
-  checkSession().then(user => {
+  checkSession().then(() => {
     fetchData(1)
-  })
+  }).catch(() => {})
 
   store.addMessageHandler("suno",(data) => {
     // 丢弃无关消息
@@ -396,6 +396,7 @@ const fetchData = (_page) => {
   if (_page) {
     page.value = _page
   }
+  loading.value = true
   httpGet("/api/suno/list",{page:page.value, page_size:pageSize.value}).then(res => {
     total.value = res.data.total
     const items = []