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

.env.devProd

@@ -16,4 +16,4 @@ VUE_APP_TEACH_GYT = "https://test.lexiaoya.cn/orchestra-music-score/"
 VUE_APP_TEACH_GYM ="https://test.gym.lexiaoya.cn/gym-music-score/"
 
 #酷乐秀 云教练
-VUE_APP_TEACH_KLX ="https://test.colexiu.com/accompany/"
+VUE_APP_TEACH_KLX ="https://test.colexiu.com/klx-music-score/"

.env.development

@@ -15,4 +15,4 @@ VUE_APP_TEACH_GYT = "https://test.lexiaoya.cn/orchestra-music-score/"
 VUE_APP_TEACH_GYM ="https://test.gym.lexiaoya.cn/gym-music-score/"
 
 #酷乐秀 云教练
-VUE_APP_TEACH_KLX ="https://test.colexiu.com/accompany/"
+VUE_APP_TEACH_KLX ="https://test.colexiu.com/klx-music-score/"

.env.production

@@ -15,4 +15,4 @@ VUE_APP_TEACH_GYT = "https://online.lexiaoya.cn/orchestra-music-score/"
 VUE_APP_TEACH_GYM ="https://gym.lexiaoya.cn/gym-music-score/"
 
 #酷乐秀 云教练
-VUE_APP_TEACH_KLX ="https://online.colexiu.com/accompany/"
+VUE_APP_TEACH_KLX ="https://online.colexiu.com/klx-music-score/"

.env.staging

@@ -16,4 +16,4 @@ VUE_APP_TEACH_GYT = "https://test.lexiaoya.cn/orchestra-music-score/"
 VUE_APP_TEACH_GYM ="https://test.gym.lexiaoya.cn/gym-music-score/"
 
 #酷乐秀 云教练
-VUE_APP_TEACH_KLX ="https://test.colexiu.com/accompany/"
+VUE_APP_TEACH_KLX ="https://test.colexiu.com/klx-music-score/"

src/views/cloudPractice/cloudPractice.tsx

@@ -1034,12 +1034,15 @@ export default defineComponent({
 
       // 根据当前选中的声部和曲目筛选出对应的声轨
       async function filterSoundCodes() {
+         const { id } = state.list[state.listActive] || {}
+         if (!id) {
+            return undefined
+         }
          const { instrumentIds } =
             state.subjectList.find((item: any) => {
                return item.value === state.subjectId
             }) || {}
          if (instrumentIds) {
-            const { id } = state.list[state.listActive] || {}
             //  GYM,GYT,KLX 区分   查询声部数据
             let cbsDetails: any = []
             if (userStoreHook.roles === "GYM") {

src/views/cloudPractice/useData.ts

@@ -26,7 +26,7 @@ export const useFunction = () => {
       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&isHideMusicList=true&systemType=teacher`,
-         KLX: `${URL_TEACH_KLX}?Authorization=${getToken()}&id=${musicId}&limitModel=practice&part-index=${partIndex}&isYjt=1&client=teacher`
+         KLX: `${URL_TEACH_KLX}#/?id=${musicId}&Authorization=${getToken()}&platform=pc&part-index=${partIndex}&isYjt=1&isHideMusicList=true&systemType=teacher`
       }
       isPracticeShow.value = true
       practiceUrl.value = urlObj[userStoreHook.roles!]
@@ -42,7 +42,7 @@ export const useFunction = () => {
       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}?t=${Date.now()}#/?id=${musicId}&Authorization=${getToken()}&part-index=${partIndex}&isPreView=true&systemType=teacher`,
-         KLX: `${URL_TEACH_KLX}?Authorization=${getToken()}&id=${musicId}&limitModel=practice&part-index=${partIndex}&isYjt=1&client=teacher`
+         KLX: `${URL_TEACH_KLX}?t=${Date.now()}#/?id=${musicId}&Authorization=${getToken()}&part-index=${partIndex}&isPreView=true&systemType=teacher`
       }
       return urlObj[userStoreHook.roles!]
    }

src/views/coursewarePlay/coursewarePlay.vue

@@ -179,9 +179,9 @@ const songPlaySrc = computed<string>(() => {
       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=${
+      KLX: `${URL_TEACH_KLX}#/?id=${
          activeCourseware.value?.content
-      }&isHideBack=true&limitModel=practice&isYjt=1&client=teacher`
+      }&Authorization=${getToken()}&platform=pc&isHideBack=true&isHideMusicList=true&isYjt=1&systemType=teacher`
    }
    return urlObj[userStoreHook.roles!]
 })
@@ -529,7 +529,7 @@ function handleGoPracticeBtn(activeCoursewareResourceId: string) {
    const urlObj = {
       GYT: `${URL_TEACH_GYT}?id=${activeCoursewareResourceId}&modelType=practice&modeType=json&Authorization=${getToken()}&isYjt=1&&isHideBack=false`,
       GYM: `${URL_TEACH_GYM}#/?id=${activeCoursewareResourceId}&Authorization=${getToken()}&platform=pc&isYjt=1&systemType=teacher&isHideMusicList=true`,
-      KLX: `${URL_TEACH_KLX}?Authorization=${getToken()}&id=${activeCoursewareResourceId}&limitModel=practice&isYjt=1&client=teacher`
+      KLX: `${URL_TEACH_KLX}#/?id=${activeCoursewareResourceId}&Authorization=${getToken()}&platform=pc&isYjt=1&systemType=teacher&isHideMusicList=true`
    }
    isPracticeShow.value = true
    practiceUrl.value = urlObj[userStoreHook.roles!]