fix: bug修改

src/page-instrument/custom-plugins/guide-driver/index.less

@@ -473,8 +473,8 @@
 }
 
 .popoverClassER2 {
-  width: 261px;
-  height: 226px;
+  width: 260px;
+  height: 160px;
   background: url("./images/evaluating/r2.png") no-repeat center;
   background-size: contain;
 
@@ -486,7 +486,7 @@
 
 .popoverClassER3 {
   width: 261px;
-  height: 249px;
+  height: 181px;
   background: url("./images/evaluating/r3.png") no-repeat center;
   background-size: contain;
 
@@ -498,7 +498,7 @@
 
 .popoverClassER4 {
   width: 327px;
-  height: 246px;
+  height: 181px;
   background: url("./images/evaluating/r4.png") no-repeat center;
   background-size: contain;
 

src/page-instrument/custom-plugins/guide-driver/index.tsx

@@ -58,7 +58,7 @@ export const PractiseDriver = defineComponent({
     };
 
     const driverOptions = (): Config => {
-      let length = 11;
+      let length = 10;
 
       if (!props.statusAll.playBtnStatus) {
         length -= 1;
@@ -69,9 +69,9 @@ export const PractiseDriver = defineComponent({
       }
 
       // 显示指法
-      if (!state.setting.displayFingering) {
-        length -= 1;
-      }
+      // if (!state.setting.displayFingering) {
+      //   length -= 1;
+      // }
 
       // 声部
       if (!props.statusAll.subjectStatus) {
@@ -132,7 +132,7 @@ export const PractiseDriver = defineComponent({
         });
       }
 
-      if (props.statusAll.modeType) {
+      if (props.statusAll.modelTypeStatus) {
         options.steps?.push({
           element: ".driver-9",
           popover: {

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

@@ -1001,7 +1001,7 @@ export default defineComponent({
           />
         )}
         {/* 跟练模式功能引导 加载音频完成 不是会员 */}
-        {state.modeType === "follow" && headTopData.modeType !== "init" && !query.isCbs && state.audioDone && !state.isLoading && !state.isVip && showWebGuide.value && (
+        {state.modeType === "follow" && headTopData.modeType !== "init" && !followData.earphone && !query.isCbs && state.audioDone && !state.isLoading && !state.isVip && showWebGuide.value && (
           <FollowDriver
             statusAll={{
               subjectStatus: state.musicRendered && !query.lessonTrainingId && !query.questionId && state.isConcert,

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

@@ -170,6 +170,8 @@ export default defineComponent({
       //   getMusicInfo(values[0]);
       // });
       window.addEventListener('message', changePlay)
+      const guideInfoStore = localStorage.getItem('guideInfo') ? JSON.parse(localStorage.getItem('guideInfo')) : {};
+      state.guideInfo = guideInfoStore
       try { 
         await getMusicDetail(id);
       } catch (err) {
@@ -339,6 +341,8 @@ export default defineComponent({
     /** 指法配置 */
     const fingerConfig = computed<any>(() => {
       if (state.setting.displayFingering && state.fingeringInfo?.name) {
+        // 横向指法
+        console.log("横向指法", state.fingeringInfo.name);
         if (state.fingeringInfo.direction === "transverse") {
           return {
             container: {
@@ -357,7 +361,7 @@ export default defineComponent({
             }
           };
         } else {
-          console.log("指法", state.playBtnDirection, state.platform);
+          console.log("竖向指法", state.fingeringInfo.name, state.playBtnDirection, state.platform);
           // 老师端，竖向指法，需要根据功能按钮方向进行设置
           if (state.platform === IPlatform.PC) {
             return {
@@ -371,7 +375,7 @@ export default defineComponent({
                 height: state.fingeringInfo.name === "hulusi-flute" ? "86%" : "80%",
                 right: state.playBtnDirection === "right" ? "initial" : 0,
                 left: state.playBtnDirection === "right" ? 0 : "initial",
-                top: (state.fingeringInfo.name === "ocarina" || state.fingeringInfo.name === "whistling") ? "60px" : state.fingeringInfo.name === "hulusi-flute" ? "10px" : (state.fingeringInfo.name === "baroque-recorder" || state.fingeringInfo.name === "piccolo") ? "36px" : 0,
+                top: (state.fingeringInfo.name === "ocarina" || state.fingeringInfo.name === "whistling") ? "60px" : state.fingeringInfo.name === "hulusi-flute" ? "10px" : (state.fingeringInfo.name === "baroque-recorder" || state.fingeringInfo.name === "piccolo") ? "36px" : "10%",
               },
             };
           } else {
@@ -384,7 +388,7 @@ export default defineComponent({
                 width: state.fingeringInfo.width,
                 height: state.fingeringInfo.name === "hulusi-flute" ? "86%" : "80%",
                 left: 0,
-                top: (state.fingeringInfo.name === "ocarina" || state.fingeringInfo.name === "whistling") ? "60px" : state.fingeringInfo.name === "hulusi-flute" ? "10px" : (state.fingeringInfo.name === "baroque-recorder" || state.fingeringInfo.name === "piccolo") ? "36px" : 0,
+                top: (state.fingeringInfo.name === "ocarina" || state.fingeringInfo.name === "whistling") ? "60px" : state.fingeringInfo.name === "hulusi-flute" ? "10px" : (state.fingeringInfo.name === "baroque-recorder" || state.fingeringInfo.name === "piccolo") ? "36px" : "10%",
               },
             };
           }

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

@@ -1058,6 +1058,12 @@
     // }
 }
 
+.speImgs {
+    &>img {
+      height: inherit;
+    }
+}
+
 .fingeringPointSection {
     position: absolute;
     left: 50%;

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

@@ -1337,7 +1337,7 @@ export default defineComponent({
                   }}
                   class={[styles.fingeringContainer]}
                 >
-                  <div class={styles.imgs}>
+                  <div class={[styles.imgs, state.fingeringInfo.name === 'trombone' && styles.speImgs]}>
                     {!data.loadingImg && <img id="fullInstrumentImg" src={data.fingeringMode === "scaleMode" ? fingerData.subject?.json?.full : fingerData.subject?.json?.full1} />}
 
                     {rs.map((key: number | string, index: number) => {

src/view/fingering/fingering-config.ts

@@ -407,7 +407,7 @@ export const subjectFingering = (subjectId: number | string): IFingering => {
       return {
         name: "trumpet",
         direction: "transverse",
-        height: "1.6rem",
+        height: "2.4rem",
         scaleData: {
           scale: "0.8",
           offset: "3.64rem"
@@ -427,7 +427,7 @@ export const subjectFingering = (subjectId: number | string): IFingering => {
       return {
         name: "trombone",
         direction: "transverse",
-        height: "1.6rem",
+        height: "2.4rem",
         scaleData: {
           scale: "0.8",
           offset: "3.64rem"

src/view/fingering/index.module.less

@@ -66,6 +66,12 @@
   }
 }
 
+.speImgs {
+  &>img {
+    height: inherit;
+  }
+}
+
 .rightContent {
   display: flex;
   flex-direction: column;

src/view/fingering/index.tsx

@@ -57,7 +57,7 @@ export default defineComponent({
         <>
           {state.fingeringInfo.direction === "transverse" ? (
             <div onClick={() => doubeClick()} class={[styles.fingeringContainer]}>
-              <div class={styles.imgs}>
+              <div class={[styles.imgs, state.fingeringInfo.name === 'trombone' && styles.speImgs]}>
                 <img class="driver-7" src={fingerData.subject?.json?.full} />
                 {rs.map((key: number | string, index: number) => {
                   const nk: string = typeof key === "string" ? key.replace("active-", "") : String(key);