Merge branch 'hqyDev' of http://git.dayaedu.com/lex/classroom-instruments into jenkins

dev-dist/sw.js

@@ -84,6 +84,7 @@ define(['./workbox-88bf3160'], (function (workbox) { 'use strict';
     "url": "index.html",
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
     "revision": "0.3rkub68fa8"
 =======
     "revision": "0.15ep1dnlqh"
@@ -91,6 +92,13 @@ define(['./workbox-88bf3160'], (function (workbox) { 'use strict';
 =======
     "revision": "0.4v8s4holqi"
 >>>>>>> 31c8ce6834d9dbe55da3ef83bbe3bf6d61486328
+=======
+<<<<<<< Updated upstream
+    "revision": "0.4v8s4holqi"
+=======
+    "revision": "0.m978hf0c288"
+>>>>>>> Stashed changes
+>>>>>>> 9b609461efc59092eb62d0dd45234bcc8ffe81b2
   }], {});
   workbox.cleanupOutdatedCaches();
   workbox.registerRoute(new workbox.NavigationRoute(workbox.createHandlerBoundToURL("index.html"), {

public/version.json

@@ -1 +1,9 @@
-{"version":1735197737989}
+<<<<<<< HEAD
+{"version":1735197737989}
+=======
+<<<<<<< Updated upstream
+{"version":1735191389349}
+=======
+{"version":1735270986615}
+>>>>>>> Stashed changes
+>>>>>>> 9b609461efc59092eb62d0dd45234bcc8ffe81b2

src/utils/urlUtils.ts

@@ -43,7 +43,7 @@ export function vaildPPTUrl() {
   } else if (/dev/.test(url)) {
     returnUrl = 'https://dev.kt.colexiu.com/classroom-ppt';
   } else if (/localhost/.test(url)) {
-    returnUrl = 'http://192.168.3.122:9527';
+    returnUrl = 'http://localhost:9527';
   } else {
     returnUrl = 'https://mec.colexiu.com/classroom-ppt';
   }

src/views/attend-class/component/pptList.tsx

@@ -2,6 +2,7 @@ import { defineComponent, ref, onMounted, onUnmounted } from 'vue';
 import styles from './pptList.module.less';
 import { vaildPPTUrl } from '/src/utils/urlUtils';
 import { useUserStore } from '/src/store/modules/users';
+import { getAuthForAdmin } from '/src/utils';
 
 export default defineComponent({
   name: 'pptList',
@@ -10,10 +11,6 @@ export default defineComponent({
       type: Object,
       default: () => ({})
     },
-    fromType: {
-      type: String, // 'PLATFORM' | 'TEACHER' | 'CLASS'
-      default: 'TEACHER'
-    },
     instrumentId: {
       type: String,
       default: ''
@@ -22,12 +19,15 @@ export default defineComponent({
   emits: ['initPPT', 'changeSlideIndex', 'init'],
   setup(props, { emit, expose }) {
     const userStore = useUserStore();
+    const userAuth = getAuthForAdmin();
     const iframeRef = ref<HTMLIFrameElement>();
     const src = `${vaildPPTUrl()}/#/pptScreen?id=${
       props.pptData.id
     }&instrumentId=${props.instrumentId}&Authorization=${
       userStore.getToken
-    }&hideFullScreen=true&fromType=${props.fromType}`;
+    }&hideFullScreen=true&fromType=${
+      userAuth.authSource === 'admin' ? 'PLATFORM' : 'TEACHER'
+    }`;
     // 上一页下一页
     function handleChangeSlide(type: 'prev' | 'next') {
       iframeRef.value?.contentWindow?.postMessage(