Sfoglia il codice sorgente

fix: #8851,#8855,#8852bug修复

TIANYONG 1 anno fa
parent
commit
5f02817f7f

+ 5 - 4
src/page-instrument/header-top/index.tsx

@@ -353,9 +353,10 @@ export default defineComponent({
               </span>
             </div>
             {state.musicRendered && !query.lessonTrainingId && !query.questionId && state.isConcert && (
-              <div class={[styles.btn]} onClick={() => {
-                toggleMusicSheet.toggle(true)
-              }}>
+              <div class={[styles.btn, (state.playState === "play" && fingeringBtn.value.disabled) && styles.disabled]} 
+                onClick={() => {
+                  toggleMusicSheet.toggle(true)
+                }}>
                 <img class={styles.iconBtn} src={headImg(`shenggui.svg`)} />
                 <span>声轨</span>
               </div>
@@ -373,7 +374,7 @@ export default defineComponent({
               <span>{state.playSource === "music" ? "原声" : "伴奏"}</span>
             </div>
             <div
-              class={styles.btn}
+              class={[styles.btn, (state.playState === "play" && fingeringBtn.value.disabled) && styles.disabled]}
               onClick={async () => {
                 metronomeData.disable = !metronomeData.disable;
                 metronomeData.metro?.initPlayer();

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

@@ -110,7 +110,7 @@ export default defineComponent({
     /** 获取曲谱数据 */
     const getMusicInfo = (res: any) => {
       const index = query["part-index"] ? parseInt(query["part-index"] as string) : 0;
-      const musicData = res.data.background[index] || {};
+      const musicData = res.data.background?.[index] || {};
       const musicInfo = {
         ...res.data,
         music: musicData.audioFileUrl || res.data.audioFileUrl,

+ 1 - 0
src/view/fingering/fingering-config.ts

@@ -134,6 +134,7 @@ export const mappingVoicePart = (
 		let code = id;
 		const subject: { [_key: string | number]: any } = {
 			"Piccolo": "piccolo",
+			"Flute": 2,
 			"Flute 1": 2,
 			"Flute 2": 2,
 			"Oboe": 4,

+ 1 - 1
src/view/plugins/toggleMusicSheet/choosePartName/index.tsx

@@ -34,7 +34,7 @@ export default defineComponent({
     return () => (
       <div class={styles.container}>
         <div class={styles.top}>
-          <div class={styles.title}>请选择您练习的乐器2</div>
+          <div class={styles.title}>请选择您练习的乐器</div>
           <Icon name="cross" size={24} onClick={() => emit('close')} />
         </div>
         <Picker