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

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

@@ -46,12 +46,13 @@
     .img{
         width: 32px;
         height: 32px;
-        &:first-child{
-            margin-right: 10px;
-        }
+    }
+    .listImg{
+        margin-left: 16px;
     }
     .title{
         width: 216px;
+        margin-left: 10px;
         &.isMusicList{
             :global{
                 .van-notice-bar .van-notice-bar__content::after{

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

@@ -621,7 +621,7 @@ export default defineComponent({
                         />
                     </div> :
                     isMusicList.value &&
-                    <img src={listImg} class={[styles.img, "driver-8"]} onClick={()=>{
+                    <img src={listImg} class={[styles.img, styles.listImg, "driver-8"]} onClick={()=>{
                       musicListShow.value = true
                     }} />
                 }
@@ -705,7 +705,6 @@ export default defineComponent({
                 }
                 showToast({
                   message: state.playType === "play" ? "已切换为演奏场景" : "已切换为演唱场景",
-                  duration: 0,
                   position: "top",
                   className: "selectionToast",
                 });
@@ -736,7 +735,6 @@ export default defineComponent({
                 handlerModeChange(oldPlayType, oldPlaySource);
                 showToast({
                   message: state.playType === "play" ? (state.playSource === "music"?"已切换为原声":"已切换为伴奏") : (state.playSource === "music"?"已切换为范唱":(state.playSource === "background"?"已切换为伴唱":"已切换为唱名")),
-                  duration: 0,
                   position: "top",
                   className: "selectionToast",
                 });

src/state.ts

@@ -1376,7 +1376,7 @@ const setState = (data: any, index: number) => {
   /**
    * 单曲，指法根据用户当前的乐器来显示，如果没有则取musicSheetSoundList第一个track
    */
-  let musicalCode = !storeData.user?.instrumentId ? data.musicSheetSoundList?.[0]?.track || '' : data.musicSheetSoundList?.find((item: any) => item?.musicalInstrumentId === storeData.user?.instrumentId)?.track || '';
+  let musicalCode = !storeData.user?.instrumentId ? data.musicSheetSoundList?.[0]?.track || '' : data.musicSheetSoundList?.find((item: any) => item?.musicalInstrumentId == storeData.user?.instrumentId)?.track || '';
   const pitchSubject = musicalInstrumentCodeInfo.find((n) => n.code.toLocaleLowerCase() === subjectCode.toLocaleLowerCase())
   const pitchMusical = musicalInstrumentCodeInfo.find((n) => n.code.toLocaleLowerCase() === musicalCode.toLocaleLowerCase())
   state.subjectCodeId = pitchSubject ? pitchSubject.id : 0

src/view/fingering/index.module.less

@@ -37,6 +37,9 @@
   //   background: linear-gradient(360deg, #FFFFFF 0%, rgba(255, 255, 255, 0) 100%);
   //   z-index: 1;
   // }
+  &.hulusiTop {
+    padding-top: 20px;
+  }
 }
 
 .imgs {

src/view/fingering/index.tsx

@@ -57,7 +57,7 @@ export default defineComponent({
               )}
             </div>
           ) : (
-            <div onClick={() => doubeClick()} class={[styles.fingeringContainer, styles.vertical, state.fingeringInfo.name]}>
+            <div onClick={() => doubeClick()} class={[styles.fingeringContainer, styles.vertical, state.fingeringInfo.name, state.fingeringInfo.name === 'hulusi-flute' ? styles.hulusiTop : '']}>
               <div class={styles.imgs}>
                 <img class="driver-7" src={fingerData.subject?.json?.full} />
                 {rs.map((key: number | string, index: number) => {