fix: 老师端云教练bug修复

public/flexible.js

@@ -7,10 +7,10 @@
     b / i < 375 && (b = 375 * i);
     var c = b / 10;
     // 老师端，fontsize计算
-    if (window.location.search.includes('platform=pc') || window.location.search.includes('platform=PC')) {
-      c = width / 21.7;
-    }
-    console.log('fontSize:',c,'屏幕宽度:',width,'老师端:',window.location.search.includes('platform=pc'))
+    // if (window.location.search.includes('platform=pc') || window.location.search.includes('platform=PC')) {
+    //   c = width / 21.7;
+    // }
+    // console.log('fontSize:',c,'屏幕宽度:',width,'老师端:',window.location.search.includes('platform=pc'))
     f.style.fontSize = c + "px", k.rem = a.rem = c
     window.fontSize = c
   }

src/page-instrument/header-top/index.module.less

@@ -195,13 +195,13 @@
     }
 
     &.playLeftButton {
-        left: 32px !important;
+        left: 46px !important;
         right: auto !important;
         bottom: 12px !important;
     }
 
     &.playRightButton {
-        right: 32px !important;
+        right: 46px !important;
         left: auto !important;
         bottom: 12px !important;
     }

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

@@ -303,11 +303,12 @@ export default defineComponent({
       if (res?.data?.api === "imagePos") {
         if (res?.data.data) {
           state.playBtnDirection = res.data.data === 'right' ? 'right' : 'left';
-          if (state.fingeringInfo.direction === "vertical" && state.setting.displayFingering) {
-            state.musicScoreBtnDirection = state.playBtnDirection === 'right' ? 'left' : 'right';
-          } else {
-            state.musicScoreBtnDirection = state.playBtnDirection;
-          }
+          // if (state.fingeringInfo.direction === "vertical" && state.setting.displayFingering) {
+          //   state.musicScoreBtnDirection = state.playBtnDirection === 'right' ? 'left' : 'right';
+          // } else {
+          //   state.musicScoreBtnDirection = state.playBtnDirection;
+          // }
+          state.musicScoreBtnDirection = state.playBtnDirection;
         }
       }
     };

src/page-instrument/view-detail/index.module.less

@@ -69,6 +69,7 @@
     }
     .pcContainer {
         height: calc(100vh - var(--header-height) - var(--pc-header-height));
+        margin: 0 24px;
     }
 }
 

src/page-instrument/view-detail/index.tsx

@@ -198,11 +198,12 @@ export default defineComponent({
       // api_cloudLoading();
       state.playBtnDirection = query.imagePos === 'right' ? 'right' : 'left';
       state.isAttendClass = (query.imagePos === 'left' || query.imagePos === 'right') ? true : false;
-      if (state.fingeringInfo.direction === "vertical" && state.setting.displayFingering) {
-        state.musicScoreBtnDirection = state.playBtnDirection === 'right' ? 'left' : 'right';
-      } else {
-        state.musicScoreBtnDirection = state.playBtnDirection;
-      }
+      // if (state.fingeringInfo.direction === "vertical" && state.setting.displayFingering) {
+      //   state.musicScoreBtnDirection = state.playBtnDirection === 'right' ? 'left' : 'right';
+      // } else {
+      //   state.musicScoreBtnDirection = state.playBtnDirection;
+      // }
+      state.musicScoreBtnDirection = state.playBtnDirection;
       state.musicRendered = true;
 
       evaluatCreateMusicPlayer();
@@ -229,15 +230,15 @@ export default defineComponent({
           if (state.platform === IPlatform.PC) {
             return {
               container: {
-                paddingRight: state.playBtnDirection === "left" ? "initial" : state.fingeringInfo.width,
-                paddingLeft: state.playBtnDirection === "left" ? state.fingeringInfo.width : "initial",
+                paddingRight: state.playBtnDirection === "right" ? "initial" : state.fingeringInfo.width,
+                paddingLeft: state.playBtnDirection === "right" ? state.fingeringInfo.width : "initial",
               },
               fingerBox: {
                 position: "absolute",
                 width: state.fingeringInfo.width,
                 height: "100%",
-                right: state.playBtnDirection === "left" ? "initial" : 0,
-                left: state.playBtnDirection === "left" ? 0 : "initial",
+                right: state.playBtnDirection === "right" ? "initial" : 0,
+                left: state.playBtnDirection === "right" ? 0 : "initial",
                 top: 0,
               },
             };
@@ -269,11 +270,12 @@ export default defineComponent({
       () => {
         if (state.fingeringInfo.direction === "vertical") {
           
-          if (state.setting.displayFingering) {
-            state.musicScoreBtnDirection = state.playBtnDirection === 'left' ? 'right' : 'left'
-          } else {
-            state.musicScoreBtnDirection = state.playBtnDirection
-          }
+          // if (state.setting.displayFingering) {
+          //   state.musicScoreBtnDirection = state.playBtnDirection === 'left' ? 'right' : 'left'
+          // } else {
+          //   state.musicScoreBtnDirection = state.playBtnDirection
+          // }
+          state.musicScoreBtnDirection = state.playBtnDirection
           nextTick(() => {
             resetMusicScore();
           });

src/view/music-score/index.tsx

@@ -116,14 +116,14 @@ export default defineComponent({
 			// osmd.EngravingRules.CompactMode = true // 紧凑模式
 			osmd.EngravingRules.PageRightMargin = state.isSingleLine ? (window.innerWidth+200)/10 : 2;
 			osmd.EngravingRules.FixedMeasureWidth = state.isSingleLine ? true : false; // 是否固定小节的宽度（小节同一宽度渲染）
-			osmd.EngravingRules.PageTopMargin = state.platform === IPlatform.PC ? 6 : 10; // 老师端顶部间距
+			osmd.EngravingRules.PageTopMargin = state.platform === IPlatform.PC ? 8 : 10; // 老师端顶部间距
 			osmd.EngravingRules.PageTopMarginNarrow = 3;
 			osmd.EngravingRules.PageLeftMargin = 2;
 			// 老师端上课页面，左右两边有功能按钮，所以左右边距需要加大
-			if (state.isAttendClass && state.platform === IPlatform.PC) {
-				osmd.EngravingRules.PageLeftMargin = 7;
-				osmd.EngravingRules.PageRightMargin = 7;
-			}
+			// if (state.isAttendClass && state.platform === IPlatform.PC) {
+			// 	osmd.EngravingRules.PageLeftMargin = 7;
+			// 	osmd.EngravingRules.PageRightMargin = 7;
+			// }
 			osmd.EngravingRules.PageBottomMargin = state.platform === IPlatform.PC ? 1 : 2;
 			osmd.EngravingRules.DYMusicScoreType =
 				state.musicRenderType === EnumMusicRenderType.staff ? "staff" : "jianpu";

src/view/plugins/useDrag/index.module.less

@@ -1,6 +1,6 @@
 .dragBom {
   width: 100%;
-  height: 20px;
+  height: 10px;
   display: flex;
   justify-content: space-between;
   // border-radius: 0 0 8px 8px;
@@ -8,8 +8,10 @@
   position: absolute;
   bottom: 0;
   .box {
+    position: relative;
+    bottom: 10px;
     width: 20px;
-    height: 100%;
+    height: 20px;
     background: url('./img/left.png') no-repeat;
     background-size: 100% 100%;
     border-bottom-left-radius: 16Px;