Strona główna Odkrywaj Pomoc
Zaloguj się
huangqiyong
/
classroom
1
0
Forkuj 0
Pliki Problemy 0 Oczekujące zmiany 0 Wiki
Przeglądaj źródła

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

黄琪勇 8 miesięcy temu
rodzic
8192038df5 30fd5b3b4f
commit
603ef9f8d2
19 zmienionych plików z 17 dodań i 9 usunięć
Widok podzielony Pokaż statystyki zmian
  1. 1 1
      .env.devProd
  2. 1 1
      .env.development
  3. 1 1
      .env.production
  4. 1 1
      .env.staging
  5. 0 0
      dist/css/514.6201e6fa.css
  6. 1 0
      dist/css/960.c558f835.css
  7. 0 0
      dist/css/app.3fa2d767.css
  8. 8 0
      dist/index.html
  9. 0 0
      dist/js/179.d9566053.js
  10. 0 0
      dist/js/514.5f74bbe0.js
  11. 1 0
      dist/js/544.346165db.js
  12. 0 0
      dist/js/611.1093dc94.js
  13. 0 0
      dist/js/879.f28154f8.js
  14. 0 0
      dist/js/960.dbe24019.js
  15. 0 0
      dist/js/app.8232cbf4.js
  16. 0 0
      dist/js/app.a965d2c6.js
  17. 0 0
      dist/js/chunk-vendors.027bd478.js
  18. 1 1
      src/views/cloudPractice/useData.ts
  19. 2 4
      src/views/coursewarePlay/coursewarePlay.vue

+ 1 - 1
.env.devProd
Wyświetl plik 

@@ -13,7 +13,7 @@ VUE_APP_WHITEBOARD = "https://test.lexiaoya.cn/whiteboard-noCollab"
 
 VUE_APP_TEACH_GYT = "https://test.lexiaoya.cn/orchestra-music-score/"

 

 #管乐迷 云教练

-VUE_APP_TEACH_GYM ="https://test.gym.lexiaoya.cn/accompany-teacher/"

+VUE_APP_TEACH_GYM ="https://test.gym.lexiaoya.cn/gym-music-score/"

 

 #酷乐秀 云教练

 VUE_APP_TEACH_KLX ="https://test.colexiu.com/accompany/"

+ 1 - 1
.env.development
Wyświetl plik 

@@ -12,7 +12,7 @@ VUE_APP_WHITEBOARD = "https://test.lexiaoya.cn/whiteboard-noCollab"
 
 VUE_APP_TEACH_GYT = "https://test.lexiaoya.cn/orchestra-music-score/"

 

 #管乐迷 云教练

-VUE_APP_TEACH_GYM ="https://test.gym.lexiaoya.cn/accompany-teacher/"

+VUE_APP_TEACH_GYM ="https://test.gym.lexiaoya.cn/gym-music-score/"

 

 #酷乐秀 云教练

 VUE_APP_TEACH_KLX ="https://test.colexiu.com/accompany/"

+ 1 - 1
.env.production
Wyświetl plik 

@@ -12,7 +12,7 @@ VUE_APP_WHITEBOARD = "https://online.lexiaoya.cn/whiteboard-noCollab"
 
 VUE_APP_TEACH_GYT = "https://online.lexiaoya.cn/orchestra-music-score/"

 

 #管乐迷 云教练

-VUE_APP_TEACH_GYM ="https://gym.lexiaoya.cn/accompany-teacher/"

+VUE_APP_TEACH_GYM ="https://gym.lexiaoya.cn/gym-music-score/"

 

 #酷乐秀 云教练

 VUE_APP_TEACH_KLX ="https://online.colexiu.com/accompany/"

+ 1 - 1
.env.staging
Wyświetl plik 

@@ -13,7 +13,7 @@ VUE_APP_WHITEBOARD = "https://test.lexiaoya.cn/whiteboard-noCollab"
 
 VUE_APP_TEACH_GYT = "https://test.lexiaoya.cn/orchestra-music-score/"

 

 #管乐迷 云教练

-VUE_APP_TEACH_GYM ="https://test.gym.lexiaoya.cn/accompany-teacher/"

+VUE_APP_TEACH_GYM ="https://test.gym.lexiaoya.cn/gym-music-score/"

 

 #酷乐秀 云教练

 VUE_APP_TEACH_KLX ="https://test.colexiu.com/accompany/"

Plik diff jest za duży
+ 0 - 0
dist/css/514.6201e6fa.css


Plik diff jest za duży
+ 1 - 0
dist/css/960.c558f835.css


Plik diff jest za duży
+ 0 - 0
dist/css/app.3fa2d767.css


+ 8 - 0
dist/index.html
Wyświetl plik 

@@ -1,6 +1,14 @@
 
 <!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
 
          }</script><script defer="defer" src="/js/chunk-vendors.6b85b8b0.js"></script><script defer="defer" src="/js/app.4aa4ac8e.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 {
 
+=======
 
+<<<<<<< HEAD
 
+         }</script><script defer="defer" src="/js/chunk-vendors.027bd478.js"></script><script defer="defer" src="/js/app.8232cbf4.js"></script><link href="/css/app.3fa2d767.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.a965d2c6.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 {
 
+>>>>>>> 691c2d3258fb2ddb5a8679f84098766bb4dcdb7c
 
+>>>>>>> 30fd5b3b4fa719264b90db27a2ebfe33ecf52933
 
                position: fixed;
 
                left: 50%;
 
                top: 50%;

Plik diff jest za duży
+ 0 - 0
dist/js/179.d9566053.js


Plik diff jest za duży
+ 0 - 0
dist/js/514.5f74bbe0.js


Plik diff jest za duży
+ 1 - 0
dist/js/544.346165db.js


Plik diff jest za duży
+ 0 - 0
dist/js/611.1093dc94.js


Plik diff jest za duży
+ 0 - 0
dist/js/879.f28154f8.js


Plik diff jest za duży
+ 0 - 0
dist/js/960.dbe24019.js


Plik diff jest za duży
+ 0 - 0
dist/js/app.8232cbf4.js


Plik diff jest za duży
+ 0 - 0
dist/js/app.a965d2c6.js


Plik diff jest za duży
+ 0 - 0
dist/js/chunk-vendors.027bd478.js


+ 1 - 1
src/views/cloudPractice/useData.ts
Wyświetl plik 

@@ -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}#/detail/${musicId}?Authorization=${getToken()}&platform=web&part-index=${partIndex}&liveConfig=1&isYjt=1`,
 
+         GYM: `${URL_TEACH_GYM}#/?id=${musicId}&Authorization=${getToken()}&platform=pc&part-index=${partIndex}&isYjt=1`,
 
          KLX: `${URL_TEACH_KLX}?Authorization=${getToken()}&id=${musicId}&limitModel=practice&part-index=${partIndex}&isYjt=1&client=teacher`
 
       }
 
       isPracticeShow.value = true

+ 2 - 4
src/views/coursewarePlay/coursewarePlay.vue
Wyświetl plik 

@@ -176,9 +176,7 @@ 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}#/detail/${
 
-         activeCourseware.value?.content
 
-      }?Authorization=${getToken()}&platform=web&liveConfig=1&isHideBack=true&isYjt=1`,
 
+      GYM: `${URL_TEACH_GYM}#/?id=${activeCourseware.value?.content}&Authorization=${getToken()}&platform=pc&isHideBack=true&isYjt=1`,
 
       KLX: `${URL_TEACH_KLX}?Authorization=${getToken()}&id=${
 
          activeCourseware.value?.content
 
       }&isHideBack=true&limitModel=practice&isYjt=1&client=teacher`
 
@@ -524,7 +522,7 @@ function handleGoPracticeBtn(activeCoursewareResourceId: string) {
 
    //  GYM,GYT,KLX 区分   云教练
 
    const urlObj = {
 
       GYT: `${URL_TEACH_GYT}?id=${activeCoursewareResourceId}&modelType=practice&modeType=json&Authorization=${getToken()}&isYjt=1&&isHideBack=false`,
 
-      GYM: `${URL_TEACH_GYM}#/detail/${activeCoursewareResourceId}?Authorization=${getToken()}&platform=web&liveConfig=1&isYjt=1`,
 
+      GYM: `${URL_TEACH_GYM}#/?id=${activeCoursewareResourceId}&Authorization=${getToken()}&platform=pc&isYjt=1`,
 
       KLX: `${URL_TEACH_KLX}?Authorization=${getToken()}&id=${activeCoursewareResourceId}&limitModel=practice&isYjt=1&client=teacher`
 
    }
 
    isPracticeShow.value = true

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików