|
@@ -37,7 +37,7 @@ import { usePageVisibility } from "@vant/use";
|
|
|
import { watch } from "vue";
|
|
|
import icon_loading_img from "./image/icon_loading_img.png";
|
|
|
import icon_popup_top from "./image/icon_popup_top.png";
|
|
|
-import state from "/src/state";
|
|
|
+import state, { IPlatform } from "/src/state";
|
|
|
|
|
|
export default defineComponent({
|
|
|
name: "viewFigner",
|
|
@@ -422,7 +422,7 @@ export default defineComponent({
|
|
|
return <img data-index={nk} src={fingerData.subject?.json?.[nk]} />;
|
|
|
})}
|
|
|
<div
|
|
|
- style={{left: data.viewIndex == 2 ? '0': '64%'}}
|
|
|
+ style={{ left: data.viewIndex == 2 ? "0" : "64%" }}
|
|
|
class={[styles.tizhi, canTizhi && styles.canDisplay]}
|
|
|
onClick={() =>
|
|
|
(fingerData.relationshipIndex = fingerData.relationshipIndex === 0 ? 1 : 0)
|
|
@@ -432,13 +432,12 @@ export default defineComponent({
|
|
|
</div>
|
|
|
<div
|
|
|
id="finger-note-2"
|
|
|
- style={{left: '50%', transform: 'translateX(-50%)'}}
|
|
|
+ style={{ left: "50%", transform: "translateX(-50%)" }}
|
|
|
class={styles.tizhi}
|
|
|
onClick={() =>
|
|
|
(fingerData.relationshipIndex = fingerData.relationshipIndex === 0 ? 1 : 0)
|
|
|
}
|
|
|
- >
|
|
|
- </div>
|
|
|
+ ></div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -581,42 +580,46 @@ export default defineComponent({
|
|
|
</div>
|
|
|
<div class={styles.tipContentbox}>
|
|
|
<div class={styles.tipContent}>
|
|
|
- <Space size={0} class={styles.toneContent}>
|
|
|
- {data.tones.map((tone: IFIGNER_INSTRUMENT_Note) => {
|
|
|
- const steps = new Array(Math.abs(tone.step)).fill(1);
|
|
|
- return (
|
|
|
- <Button
|
|
|
- class={[fingerData.fingeringInfo.name == "hulusi-flute" && styles.hulusiBtn]}
|
|
|
- round
|
|
|
- plain
|
|
|
- type={data.popupActiveTone.realName === tone.realName ? "primary" : "default"}
|
|
|
- onClick={() => {
|
|
|
- data.popupActiveTone = tone;
|
|
|
- setNotes();
|
|
|
- }}
|
|
|
- >
|
|
|
- {fingerData.fingeringInfo.name == "hulusi-flute" ? (
|
|
|
- <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} style={{ fontSize: "0.25rem" }}>
|
|
|
- <sup>{tone.mark && (tone.mark === "rise" ? "#" : "b")}</sup>
|
|
|
- {tone.key}
|
|
|
+ <div class={styles.tipWrap}>
|
|
|
+ <Space size={0} class={styles.toneContent}>
|
|
|
+ {data.tones.map((tone: IFIGNER_INSTRUMENT_Note) => {
|
|
|
+ const steps = new Array(Math.abs(tone.step)).fill(1);
|
|
|
+ return (
|
|
|
+ <Button
|
|
|
+ class={[fingerData.fingeringInfo.name == "hulusi-flute" && styles.hulusiBtn]}
|
|
|
+ round
|
|
|
+ plain
|
|
|
+ type={
|
|
|
+ data.popupActiveTone.realName === tone.realName ? "primary" : "default"
|
|
|
+ }
|
|
|
+ onClick={() => {
|
|
|
+ data.popupActiveTone = tone;
|
|
|
+ setNotes();
|
|
|
+ }}
|
|
|
+ >
|
|
|
+ {fingerData.fingeringInfo.name == "hulusi-flute" ? (
|
|
|
+ <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} style={{ fontSize: "0.25rem" }}>
|
|
|
+ <sup>{tone.mark && (tone.mark === "rise" ? "#" : "b")}</sup>
|
|
|
+ {tone.key}
|
|
|
+ </div>
|
|
|
+ {tone.step < 0 ? <span class={styles.dot}></span> : null}
|
|
|
</div>
|
|
|
- {tone.step < 0 ? <span class={styles.dot}></span> : null}
|
|
|
</div>
|
|
|
- </div>
|
|
|
- ) : (
|
|
|
- <div class={styles.noteName}>
|
|
|
- <sup>{tone.mark && (tone.mark === "rise" ? "#" : "b")}</sup>
|
|
|
- {tone.name}
|
|
|
- </div>
|
|
|
- )}
|
|
|
- </Button>
|
|
|
- );
|
|
|
- })}
|
|
|
- </Space>
|
|
|
+ ) : (
|
|
|
+ <div class={styles.noteName}>
|
|
|
+ <sup>{tone.mark && (tone.mark === "rise" ? "#" : "b")}</sup>
|
|
|
+ {tone.name}
|
|
|
+ </div>
|
|
|
+ )}
|
|
|
+ </Button>
|
|
|
+ );
|
|
|
+ })}
|
|
|
+ </Space>
|
|
|
+ </div>
|
|
|
<div class={styles.toneAction}>
|
|
|
<img onClick={() => (data.tnoteShow = false)} src={icons.icon_action_cancel} />
|
|
|
<img
|