Merge remote-tracking branch 'origin/hqyDev' into ktyq-online-new

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

@@ -473,6 +473,7 @@ export default defineComponent({
 
     /** 节奏律动 */
     const rhythmBtn = computed(() => {
+      if(state.isCombineRender) return { display: false, disabled: false };
       // 跟练和评测显示
       if (["evaluating", "follow"].includes(state.modeType)) return { display: false, disabled: false, playIng: false };
       // 播放过程中不让切换

src/state.ts

@@ -1616,6 +1616,9 @@ const setState = (data: any, index: number) => {
         }else if(state.banSong){
           state.playType = "sing"
           state.playSource = "background"
+        }else if(state.mingSong){
+          state.playType = "sing"
+          state.playSource = "mingSong"
         }
       }
     }else{

src/view/rhythm/index.tsx

@@ -1,6 +1,6 @@
 import { computed, defineComponent, onMounted, ref, watch } from "vue"
 import styles from "./index.module.less"
-import state from "/src/state"
+import state, { IPlatform } from "/src/state"
 import { headTopData } from "/src/page-instrument/header-top"
 
 export default defineComponent({
@@ -77,12 +77,15 @@ export default defineComponent({
             const element = document.querySelector(".rhythmBox-scale-element") as HTMLElement | null
             if (element) {
                const playBtnEl = document.querySelector("#studnetT-7") as HTMLElement | null
+               const playBtnElClac =
+                  playBtnEl?.getBoundingClientRect()?.[state.platform === IPlatform.PC && state.musicScoreBtnDirection === "left" ? "y" : "x"]
+
                const screenWidth = document.documentElement.clientWidth
                const originalWidth = element.offsetWidth
                // 比较差值，需要计算播放按钮的位置
                let distanceWidth = screenWidth
-               if (playBtnEl) {
-                  distanceWidth = screenWidth - (screenWidth - playBtnEl.getBoundingClientRect().left) * 2
+               if (playBtnElClac && playBtnElClac > 0) {
+                  distanceWidth = screenWidth - (screenWidth - playBtnElClac) * 2
                }
                // 保留2位小数
                const scale = distanceWidth < originalWidth ? Math.floor((distanceWidth / originalWidth) * 100) / 100 : 1