Browse Source

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

lex-xin 10 months ago
parent
commit
1c1e9bfefe

File diff suppressed because it is too large
+ 0 - 0
dist/css/563.fe4ea2f7.css


+ 1 - 1
dist/index.html

@@ -1,6 +1,6 @@
 <!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"
-         }</script><script defer="defer" src="/js/chunk-vendors.469b8874.js"></script><script defer="defer" src="/js/app.345120fd.js"></script><link href="/css/app.b8c0c2c8.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.469b8874.js"></script><script defer="defer" src="/js/app.fd2164c4.js"></script><link href="/css/app.b8c0c2c8.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 {
                position: fixed;
                left: 50%;
                top: 50%;

File diff suppressed because it is too large
+ 0 - 0
dist/js/117.e1dd8517.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/563.3ae86c56.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/app.fd2164c4.js


BIN
src/img/coursewarePlay/goPracticeBtn.png


+ 5 - 5
src/views/coursewarePlay/coursewarePlay.vue

@@ -161,9 +161,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}?Authorization=${getToken()}&platform=web&liveConfig=1#/detail/${
+      GYM: `${URL_TEACH_GYM}#/detail/${
          activeCourseware.value?.content
-      }?isHideBack=trueis&Yjt=1`,
+      }?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`
    }
    return urlObj[userStoreHook.roles!]
@@ -407,7 +407,7 @@ function handleGoPracticeBtn(activeCoursewareResourceId: string) {
    //  GYM,GYT,KLX 区分   云教练
    const urlObj = {
       GYT: `${URL_TEACH_GYT}?id=${activeCoursewareResourceId}&modelType=practice&modeType=json&Authorization=${getToken()}&isYjt=1`,
-      GYM: `${URL_TEACH_GYM}?Authorization=${getToken()}&platform=web&liveConfig=1#/detail/${activeCoursewareResourceId}?isYjt=1`,
+      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`
    }
    window.open(urlObj[userStoreHook.roles!], "_blank")
@@ -434,7 +434,7 @@ function handleGoPracticeBtn(activeCoursewareResourceId: string) {
          transform: translateY(-100%);
       }
       .goPracticeBtn {
-         transform: translatex(135px);
+         transform: translatex(-135px);
       }
    }
    &.fileType_song.hideController {
@@ -541,7 +541,7 @@ function handleGoPracticeBtn(activeCoursewareResourceId: string) {
    }
    .goPracticeBtn {
       position: absolute;
-      right: 30px;
+      left: 30px;
       bottom: 124px;
       width: 178px;
       height: 64px;

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