合并

dist/assets/index-5bf69c51.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-5bf69c51.js
 import{d as i,g as l,n as d,bb as e,c,m as r,f as s,ai as u}from"./index-51bf23c8.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});c(()=>{window.appName="colexiu",r.xmlUrl=n.xmlUrl,t.isLoading=!1});const o=async()=>{console.log("渲染完成")};return()=>s("div",{class:a.detail},[s("div",{id:"scrollContainer",class:[a.container,"hideCursor"]},[!t.isLoading&&s(u,{onRendered:o},null)])])}});export{y as default};
+========
+import{d as i,g as l,n as d,bb as e,c,m as r,f as s,ai as u}from"./index-dbcab5e0.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});c(()=>{window.appName="colexiu",r.xmlUrl=n.xmlUrl,t.isLoading=!1});const o=async()=>{console.log("渲染完成")};return()=>s("div",{class:a.detail},[s("div",{id:"scrollContainer",class:[a.container,"hideCursor"]},[!t.isLoading&&s(u,{onRendered:o},null)])])}});export{y as default};
+>>>>>>>> iteration-beat-one:dist/assets/index-bcbbaa40.js

dist/assets/index-70c04c8b.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-bc2adae5.js
+import{d,l as i,n as p,m as e,w as o,f as r,L as a}from"./index-51bf23c8.js";const c=d({name:"measureSpeed",setup(){const s=i(!1),t=p({speed:e.speed,originSpeed:e.originSpeed});return o(()=>e.section.length,()=>{if(e.modeType==="practise"){if(!s.value&&e.section.length===2){s.value=!0,t.speed=e.speed;const n=e.section[0].beatSpeed;e.originSpeed=n,a(n)}s.value&&e.section.length===0&&(s.value=!1,e.originSpeed=t.originSpeed,a(t.speed))}}),()=>r("div",null,null)}});export{c as M};
+========
+import{d,l as i,n as p,m as e,w as o,f as r,L as a}from"./index-dbcab5e0.js";const c=d({name:"measureSpeed",setup(){const s=i(!1),t=p({speed:e.speed,originSpeed:e.originSpeed});return o(()=>e.section.length,()=>{if(e.modeType==="practise"){if(!s.value&&e.section.length===2){s.value=!0,t.speed=e.speed;const n=e.section[0].beatSpeed;e.originSpeed=n,a(n)}s.value&&e.section.length===0&&(s.value=!1,e.originSpeed=t.originSpeed,a(t.speed))}}),()=>r("div",null,null)}});export{c as M};
+>>>>>>>> iteration-beat-one:dist/assets/index-70c04c8b.js

dist/assets/index-bc2adae5.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-bc2adae5.js
 import{d,l as i,n as p,m as e,w as o,f as r,L as a}from"./index-51bf23c8.js";const c=d({name:"measureSpeed",setup(){const s=i(!1),t=p({speed:e.speed,originSpeed:e.originSpeed});return o(()=>e.section.length,()=>{if(e.modeType==="practise"){if(!s.value&&e.section.length===2){s.value=!0,t.speed=e.speed;const n=e.section[0].beatSpeed;e.originSpeed=n,a(n)}s.value&&e.section.length===0&&(s.value=!1,e.originSpeed=t.originSpeed,a(t.speed))}}),()=>r("div",null,null)}});export{c as M};
+========
+import{d,l as i,n as p,m as e,w as o,f as r,L as a}from"./index-dbcab5e0.js";const c=d({name:"measureSpeed",setup(){const s=i(!1),t=p({speed:e.speed,originSpeed:e.originSpeed});return o(()=>e.section.length,()=>{if(e.modeType==="practise"){if(!s.value&&e.section.length===2){s.value=!0,t.speed=e.speed;const n=e.section[0].beatSpeed;e.originSpeed=n,a(n)}s.value&&e.section.length===0&&(s.value=!1,e.originSpeed=t.originSpeed,a(t.speed))}}),()=>r("div",null,null)}});export{c as M};
+>>>>>>>> iteration-beat-one:dist/assets/index-70c04c8b.js

dist/assets/index-bcbbaa40.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-5bf69c51.js
+import{d as i,g as l,n as d,bb as e,c,m as r,f as s,ai as u}from"./index-51bf23c8.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});c(()=>{window.appName="colexiu",r.xmlUrl=n.xmlUrl,t.isLoading=!1});const o=async()=>{console.log("渲染完成")};return()=>s("div",{class:a.detail},[s("div",{id:"scrollContainer",class:[a.container,"hideCursor"]},[!t.isLoading&&s(u,{onRendered:o},null)])])}});export{y as default};
+========
+import{d as i,g as l,n as d,bb as e,c,m as r,f as s,ai as u}from"./index-dbcab5e0.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});c(()=>{window.appName="colexiu",r.xmlUrl=n.xmlUrl,t.isLoading=!1});const o=async()=>{console.log("渲染完成")};return()=>s("div",{class:a.detail},[s("div",{id:"scrollContainer",class:[a.container,"hideCursor"]},[!t.isLoading&&s(u,{onRendered:o},null)])])}});export{y as default};
+>>>>>>>> iteration-beat-one:dist/assets/index-bcbbaa40.js

dist/assets/index-legacy-3263233f.js

@@ -0,0 +1 @@
+System.register(["./index-legacy-b4b27d7c.js"],(function(e,t){"use strict";var i,n,a,o,r,s,d,l,c=document.createElement("style");return c.textContent="._skeleton_vtlsh_1{position:fixed;left:0;top:0;width:100vw;height:100vh;padding:.53333rem .8rem;background-color:#fff;z-index:1000;--van-skeleton-paragraph-height: .8rem}._detail_vtlsh_12{width:100vw;height:100vh;overflow:hidden;overflow-y:auto;--header-height: 1.65333rem;background:var(--container-background)}._detail_vtlsh_12 ._container_vtlsh_20{margin:0 .26667rem;border-radius:.26667rem}._detail_vtlsh_12 #musicAndSelection{overflow:initial!important;height:initial!important;max-height:initial!important}\n",document.head.appendChild(c),{setters:[e=>{i=e.d,n=e.g,a=e.n,o=e.bb,r=e.c,s=e.m,d=e.f,l=e.ai}],execute:function(){const t="_detail_vtlsh_12",c="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),i=a({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:o.staff,base64:""},{state:!1,name:"首调",type:o.firstTone,base64:""},{state:!1,name:"固定调",type:o.fixedTone,base64:""}]});r((()=>{window.appName="colexiu",s.xmlUrl=e.xmlUrl,i.isLoading=!1}));const h=async()=>{console.log("渲染完成")};return()=>d("div",{class:t},[d("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&d(l,{onRendered:h},null)])])}}))}}}));

dist/assets/index-legacy-54894081.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-54894081.js
 System.register(["./index-legacy-08cfe707.js"],(function(e,n){"use strict";var i,t,s,d,r,p,o;return{setters:[e=>{i=e.d,t=e.l,s=e.n,d=e.m,r=e.w,p=e.f,o=e.L}],execute:function(){e("M",i({name:"measureSpeed",setup(){const e=t(!1),n=s({speed:d.speed,originSpeed:d.originSpeed});return r((()=>d.section.length),(()=>{if("practise"===d.modeType){if(!e.value&&2===d.section.length){e.value=!0,n.speed=d.speed;const i=d.section[0].beatSpeed;d.originSpeed=i,o(i)}e.value&&0===d.section.length&&(e.value=!1,d.originSpeed=n.originSpeed,o(n.speed))}})),()=>p("div",null,null)}}))}}}));
+========
+System.register(["./index-legacy-b4b27d7c.js"],(function(e,n){"use strict";var i,t,s,d,r,p,o;return{setters:[e=>{i=e.d,t=e.l,s=e.n,d=e.m,r=e.w,p=e.f,o=e.L}],execute:function(){e("M",i({name:"measureSpeed",setup(){const e=t(!1),n=s({speed:d.speed,originSpeed:d.originSpeed});return r((()=>d.section.length),(()=>{if("practise"===d.modeType){if(!e.value&&2===d.section.length){e.value=!0,n.speed=d.speed;const i=d.section[0].beatSpeed;d.originSpeed=i,o(i)}e.value&&0===d.section.length&&(e.value=!1,d.originSpeed=n.originSpeed,o(n.speed))}})),()=>p("div",null,null)}}))}}}));
+>>>>>>>> iteration-beat-one:dist/assets/index-legacy-8f23d14f.js

dist/assets/index-legacy-8f23d14f.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-54894081.js
+System.register(["./index-legacy-08cfe707.js"],(function(e,n){"use strict";var i,t,s,d,r,p,o;return{setters:[e=>{i=e.d,t=e.l,s=e.n,d=e.m,r=e.w,p=e.f,o=e.L}],execute:function(){e("M",i({name:"measureSpeed",setup(){const e=t(!1),n=s({speed:d.speed,originSpeed:d.originSpeed});return r((()=>d.section.length),(()=>{if("practise"===d.modeType){if(!e.value&&2===d.section.length){e.value=!0,n.speed=d.speed;const i=d.section[0].beatSpeed;d.originSpeed=i,o(i)}e.value&&0===d.section.length&&(e.value=!1,d.originSpeed=n.originSpeed,o(n.speed))}})),()=>p("div",null,null)}}))}}}));
+========
+System.register(["./index-legacy-b4b27d7c.js"],(function(e,n){"use strict";var i,t,s,d,r,p,o;return{setters:[e=>{i=e.d,t=e.l,s=e.n,d=e.m,r=e.w,p=e.f,o=e.L}],execute:function(){e("M",i({name:"measureSpeed",setup(){const e=t(!1),n=s({speed:d.speed,originSpeed:d.originSpeed});return r((()=>d.section.length),(()=>{if("practise"===d.modeType){if(!e.value&&2===d.section.length){e.value=!0,n.speed=d.speed;const i=d.section[0].beatSpeed;d.originSpeed=i,o(i)}e.value&&0===d.section.length&&(e.value=!1,d.originSpeed=n.originSpeed,o(n.speed))}})),()=>p("div",null,null)}}))}}}));
+>>>>>>>> iteration-beat-one:dist/assets/index-legacy-8f23d14f.js

dist/colexiu.html

@@ -2,7 +2,11 @@
 <html lang="en">
 
 <head>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/polyfills-8b299a89.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/polyfills-05939122.js"></script>
+>>>>>>> iteration-beat-one
 
   <meta charset="UTF-8" />
   <link rel="icon" type="image/svg+xml" href="./vite.svg" />
@@ -40,11 +44,19 @@
       },
     })
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/colexiu-a5d23248.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-51bf23c8.js">
   <link rel="modulepreload" crossorigin href="./assets/index-29b05e86.js">
   <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-f2a18c45.js">
   <link rel="modulepreload" crossorigin href="./assets/index-bc2adae5.js">
+=======
+  <script type="module" crossorigin src="./assets/colexiu-99da669b.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-dbcab5e0.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-3744a2b6.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-1d634fd9.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-70c04c8b.js">
+>>>>>>> iteration-beat-one
   <link rel="stylesheet" href="./assets/index-6e7257e1.css">
   <link rel="stylesheet" href="./assets/index-d42b0794.css">
   <link rel="stylesheet" href="./assets/colexiu-4a62fa3a.css">
@@ -57,8 +69,13 @@
   <img id="loading" class="show" src="./loading.svg" alt="loading" />
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-60388574.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-eadd738d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-b34e6279.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-63962131.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-beat-one
 </body>
 
 </html>

dist/index.html

@@ -2,7 +2,11 @@
 <html lang="ZH-cn">
 
 <head>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/polyfills-8b299a89.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/polyfills-05939122.js"></script>
+>>>>>>> iteration-beat-one
 
   <meta charset="UTF-8">
   <link rel="icon" href="./favicon.ico" />
@@ -75,12 +79,21 @@
       }
     })
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index-ef67bf73.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-51bf23c8.js">
   <link rel="modulepreload" crossorigin href="./assets/index-29b05e86.js">
   <link rel="modulepreload" crossorigin href="./assets/instruments-9b17d192.js">
   <link rel="modulepreload" crossorigin href="./assets/index-50f49a64.js">
   <link rel="modulepreload" crossorigin href="./assets/index-bc2adae5.js">
+=======
+  <script type="module" crossorigin src="./assets/index-f5cb4664.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-dbcab5e0.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-3744a2b6.js">
+  <link rel="modulepreload" crossorigin href="./assets/instruments-3df69d48.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-af2250a6.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-70c04c8b.js">
+>>>>>>> iteration-beat-one
   <link rel="modulepreload" crossorigin href="./assets/plyr.min-424cfb91.js">
   <link rel="stylesheet" href="./assets/index-6e7257e1.css">
   <link rel="stylesheet" href="./assets/index-d42b0794.css">
@@ -100,8 +113,13 @@
   <img id="loading" class="show" src="./loading.svg" alt="loading" />
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-60388574.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-79943d6f.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-b34e6279.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-2430ede7.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-beat-one
 </body>
 
 </html>

dist/instrument.html

@@ -2,7 +2,11 @@
 <html lang="en">
 
 <head>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/polyfills-8b299a89.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/polyfills-05939122.js"></script>
+>>>>>>> iteration-beat-one
 
   <meta charset="UTF-8" />
   <meta name="viewport"
@@ -42,12 +46,21 @@
     }
 
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/instrument-d42a6028.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-51bf23c8.js">
   <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-f2a18c45.js">
   <link rel="modulepreload" crossorigin href="./assets/index-29b05e86.js">
   <link rel="modulepreload" crossorigin href="./assets/instruments-9b17d192.js">
   <link rel="modulepreload" crossorigin href="./assets/index-b694b046.js">
+=======
+  <script type="module" crossorigin src="./assets/instrument-1222561c.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-dbcab5e0.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-1d634fd9.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-3744a2b6.js">
+  <link rel="modulepreload" crossorigin href="./assets/instruments-3df69d48.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-3f850b56.js">
+>>>>>>> iteration-beat-one
   <link rel="stylesheet" href="./assets/index-6e7257e1.css">
   <link rel="stylesheet" href="./assets/index-d42b0794.css">
   <link rel="stylesheet" href="./assets/instrument-1df403a6.css">
@@ -60,8 +73,13 @@
   <img id="loading" class="show" src="./loading.svg" alt="loading" />
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-60388574.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/instrument-legacy-b2189b5f.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-b34e6279.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/instrument-legacy-b7527bcf.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-beat-one
 </body>
 
 </html>

dist/orchestra.html

@@ -2,7 +2,11 @@
 <html lang="en">
 
 <head>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/polyfills-8b299a89.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/polyfills-05939122.js"></script>
+>>>>>>> iteration-beat-one
 
   <meta charset="UTF-8" />
   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
@@ -41,6 +45,7 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/orchestra-a352edbc.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-51bf23c8.js">
   <link rel="modulepreload" crossorigin href="./assets/index-29b05e86.js">
@@ -48,6 +53,15 @@
   <link rel="modulepreload" crossorigin href="./assets/index-50f49a64.js">
   <link rel="modulepreload" crossorigin href="./assets/index-bc2adae5.js">
   <link rel="modulepreload" crossorigin href="./assets/index-b694b046.js">
+=======
+  <script type="module" crossorigin src="./assets/orchestra-bf1de8fa.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-dbcab5e0.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-3744a2b6.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-1d634fd9.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-af2250a6.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-70c04c8b.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-3f850b56.js">
+>>>>>>> iteration-beat-one
   <link rel="stylesheet" href="./assets/index-6e7257e1.css">
   <link rel="stylesheet" href="./assets/index-d42b0794.css">
   <link rel="stylesheet" href="./assets/index-85f95688.css">
@@ -72,8 +86,13 @@
   </script>
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-60388574.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-518a0fd3.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-b34e6279.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-ace0dcf6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-beat-one
 </body>
 
 </html>

dist/report-share.html

@@ -2,7 +2,11 @@
 <html lang="en">
 
 <head>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/polyfills-8b299a89.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/polyfills-05939122.js"></script>
+>>>>>>> iteration-beat-one
 
   <meta charset="UTF-8" />
   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
@@ -25,8 +29,13 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/report-share-d66fb456.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-51bf23c8.js">
+=======
+  <script type="module" crossorigin src="./assets/report-share-11d9c342.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-dbcab5e0.js">
+>>>>>>> iteration-beat-one
   <link rel="modulepreload" crossorigin href="./assets/plyr.min-424cfb91.js">
   <link rel="stylesheet" href="./assets/index-6e7257e1.css">
   <link rel="stylesheet" href="./assets/plyr-ad8ef5ae.css">
@@ -51,8 +60,13 @@
   </script>
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-60388574.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-e057b2ba.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-b34e6279.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-f485aac1.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-beat-one
 </body>
 
 </html>

instrument.html

@@ -38,13 +38,20 @@
         },
       })
     }
-
   </script>
 </head>
 
 <body>
   <div id="app"></div>
   <img id="loading" class="show" src="/loading.svg" alt="loading" />
+  <script>
+    // 处理课堂乐器老师端打开听音练习时去掉加载动画
+    if (location.href.indexOf('view-figner') >= 0 && location.href.indexOf('platform=pc') >= 0) {
+      var _loading = document.getElementById("loading");
+      _loading && document.body.removeChild(_loading);
+    }
+  </script>
+
   <script type="module" src="/src/page-instrument/main.ts"></script>
 </body>
 

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

@@ -173,6 +173,7 @@
     z-index: 5;
 
     .backBtn {
+        margin-right: 34px;
         position: relative;
         padding: 12px 12px 12px 18px;
         display: flex;
@@ -193,44 +194,36 @@
         align-items: center;
 
         .baseBtn {
-            margin: 0 4px;
-        }
-    }
-
-    .baseBtn {
-        // width: 60px;
-        // height: 45px;
-        width: 54px;
-        height: 45px;
-        background: rgba(255, 255, 255, .48);
-        border-radius: 10px;
-        font-size: 12px;
-        font-weight: 400;
-        color: #616161;
-        line-height: 17px;
-        text-align: center;
-        cursor: pointer;
-        display: flex;
-        flex-direction: column;
-        justify-content: space-evenly;
-        align-items: center;
-        pointer-events: auto;
-
-        img {
-            width: 18px;
-            height: 18px;
-        }
+            margin: 0 6px;
 
-        &:active {
-            opacity: .8;
-        }
-    }
+            background: linear-gradient(180deg, #F4EFED 0%, #E5DCD7 100%);
+            box-shadow: 0px 1px 2px 0px #9F9690, inset 0px -2px 0px 0px rgba(205, 192, 181, 0.47), inset 0px 2px 1px 0px #FFFFFF;
+            border-radius: 5px;
 
-    .rightBtn {
-        display: flex;
+            width: 98px;
+            height: 34px;
+            background: rgba(255, 255, 255, .48);
+            border-radius: 10px;
+            font-size: 12px;
+            font-weight: 400;
+            color: #616161;
+            line-height: 17px;
+            text-align: center;
+            cursor: pointer;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            pointer-events: auto;
+
+            img {
+                width: 18px;
+                height: 18px;
+                margin-right: 4px;
+            }
 
-        .baseBtn {
-            margin: 0 4px;
+            &:active {
+                opacity: .8;
+            }
         }
     }
 }
@@ -436,6 +429,7 @@
     align-items: flex-start;
     height: 65px;
     flex-shrink: 0;
+    cursor: pointer;
 
     &.paddingLeft {
         padding-left: 20Px;
@@ -548,6 +542,12 @@
         background: url('./image/tips4.png') no-repeat center center / contain;
     }
 
+    .playTips5 {
+        width: 147px;
+        height: 28px;
+        background: url('./image/tips5.png') no-repeat center center / contain;
+    }
+
     .playError {
         width: 94px;
         height: 28px;
@@ -807,11 +807,84 @@
     pointer-events: none;
 }
 
-.toggleBtn {
+.fixedRightBtns {
     position: fixed;
-    right: 0;
+    right: 12px;
     top: 50%;
     transform: translateY(-50%);
+
+    .baseBtn {
+        // width: 60px;
+        // height: 45px;
+        width: 45px;
+        height: 45px;
+        background: rgba(255, 255, 255, .27);
+        border-radius: 10px;
+        font-size: 12px;
+        font-weight: 400;
+        color: #616161;
+        line-height: 17px;
+        text-align: center;
+        cursor: pointer;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        pointer-events: auto;
+
+
+        img {
+            width: 18px;
+            height: 18px;
+        }
+
+        &:active {
+            // opacity: .8;
+            background: linear-gradient(180deg, #F4EFED 0%, #D9CEC7 100%);
+            box-shadow: 0px 1px 2px 0px #9F9690, inset 0px -2px 0px 0px #CDC0B5, inset 0px 2px 1px 0px #FFFFFF;
+            border-radius: 8px;
+        }
+    }
+
+    .rightBtn {
+        width: 45px;
+        background: rgba(255, 255, 255, .27);
+        border-radius: 8px;
+        overflow: hidden;
+
+        .baseBtn {
+            // margin: 0 4px;
+            background: transparent;
+            position: relative;
+            margin-bottom: 5px;
+            margin-top: 3px;
+
+
+            &::after {
+                content: '';
+                display: block;
+                position: absolute;
+                left: 50%;
+                bottom: -5px;
+                transform: translateX(-50%);
+                width: 20px;
+                height: 1px;
+                background-color: #616161;
+                opacity: 0.2;
+            }
+
+            &:last-child::after {
+                display: none;
+            }
+        }
+    }
+
+    .resetBtn {
+        visibility: hidden;
+    }
+}
+
+.toggleBtn {
     display: flex;
     flex-direction: column;
     align-items: center;
@@ -831,6 +904,7 @@
 
     &:active {
         opacity: .8;
+
     }
 
     img {
@@ -842,9 +916,16 @@
 
 .toggleBtnhulusi {
     height: auto;
-    padding: 14px 0 15px 12px;
-    background-image: url('./image/icon_trans_bg_hu.png');
-    background-size: 100% 100%;
+    // padding: 14px 0 15px 12px;
+    // background-image: url('./image/icon_trans_bg_hu.png');
+    // background-size: 100% 100%;
+
+    img {
+        width: 9px !important;
+        height: 5px !important;
+    }
+
+    .noteKeyBtn {}
 }
 
 .tones {

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

@@ -295,7 +295,7 @@ export default defineComponent({
             className: "",
           });
         });
-        console.log(data.subjects, "subjects");
+        // console.log(data.subjects, "subjects");
       } catch {
         //
       }
@@ -414,7 +414,6 @@ export default defineComponent({
       });
       //
       mc.on("hammer.input", function (ev) {
-        // console.log("🚀 ~ ev:", ev.type, ev.isFinal);
         if (ev.isFinal) {
           data.transform.startScale = data.transform.scale;
           data.transform.startX = data.transform.x;
@@ -434,6 +433,16 @@ export default defineComponent({
       });
     };
 
+    // 判断乐器是否移动
+    const instrumentTranstion = computed(() => {
+      const transform = data.transform;
+      if (transform.scale !== 1 || transform.x !== 0 || transform.y !== 0 || transform.startScale !== 1 || transform.startX !== 0 || transform.startY !== 0) {
+        return true;
+      } else {
+        return false;
+      }
+    });
+
     const pageVisible = usePageVisibility();
     watch(
       () => pageVisible.value,
@@ -471,10 +480,16 @@ export default defineComponent({
 
     /** 音符切换 */
     const noteChangeShow = () => {
-      // 播放音阶时不能切换
-      if (playStatus.gamut) return;
-      // 开始答题不能切换
-      if (playStatus.action) return;
+      if (playStatus.action) {
+        if (playAction.listenLock) return;
+        playAction.resetAction = true;
+        resetMode(true, 0);
+      }
+      // // 播放音阶时不能切换
+      // if (playStatus.gamut) return;
+      // // 开始答题不能切换
+      // if (playStatus.action) return;
+      playStatus.gamut = false;
       gaumntPause();
       if (data.noteType === "all") {
         data.noteType = "#c";
@@ -482,10 +497,15 @@ export default defineComponent({
         data.noteType = "all";
       }
       getNotes();
+
+      setTimeout(() => {
+        playAction.resetAction = false;
+      }, 2000);
     };
 
     // 开始播放音阶
     const onGamutPlayOrPause = async () => {
+      playAction.resetAction = false;
       if (playStatus.gamut) {
         playStatus.gamut = false;
         gaumntPause();
@@ -543,11 +563,13 @@ export default defineComponent({
       listenModeStatus: false, // 是否开始了模式
       listenLock: false,
       listenTipsStatus: false, // 开始播放状态
+      resetAction: false, // 是否重置
       /** 0: 未答，1: 答对，2: 答错 */
       userAnswerStatus: 0 as 0 | 1 | 2, // 用户回答状态
       userAnswer: {} as any, // 用户答的数据
     });
     const onActionPlay = async () => {
+      playAction.resetAction = false;
       if (playAction.listenLock) return;
       if (playAction.showAnswerLoading) return;
       playStatus.action = true;
@@ -875,10 +897,6 @@ export default defineComponent({
                 <img src={icons.icon_back} />
               </button>
 
-              <div class={styles.baseBtn} onClick={onChangeFingeringModel}>
-                <img src={modeText.value.icon} />
-                <span>{modeText.value.text}</span>
-              </div>
               <Popover
                 placement="bottom"
                 class={styles.popoverContainer}
@@ -931,43 +949,13 @@ export default defineComponent({
                   ),
                 }}
               </Popover>
-
-              {data.subject !== "melodica" && data.fingeringMode === "scaleMode" && (
-                <div
-                  class={styles.baseBtn}
-                  onClick={() => {
-                    data.viewIndex++;
-                    if (data.viewIndex > data.viewTotal) {
-                      if (["pan-flute", "ocarina"].includes(data.subject)) {
-                        data.viewIndex = 1;
-                      } else {
-                        data.viewIndex = 0;
-                      }
-                    }
-                    getFingeringData();
-                  }}
-                >
-                  <img src={icons.icon_toggle} />
-                  <span>切换视图</span>
-                </div>
-              )}
-            </div>
-            <div class={styles.rightBtn}>
-              <div class={styles.baseBtn} onClick={() => resetElement()}>
-                <img src={icons.icon_2_0} />
-                <span>还原</span>
-              </div>
-              <div
-                class={styles.baseBtn}
-                onClick={() => {
-                  resetElement();
-                  data.tipShow = !data.tipShow;
-                }}
-              >
-                <img src={icons.icon_2_1} />
-                <span>使用说明</span>
+              <div class={styles.baseBtn} onClick={onChangeFingeringModel}>
+                <img src={modeText.value.icon} />
+                <span>{modeText.value.text}</span>
               </div>
+              {/*  */}
             </div>
+            {/*  */}
           </div>
           <div class={styles.fingerContent}>
             <div class={styles.wrapFinger}>
@@ -1008,13 +996,12 @@ export default defineComponent({
                 {playAction.listenTipsStatus && <div class={[styles.tipsT, data.fingeringMode === "fingeringMode" ? styles.playTips2 : styles.playTips]}></div>}
                 {playAction.userAnswerStatus === 1 && <div class={[styles.tipsT, styles.playSuccess]}></div>}
                 {playAction.userAnswerStatus === 2 && <div class={[styles.tipsT, styles.playError]}></div>}
-
+                {playAction.resetAction && <div class={[styles.tipsT, styles.playTips5]}></div>}
                 {((data.noteType !== "#c" && (orientationDirection.value === 0 || (orientationDirection.value === 1 && state.platform === IPlatform.PC))) || (orientationDirection.value === 1 && state.platform === IPlatform.APP)) && (
                   <Button class={styles.noteBtn} onClick={() => scrollNoteBox("left")}>
                     <Icon name="arrow-left" />
                   </Button>
                 )}
-
                 <div class={[styles.noteContent, data.fingeringMode !== "scaleMode" && orientationDirection.value === 0 && styles.noteContentOther, browsInfo.ios ? "" : styles.noteContentWrap, data.huaweiPad && styles.huaweiPad]}>
                   {/* 判断是否为音阶模式 */}
                   {data.fingeringMode !== "scaleMode" && (
@@ -1146,36 +1133,103 @@ export default defineComponent({
               </div>
             )}
           </div>
-          {!!data.tones.length && data.fingeringMode === "scaleMode" && (
-            <>
-              {fingerData.fingeringInfo.name == "hulusi-flute" ? (
-                <div id="finger-note-1" class={[styles.toggleBtn, styles.toggleBtnhulusi]} onClick={() => (data.tnoteShow = true)}>
-                  <div>
-                    全按作
-                    <div class={[styles.noteKey]}>
-                      {data.activeTone.step > 0 ? <span class={styles.dot}></span> : null}
+          <div class={styles.fixedRightBtns}>
+            <div class={styles.rightBtn}>
+              {data.subject !== "melodica" && data.fingeringMode === "scaleMode" && (
+                <div
+                  class={styles.baseBtn}
+                  onClick={() => {
+                    data.viewIndex++;
+                    if (data.viewIndex > data.viewTotal) {
+                      if (["pan-flute", "ocarina"].includes(data.subject)) {
+                        data.viewIndex = 1;
+                      } else {
+                        data.viewIndex = 0;
+                      }
+                    }
+                    getFingeringData();
+                  }}
+                >
+                  <img src={icons.icon_toggle} />
+                  <span>视图</span>
+                </div>
+              )}
+              <div
+                class={styles.baseBtn}
+                onClick={() => {
+                  resetElement();
+                  data.tipShow = !data.tipShow;
+                }}
+              >
+                <img src={icons.icon_2_1} />
+                <span>使用</span>
+              </div>
 
-                      <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 id="finger-note-1" class={[styles.baseBtn, styles.toggleBtnhulusi]} onClick={() => (data.tnoteShow = true)}>
+                <div>
+                  全按作
+                  <div class={[styles.noteKey, styles.noteKeyBtn]}>
+                    {/* {data.activeTone.step > 0 ? <span class={styles.dot}></span> : null} */}
+                    <span class={styles.dot}></span>
+
+                    <div class={styles.noteName}>
+                      {/* <sup>{data.activeTone.mark && (data.activeTone.mark === "rise" ? "#" : "b")}</sup> */}
+                      <sup>#</sup>
+                      {/* {data.activeTone.key} */}5
                     </div>
+                    {/* {data.activeTone.step < 0 ? <span class={styles.dot}></span> : null} */}
                   </div>
-                  <img src={icons.icon_arrow} />
                 </div>
-              ) : (
-                <div id="finger-note-1" class={styles.toggleBtn} onClick={() => (data.tnoteShow = true)}>
+                {/* <img src={icons.icon_arrow} /> */}
+              </div>
+              {/* <div id="finger-note-1" class={[styles.baseBtn, styles.toggleBtnhulusi]} onClick={() => (data.tnoteShow = true)}>
+                <div style={{ display: "flex" }}>
                   <div style={{ marginTop: "-4px" }}>
                     <sup>{data.activeTone.mark && (data.activeTone.mark === "rise" ? "#" : "b")}</sup>
                     {data.activeTone.name}
                   </div>
                   调
-                  <img src={icons.icon_arrow} />
+                   <img src={icons.icon_arrow} />
                 </div>
-              )}
-            </>
-          )}
+              </div> */}
+            </div>
+
+            <div class={[styles.baseBtn, !instrumentTranstion.value && styles.resetBtn]} style={{ marginTop: "8px" }} onClick={() => resetElement()}>
+              <img src={icons.icon_2_0} />
+              <span>还原</span>
+            </div>
+
+            {/* {!!data.tones.length && data.fingeringMode === "scaleMode" && (
+              <>
+                {fingerData.fingeringInfo.name == "hulusi-flute" ? (
+                  <div id="finger-note-1" class={[styles.toggleBtn, styles.toggleBtnhulusi]} onClick={() => (data.tnoteShow = true)}>
+                    <div>
+                      全按作
+                      <div class={[styles.noteKey]}>
+                        {data.activeTone.step > 0 ? <span class={styles.dot}></span> : null}
+
+                        <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 style={{ marginTop: "-4px" }}>
+                      <sup>{data.activeTone.mark && (data.activeTone.mark === "rise" ? "#" : "b")}</sup>
+                      {data.activeTone.name}
+                    </div>
+                    调
+                    <img src={icons.icon_arrow} />
+                  </div>
+                )}
+              </>
+            )} */}
+          </div>
 
           <Popup class="tonePopup" v-model:show={data.tnoteShow} position={state.platform !== IPlatform.PC && !query.modelType && fingerData.fingeringInfo.orientation === 1 ? "bottom" : "right"}>
             <div class={styles.tones}>