Merge branch 'main' of https://gitlab.lingxixue.com/dmg/lingxixue-web

src/api/global.ts

@@ -254,30 +254,21 @@ const globalApi = {
 
   // 检查APK版本
   getVersions: async (params: anyObj) => {
-    const url = location.href
+    params = {
-    if (
+      ...(params || {}),
-      url.includes('localhost') ||
+      magic: str.getMagic(),
-      url.includes('192.168.') ||
-      url.includes('127.0.0.1') ||
-      url.includes('lingxixue.com')
-    ) {
-      params = {
-        magic: str.getMagic(),
-        ...(params || {}),
-      }
     }
     return get<any>('/apkManagement/list', params)
   },
 
   // 检查版本
-  checkVersion: (params: anyObj) =>
+  checkVersion: (params: anyObj) => {
-    http.request({
+    params = {
-      url: '/apkManagement/queryLatest',
+      ...(params || {}),
-      headers: {
+      magic: str.getMagic(),
-        Authorization: '',
+    }
-      },
+    return get<any>('/apkManagement/queryLatest', params)
-      params,
+  },
-    }),
 
   // 更新APPs
   updateApps: (data: anyObj) =>

src/hooks/useClassMonitor.ts

@@ -84,7 +84,7 @@ const startStudentShareScreenLive = (msg: anyObj) => {
   stopClassMonitor()
   monitorSessionId = sessionKey
   monitorState = 1
-  showMonitorTip('已进入课堂监控状态')
+  // showMonitorTip('已进入课堂监控状态')
   if (!applyStudentShareStart(msg)) {
     monitorState = 0
     monitorSessionId = ''
@@ -112,7 +112,7 @@ export const stopClassMonitor = (showTip = false) => {
     $XXL.stopStudentShareScreen()
   }
   if (showTip && isMonitoring) {
-    showMonitorTip('已结束课堂监控')
+    // showMonitorTip('已结束课堂监控')
   }
   monitorSessionId = ''
   monitorState = 0
@@ -133,7 +133,7 @@ const startClassMonitor = (msg: anyObj) => {
   stopClassMonitor()
   monitorSessionId = String(sessionId)
   monitorState = 1
-  showMonitorTip('已进入课堂监控状态')
+  // showMonitorTip('已进入课堂监控状态')
   if (!applyStudentShareStart(msg)) {
     monitorState = 0
     monitorSessionId = ''

src/stores/global.ts

@@ -214,9 +214,7 @@ export const globalStore = defineStore('global', () => {
   // 检测更新
   const checkStudyMachineUpdate = async (checkWeb = true) => {
     if (isNotStudyMachine) return
-    const {
+    const res = await globalApi.checkVersion({
-      data: { data: res },
-    } = await globalApi.checkVersion({
       model: getManufacturer(),
     })
     system.latestVersion = res