Explorar o código

Merge branch 'feature-tianyong' into klx-test

TIANYONG hai 7 meses
pai
achega
deea4365fb

+ 2 - 2
src/page-instrument/header-top/index.tsx

@@ -462,8 +462,8 @@ export default defineComponent({
     });
     /** 模式切换按钮 */
     const toggleBtn = computed(() => {
-      // 乐教通不限
-      if (query["isYjt"] == "1") return { display: false, disabled: false };
+      // 乐教通不限和后台预览
+      if (query["isYjt"] == "1" || state.systemType === 'web') return { display: false, disabled: false };
       // 老师端,打击乐&节奏练习不显示
       if (state.isPercussion && state.platform === IPlatform.PC) return { display: false, disabled: false };
       if(state.isCombineRender) return { display: false, disabled: false };

+ 1 - 0
src/page-instrument/view-detail/index.module.less

@@ -142,6 +142,7 @@
 
     #osmdCanvasPage1 {
         //padding-bottom: 60px;
+        z-index: 1 !important;
     }
 }
 

+ 10 - 0
src/state.ts

@@ -628,6 +628,16 @@ export const customData = reactive({
 export const setStep = () => {
   // console.log('播放状态',state.playState)
   if (state.playState !== "play") {
+    // TODO:bug:11905,ios白屏偶现问题
+    if (storeData.isApp && (browserInfo.ios || browserInfo.iPhone) ) {
+      const osmdDom = document.getElementById('osmdCanvasPage1')
+      if (osmdDom) {
+        osmdDom.style.zIndex = '0';
+        requestAnimationFrame(() => {
+          osmdDom.style.zIndex = '1';
+        })
+      }
+    }
     console.log("暂停播放");
     return;
   }