Bladeren bron

Merge branch 'dev' of http://git.dayaedu.com/huangqiyong/classroom

黄琪勇 7 maanden geleden
bovenliggende
commit
21be7eaed6

File diff suppressed because it is too large
+ 1 - 0
dist/css/466.6cadfc9e.css


File diff suppressed because it is too large
+ 1 - 0
dist/css/92.1a931338.css


+ 7 - 0
dist/index.html

@@ -1,10 +1,17 @@
 <!doctype html><html lang=""><head><meta charset="utf-8"/><meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="renderer" content="webkit"/><meta name="force-rendering" content="webkit"/><link rel="icon" href="/favicon.ico"/><title>乐教通</title><script>if (!!window.ActiveXObject || "ActiveXObject" in window) {
             window.location.href = "./ieIncompatible/index.html"
 <<<<<<< HEAD
+<<<<<<< HEAD
          }</script><script defer="defer" src="/js/chunk-vendors.e1ccbebf.js"></script><script defer="defer" src="/js/app.cfb5de09.js"></script><link href="/css/app.2ae84a6b.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but classroom doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"><style>.firstLoading {
 =======
          }</script><script defer="defer" src="/js/chunk-vendors.7f7844aa.js"></script><script defer="defer" src="/js/app.1d556277.js"></script><link href="/css/app.2ae84a6b.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but classroom doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"><style>.firstLoading {
 >>>>>>> iteration-temp-http
+=======
+         }</script><script defer="defer" src="/js/chunk-vendors.7f7844aa.js"></script><script defer="defer" src="/js/app.1d556277.js"></script><link href="/css/app.2ae84a6b.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but classroom doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"><style>.firstLoading {
+=======
+         }</script><script defer="defer" src="/js/chunk-vendors.e1ccbebf.js"></script><script defer="defer" src="/js/app.cfb5de09.js"></script><link href="/css/app.2ae84a6b.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but classroom doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"><style>.firstLoading {
+>>>>>>> 9c7d6e847cf1a3bf07caf6627b37638f0295880f
+>>>>>>> 1d38618eebee917f87ddc1f29f55621750878373
                position: fixed;
                left: 50%;
                top: 50%;

+ 1 - 1
src/views/cloudPractice/useData.ts

@@ -25,7 +25,7 @@ export const useFunction = () => {
       //  GYM,GYT,KLX 区分   云教练
       const urlObj = {
          GYT: `${URL_TEACH_GYT}?id=${musicId}&modelType=practice&modeType=json&part-index=${partIndex}&Authorization=${getToken()}&isYjt=1&&isHideBack=false`,
-         GYM: `${URL_TEACH_GYM}#/?id=${musicId}&Authorization=${getToken()}&platform=pc&part-index=${partIndex}&isYjt=1`,
+         GYM: `${URL_TEACH_GYM}#/?id=${musicId}&Authorization=${getToken()}&platform=pc&part-index=${partIndex}&isYjt=1&isHideMusicList=true&systemType=teacher`,
          KLX: `${URL_TEACH_KLX}?Authorization=${getToken()}&id=${musicId}&limitModel=practice&part-index=${partIndex}&isYjt=1&client=teacher`
       }
       isPracticeShow.value = true

+ 3 - 1
src/views/coursewarePlay/coursewarePlay.vue

@@ -176,7 +176,9 @@ const songPlaySrc = computed<string>(() => {
    //  GYM,GYT,KLX 区分   云教练
    const urlObj = {
       GYT: `${URL_TEACH_GYT}?id=${activeCourseware.value?.content}&modelType=practice&modeType=json&Authorization=${getToken()}&isYjt=1`,
-      GYM: `${URL_TEACH_GYM}#/?id=${activeCourseware.value?.content}&Authorization=${getToken()}&platform=pc&isHideBack=true&isYjt=1`,
+      GYM: `${URL_TEACH_GYM}#/?id=${
+         activeCourseware.value?.content
+      }&Authorization=${getToken()}&platform=pc&isHideBack=true&isHideMusicList=true&isYjt=1&systemType=teacher`,
       KLX: `${URL_TEACH_KLX}?Authorization=${getToken()}&id=${
          activeCourseware.value?.content
       }&isHideBack=true&limitModel=practice&isYjt=1&client=teacher`

Some files were not shown because too many files changed in this diff