Merge branch 'feature-tianyong' into gym-online

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

@@ -437,7 +437,8 @@ export default defineComponent({
       if (headTopData.modeType !== "show" || !headTopData.showBack) return { display: false, disabled: false };
       // 跟练开始, 评测开始 播放开始 隐藏
       if (state.playState == "play" || followData.start || evaluatingData.startBegin) return { display: true, disabled: true };
-
+      // 课件播放，上课页面潜入云教练，不显示模式切换
+      if (query.hideMode == 1) return { display: false, disabled: false };
       return {
         display: true,
         disabled: false,

src/state.ts

@@ -1820,7 +1820,9 @@ const setState = (data: any, index: number) => {
   state.platform = query.platform?.toLocaleUpperCase() || "";
   if (state.platform === IPlatform.PC || state.systemType === 'web') {
     // pc端，谱面默认初始大小设置为1.5
-    state.zoom = 1.5;
+    if (state.platform === IPlatform.PC) {
+      state.zoom = 1.5;
+    }
     if (query.zoom <= 1) {
       state.zoom = query.zoom ? Number(query.zoom) : state.zoom;
     } else {
@@ -1835,6 +1837,10 @@ const setState = (data: any, index: number) => {
   if (state.isPreView) {
     state.zoom = query.zoom ? Number(query.zoom) : state.zoom;
   }
+  // 评测报告取默认谱面大小
+  if (state.isEvaluatReport) {
+    state.zoom = 0.8
+  }
   /**
    * 默认渲染什么谱面类型 & 能否转谱逻辑
    * 渲染类型：首先取url参数musicRenderType，没有该参数则取musicalInstruments字段匹配的当前分轨的defaultScore，没有匹配到则取默认值（'firstTone'）