Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Muska-Ami committed Jan 13, 2025
2 parents a8afef7 + bcf8c2b commit bf98f08
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ LoCyanFrp Panel, Powered by Naive-UI

## 地址

新面板地址: [https://preview.locyanfrp.cn](https://preview.locyanfrp.cn)
新面板地址: [https://dashboard.locyanfrp.cn](https://dashboard.locyanfrp.cn)

## 如何使用

Expand Down
6 changes: 3 additions & 3 deletions src/views/callback/auth/oauth/qq/BindView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ let error = ref(false)
let success = ref(false)
let errorMessage = ref('')
const user_id = userData.getters.get_user_id
const userId = userData.getters.get_user_id
if (user_id == null) {
if (userId == null) {
error.value = true
errorMessage.value = '需要登录才能继续操作'
}
Expand All @@ -37,7 +37,7 @@ if (!error.value && code !== null) {
onMounted(async () => {
let rs
try {
rs = await api.v2.auth.oauth.qq.bind.post(get_user_id, code)
rs = await api.v2.auth.oauth.qq.bind.post(userId, code)
} catch (e) {
message.error('登录失败: ' + e)
error.value = true
Expand Down
4 changes: 2 additions & 2 deletions src/views/callback/auth/oauth/qq/LoginView.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div class="flex-center outbox" v-if="!error">
<n-spin description="正在进行第三方登录处理"></n-spin>>
<n-spin description="正在进行第三方登录处理"></n-spin>
<p>请不要关闭此界面</p>
</div>
<div class="flex-center outbox" v-else>
Expand Down Expand Up @@ -44,7 +44,7 @@ if (code !== null) {
userData.commit('set_user_info', rs.data)
userData.commit('set_frp_token', rs.data.frp_token)
notification.success('登录成功', rs.data.username + ',欢迎回来!')
router.push(redirect || '/dashboard')
router.push('/dashboard')
} else {
error.value = true
errorMessage.value = rs.message
Expand Down

0 comments on commit bf98f08

Please sign in to comment.