Ver Fonte

Merge branch 'iteration-20240605' into online

lex há 1 ano atrás
pai
commit
0fc1f14047

+ 4 - 1
src/views/accompany/music-detail.module.less

@@ -9,6 +9,10 @@
     .plyr__controls .plyr__controls__item.plyr__progress__container {
       padding-left: 6px;
     }
+
+    .plyr__control svg.icon--not-pressed {
+      padding-left: 1px;
+    }
   }
 }
 
@@ -34,7 +38,6 @@
 
   .musicImg {
     margin-top: -32px;
-    background: #C4C0BD;
     border-radius: 16px;
     border: 2px solid #FFFFFF;
     width: 85px;

+ 24 - 11
src/views/accompany/music-detail.tsx

@@ -219,7 +219,19 @@ export default defineComponent({
 
     //进入云练习
     const openView = async (item: any) => {
-      const src = `${location.origin}/orchestra-music-score/?id=${item.id}&part-index=${staffData.selectedPartIndex}`
+      let src = `${location.origin}/orchestra-music-score/?id=${item.id}&part-index=${staffData.selectedPartIndex}`
+      if (staffData.details.musicSheetType === 'SINGLE') {
+        // 默认进页面显示对应的曲谱
+        let lineType = 'staff'
+        if (staffData.radio === 'first') {
+          lineType = 'firstTone'
+        } else if (staffData.radio === 'fixed') {
+          lineType = 'fixedTone'
+        } else if (staffData.radio === 'staff') {
+          lineType = 'staff'
+        }
+        src += '&musicRenderType=' + lineType
+      }
       console.log('🚀 ~ src:', src)
       postMessage({
         api: 'openAccompanyWebView',
@@ -353,17 +365,18 @@ export default defineComponent({
                       <span>声轨</span>
                     </div>
                   ) : (
-                    <div
-                      class={styles.icon}
-                      onClick={() => {
-                        if (loading.value) return
-                        staffData.status = true
-                      }}
-                    >
-                      <img src={iconChange} />
-                      <span>转谱</span>
-                    </div>
+                    <div></div>
                   )}
+                  {/* <div
+                    class={styles.icon}
+                    onClick={() => {
+                      if (loading.value) return
+                      staffData.status = true
+                    }}
+                  >
+                    <img src={iconChange} />
+                    <span>转谱</span>
+                  </div> */}
                 </div>
                 <Button
                   round