Browse Source

Merge branch 'iteration-20240820-fire' into jenkins

lex 11 months ago
parent
commit
bf330c4640

+ 4 - 6
src/views/coursewarePlay/component/musicScore.tsx

@@ -41,14 +41,12 @@ export default defineComponent({
     const origin = /(localhost|192)/.test(location.host)
     const origin = /(localhost|192)/.test(location.host)
       ? 'https://test.gym.lexiaoya.cn'
       ? 'https://test.gym.lexiaoya.cn'
       : location.origin;
       : location.origin;
-
-    const path =
-      state.platformType === 'TEACHER' ? '/accompany-teacher/' : '/accompany/';
     const src =
     const src =
-      `${origin}${path}?Authorization=${Authorization}` +
-      '#/detail/' +
-      props.music.content +
+      `${origin}/${
+        state.platformType === 'TEACHER' ? 'accompany-teacher' : 'accompany'
+      }/?Authorization=${Authorization}#/detail/${props.music.content}` +
       '?part-index=0';
       '?part-index=0';
+
     const checkView = () => {
     const checkView = () => {
       fetch(src)
       fetch(src)
         .then(() => {
         .then(() => {

+ 4 - 1
src/views/coursewarePlay/component/video-play.tsx

@@ -26,6 +26,7 @@ import {
 import TCPlayer from 'tcplayer.js';
 import TCPlayer from 'tcplayer.js';
 import 'tcplayer.js/dist/tcplayer.min.css';
 import 'tcplayer.js/dist/tcplayer.min.css';
 import { Slider } from 'vant';
 import { Slider } from 'vant';
+import { state } from '@/state';
 
 
 // 秒转分
 // 秒转分
 export const getSecondRPM = (second: number, type?: string) => {
 export const getSecondRPM = (second: number, type?: string) => {
@@ -326,7 +327,9 @@ export default defineComponent({
       const origin = /(localhost|192)/.test(location.host)
       const origin = /(localhost|192)/.test(location.host)
         ? 'https://test.gym.lexiaoya.cn'
         ? 'https://test.gym.lexiaoya.cn'
         : location.origin;
         : location.origin;
-      const src = `${origin}/accompany/#/detail/${item.value.materialMusicId}?Authorization=${Authorization}`;
+      const src = `${origin}/${
+        state.platformType === 'TEACHER' ? 'accompany-teacher' : 'accompany'
+      }/#/detail/${item.value.materialMusicId}?Authorization=${Authorization}`;
       postMessage({
       postMessage({
         api: 'openAccompanyWebView',
         api: 'openAccompanyWebView',
         content: {
         content: {

+ 7 - 1
src/views/coursewarePlay/index.tsx

@@ -1121,7 +1121,13 @@ export default defineComponent({
                             const origin = /(localhost|192)/.test(location.host)
                             const origin = /(localhost|192)/.test(location.host)
                               ? 'https://test.gym.lexiaoya.cn'
                               ? 'https://test.gym.lexiaoya.cn'
                               : location.origin;
                               : location.origin;
-                            const src = `${origin}/accompany/#/detail/${m.materialMusicId}?Authorization=${Authorization}`;
+                            const src = `${origin}/${
+                              state.platformType === 'TEACHER'
+                                ? 'accompany-teacher'
+                                : 'accompany'
+                            }/#/detail/${
+                              m.materialMusicId
+                            }?Authorization=${Authorization}`;
                             postMessage({
                             postMessage({
                               api: 'openAccompanyWebView',
                               api: 'openAccompanyWebView',
                               content: {
                               content: {