Merge pull request 'lyc-dev' (#153 ) from lyc-dev into main

Merge branch 'main' into lyc-dev
edit
2024-12-19 16:56:31 +08:00 · 2024-12-19 16:55:52 +08:00 · 2024-12-19 16:55:37 +08:00
1 changed files with 4 additions and 4 deletions
--- a/src/renderer/src/layout/components/Aside.vue
+++ b/src/renderer/src/layout/components/Aside.vue
@ -182,9 +182,9 @@ watch(


 const logout = () => {
-  const hasClass = sessionStore.has('activeClass.id')
-  const  hasTool = sessionStore.get('isToolWin')
-  if (hasClass || hasTool) return ElMessage.warning('当前正在上课，请先结束上课')
+
+  if(!!sessionstore.get('curr.classcourse'))return ElMessage.warning('当前正在上课，请先结束上课')
+
  ElMessageBox.confirm('确认退出系统吗?', '提示', {
    confirmButtonText: '确定',
    cancelButtonText: '取消',
Author	SHA1	Message	Date
lyc	2565481306	Merge pull request 'lyc-dev' (#153 ) from lyc-dev into main	2024-12-19 16:56:31 +08:00
lyc	f708e2f741	Merge branch 'main' into lyc-dev	2024-12-19 16:55:52 +08:00
lyc	94276db542	edit	2024-12-19 16:55:37 +08:00