Browse Source

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

黄琪勇 8 months ago
parent
commit
91980ffd9a

+ 1 - 0
src/libs/axios.ts

@@ -56,6 +56,7 @@ class HttpAsynAxios {
             response.data.msg && (response.data.message = response.data.msg)
             //如果返回401则跳转到登录页
             if (response.data.code === CODE401) {
+               response.data.message = "登录过期,请重新登录" // 自定义接口返回错误
                //如果token登录状态 才提示和退出
                if (TokenInvalidFlag) {
                   const responseData: apiResDataType = response.data

+ 1 - 1
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}#/detail/${musicId}?Authorization=${getToken()}&platform=web&part-index=${partIndex}&liveConfig=1&isYjt=1`,
-         KLX: `${URL_TEACH_KLX}??Authorization=${getToken()}&id=${musicId}&limitModel=practice&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
       practiceUrl.value = urlObj[userStoreHook.roles!]

+ 4 - 2
src/views/coursewarePlay/coursewarePlay.vue

@@ -166,7 +166,9 @@ const songPlaySrc = computed<string>(() => {
       GYM: `${URL_TEACH_GYM}#/detail/${
          activeCourseware.value?.content
       }?Authorization=${getToken()}&platform=web&liveConfig=1&isHideBack=true&isYjt=1`,
-      KLX: `${URL_TEACH_KLX}??Authorization=${getToken()}&id=${activeCourseware.value?.content}&isHideBack=true&limitModel=practice&isYjt=1`
+      KLX: `${URL_TEACH_KLX}?Authorization=${getToken()}&id=${
+         activeCourseware.value?.content
+      }&isHideBack=true&limitModel=practice&isYjt=1&client=teacher`
    }
    return urlObj[userStoreHook.roles!]
 })
@@ -412,7 +414,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}#/detail/${activeCoursewareResourceId}?Authorization=${getToken()}&platform=web&liveConfig=1&isYjt=1`,
-      KLX: `${URL_TEACH_KLX}??Authorization=${getToken()}&id=${activeCoursewareResourceId}&limitModel=practice&isYjt=1`
+      KLX: `${URL_TEACH_KLX}?Authorization=${getToken()}&id=${activeCoursewareResourceId}&limitModel=practice&isYjt=1&client=teacher`
    }
    isPracticeShow.value = true
    practiceUrl.value = urlObj[userStoreHook.roles!]