更新优化

src/components/col-header/index.tsx

@@ -47,14 +47,16 @@ export default defineComponent({
   },
   watch: {
     $route(res: any) {
+      // console.log(res)
+      this.isdark = !!res.meta.isdark
       this.navigator.forEach((item: any) => {
         item.current = false
       })
       this.navigator.forEach((item: any) => {
         if (item.href === res.meta.highlightPath) {
           item.current = true
-          this.isdark = !!res.meta.isdark
-          console.log(this.isdark)
+          // this.isdark = !!res.meta.isdark
+          // console.log(this.isdark)
         }
       })
     }

src/router/index-admin.ts

@@ -1,3 +1,5 @@
+import { getAuth } from '@/helpers/utils'
+import { getUserInfo } from '@/state'
 import {
   createRouter,
   createWebHashHistory,
@@ -16,9 +18,14 @@ const router: Router = createRouter({
   }
 })
 
-router.beforeEach((to, from, next) => {
+router.beforeEach(async (to, from, next) => {
   const title = to.meta.title
   document.title = (title || '酷乐秀') as any
+
+  try {
+    // 获取用户信息
+    await getUserInfo()
+  } catch {}
   next()
 })
 

src/state.ts

@@ -1,6 +1,6 @@
 import { reactive } from 'vue'
 import request from './helpers/request'
-import { getAuth, getUserType,setUserInfo } from './helpers/utils'
+import { getAuth, getUserType, setUserInfo } from './helpers/utils'
 
 type status = 'init' | 'login' | 'logout' | 'error'
 export const state = reactive({

src/views/App.tsx

@@ -13,8 +13,10 @@ export default defineComponent({
   components: { silder },
   name: 'App',
   async created() {
+    // console.log('user start')
     // 获取用户信息
-    await getUserInfo()
+    // await getUserInfo()
+    // console.log('user end')
   },
   render() {
     return (

src/views/login/components/qr-login/index.tsx

@@ -20,6 +20,10 @@ export default defineComponent({
     onChange: {
       type: Function,
       default: (type: string) => {}
+    },
+    onClose: {
+      type: Function,
+      default: () => {}
     }
   },
   data() {
@@ -90,8 +94,8 @@ export default defineComponent({
               loginUserType: userType
             })
           )
-          // this.onClose()
-          // window.location.reload()
+          this.onClose()
+          window.location.reload()
         } else if (result.codeStatus === 'filed') {
           this.removeTimer()
         } else if (result.codeStatus === 'scanned') {

src/views/login/index.tsx

@@ -143,6 +143,9 @@ export default defineComponent({
                 onChange={(type: any) => {
                   this.type = type
                 }}
+                onClose={() => {
+                  this.onClose()
+                }}
               />
               <div class={[styles.scanTxt, 'pt-14 text-center']}>
                 没有账号，

src/views/student-info/my-follow/item.tsx

@@ -72,7 +72,7 @@ export default defineComponent({
             plain
             size="small"
             disabled
-            class="!bg-white hover:!text-[#2DC7AA]"
+            class="!bg-white hover:!text-[#2DC7AA] !border-[#2DC7AA]"
           >
             已关注
           </ElButton>

src/views/user-info/live-class/list.tsx

@@ -29,6 +29,7 @@ export default defineComponent({
     }
   },
   mounted() {
+    console.log(state.user, 'state.user')
     this.getList()
   },
   methods: {