Merge branch 'feature-tianyong-newVersion' into ktyq-test-new

src/view/fingering/fingering-relationships.ts

@@ -325,7 +325,8 @@ const relationships = {
 		30: [1, 5, 6],
 		31: [4, 5, 3],
 		32: [4, 2, 3],
-		33: [4, 2, 6],
+		// 33: [4, 2, 6],
+		33: [1, 5, 3],
 		34: [1, 2, 3],
 		35: [4, 5, 6],
 		36: [4, 2, 6],

src/view/fingering/index.tsx

@@ -18,7 +18,7 @@ export default defineComponent({
       // 葫芦丝的指法，云教练页面和听音练习页面，展示的不一样，需要区分
       const source = state.fingeringInfo.name === 'hulusi-flute' ? 'musicDetail' : '';
       fingerData.subject = await getFingeringConfig(state.fingeringInfo.name, source);
-      console.log("🚀 ~ fingerData.subject:", fingerData.subject);
+      console.log("🚀 ~ fingerData.subject:", fingerData.subject,state.fingeringInfo.name);
     };
     onBeforeMount(() => {
       getFingeringData();
@@ -51,7 +51,7 @@ export default defineComponent({
       doubeClick
     })
     return () => {
-      // console.log("音高", realKey.value);
+      // console.log("音符指法音高", realKey.value);
       const relationship = fingerData.subject?.relationship?.[realKey.value] || [];
       const rs: number[] = Array.isArray(relationship[1]) ? relationship[fingerData.relationshipIndex] : relationship;
       const canTizhi = Array.isArray(relationship[1]);

src/view/music-score/index.tsx

@@ -69,6 +69,7 @@ export default defineComponent({
 		},		
 	},
 	setup(props, { emit, slots, expose }) {
+		(window as any).DYhideTrackTune = false;
 		const query: any = getQuery();
 		/** 设置 曲谱模式,五线谱还是简谱 */
 		const setRenderType = () => {