Merge remote-tracking branch 'origin/master'

src/store/user/index.ts

@@ -2,7 +2,7 @@ import { defineStore } from 'pinia'
 import type { UserState, UserInfo } from './types'
 import useAppStore from '@/store/app/index'
 import { activedTheme } from '../../../project.ui.config'
-import {wsShouldOpen} from "AnyR/states/coreState.js"
+import { wsShouldOpen } from 'AnyR/states/coreState.js'
 
 const useContactsStore = defineStore('user', {
     state: (): UserState => {
@@ -28,13 +28,12 @@ const useContactsStore = defineStore('user', {
         setUserInfo(res: UserInfo) {
             this.token = res.token
             this.user_info = res
+            this.router.push('/').then(function () {
+                wsShouldOpen.value = true
+            })
             //初始化主题色
             const { changeTheme } = useAppStore()
             changeTheme(activedTheme.value)
-            this.router.push('/')
-                .then(function () {
-                    wsShouldOpen.value = true;
-                })
         },
         //退出登录
         handleLogOut() {
@@ -49,6 +48,7 @@ const useContactsStore = defineStore('user', {
                 videoGroup: 0,
                 autoRecord: false
             }
+            wsShouldOpen.value = false
             const { changeTheme } = useAppStore()
             changeTheme('light')
             this.router.replace('/login')