Merge branch 'feature/daily_bugfix_0825_b' into codex/add-floating-window-support-for-message-box-a7msu4

This commit is contained in:
Tim
2025-08-25 17:20:23 +08:00
committed by GitHub
17 changed files with 227 additions and 45 deletions

View File

@@ -118,7 +118,7 @@
<script setup>
import { ref, onUnmounted, watch, onActivated, computed } from 'vue'
import { useRouter, useRoute } from 'vue-router'
import { useRoute } from 'vue-router'
import { getToken, fetchCurrentUser } from '~/utils/auth'
import { toast } from '~/main'
import { useWebSocket } from '~/composables/useWebSocket'
@@ -133,7 +133,8 @@ const config = useRuntimeConfig()
const conversations = ref([])
const loading = ref(true)
const error = ref(null)
const router = useRouter()
const route = useRoute()
const currentUser = ref(null)
const API_BASE_URL = config.public.apiBaseUrl
const { connect, disconnect, subscribe, isConnected } = useWebSocket()
@@ -229,7 +230,7 @@ async function goToChannel(id) {
method: 'POST',
headers: { Authorization: `Bearer ${token}` },
})
router.push(`/message-box/${id}`)
navigateTo(`/message-box/${id}`)
} catch (e) {
toast.error(e.message)
}
@@ -278,7 +279,7 @@ onUnmounted(() => {
})
function goToConversation(id) {
router.push(`/message-box/${id}`)
navigateTo(`/message-box/${id}`)
}
function minimize() {