|
|
@@ -337,35 +337,41 @@ export default defineComponent({
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- {!!data.tones.length && fingerData.fingeringInfo.name == "hulusi-flute" ? (
|
|
|
- <div
|
|
|
- id="finger-note-1"
|
|
|
- class={[styles.toggleBtn, styles.toggleBtnhulusi]}
|
|
|
- onClick={() => (data.tnoteShow = true)}
|
|
|
- >
|
|
|
- <div>
|
|
|
- 全按作
|
|
|
- <div class={[styles.noteKey, styles.hulusiNoteKey]}>
|
|
|
- {data.activeTone.step > 0 ? <span class={styles.dot}></span> : null}
|
|
|
+ {!!data.tones.length && (
|
|
|
+ <>
|
|
|
+ {fingerData.fingeringInfo.name == "hulusi-flute" ? (
|
|
|
+ <div
|
|
|
+ id="finger-note-1"
|
|
|
+ class={[styles.toggleBtn, styles.toggleBtnhulusi]}
|
|
|
+ onClick={() => (data.tnoteShow = true)}
|
|
|
+ >
|
|
|
+ <div>
|
|
|
+ 全按作
|
|
|
+ <div class={[styles.noteKey, styles.hulusiNoteKey]}>
|
|
|
+ {data.activeTone.step > 0 ? <span class={styles.dot}></span> : null}
|
|
|
|
|
|
- <div class={styles.noteName}>
|
|
|
+ <div class={styles.noteName}>
|
|
|
+ <sup>
|
|
|
+ {data.activeTone.mark && (data.activeTone.mark === "rise" ? "#" : "b")}
|
|
|
+ </sup>
|
|
|
+ {data.activeTone.key}
|
|
|
+ </div>
|
|
|
+ {data.activeTone.step < 0 ? <span class={styles.dot}></span> : null}
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <img src={icons.icon_arrow} />
|
|
|
+ </div>
|
|
|
+ ) : (
|
|
|
+ <div id="finger-note-1" class={styles.toggleBtn} onClick={() => (data.tnoteShow = true)}>
|
|
|
+ <div>
|
|
|
<sup>{data.activeTone.mark && (data.activeTone.mark === "rise" ? "#" : "b")}</sup>
|
|
|
- {data.activeTone.key}
|
|
|
+ {data.activeTone.name}
|
|
|
</div>
|
|
|
- {data.activeTone.step < 0 ? <span class={styles.dot}></span> : null}
|
|
|
+ 调
|
|
|
+ <img src={icons.icon_arrow} />
|
|
|
</div>
|
|
|
- </div>
|
|
|
- <img src={icons.icon_arrow} />
|
|
|
- </div>
|
|
|
- ) : (
|
|
|
- <div id="finger-note-1" class={styles.toggleBtn} onClick={() => (data.tnoteShow = true)}>
|
|
|
- <div>
|
|
|
- <sup>{data.activeTone.mark && (data.activeTone.mark === "rise" ? "#" : "b")}</sup>
|
|
|
- {data.activeTone.name}
|
|
|
- </div>
|
|
|
- 调
|
|
|
- <img src={icons.icon_arrow} />
|
|
|
- </div>
|
|
|
+ )}
|
|
|
+ </>
|
|
|
)}
|
|
|
|
|
|
<Popup
|
|
|
@@ -395,14 +401,12 @@ export default defineComponent({
|
|
|
}}
|
|
|
>
|
|
|
{fingerData.fingeringInfo.name == "hulusi-flute" ? (
|
|
|
- <div style={{ display: "flex", alignItems: 'center' }}>
|
|
|
+ <div style={{ display: "flex", alignItems: "center" }}>
|
|
|
全按作
|
|
|
<div class={[styles.noteKey, styles.hulusiNoteKey]}>
|
|
|
{tone.step > 0 ? <span class={styles.dot}></span> : null}
|
|
|
<div class={styles.noteName}>
|
|
|
- <sup>
|
|
|
- {tone.mark && (tone.mark === "rise" ? "#" : "b")}
|
|
|
- </sup>
|
|
|
+ <sup>{tone.mark && (tone.mark === "rise" ? "#" : "b")}</sup>
|
|
|
{tone.key}
|
|
|
</div>
|
|
|
{tone.step < 0 ? <span class={styles.dot}></span> : null}
|
