2 months ago · 034826192b
--- a/dist/colexiu.html
+++ b/dist/colexiu.html
@@ -2,7 +2,11 @@
 
				 <html lang="en">
			
 
				 
			
 
				 <head>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/polyfills-eb47a7de.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-336fef56.js"></script>
			
 
				+>>>>>>> 16e47ee3dad289d8aec3392e7bee169c477ddc04
			
 
				 
			
 
				   <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="./js/colexiu-f563e656.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-0b27d424.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-6358d95c.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-3f1d65f9.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-728a4f8f.js">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/colexiu-513a065b.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-5bbbe457.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-522f7332.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-68946d68.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-d7bafa9a.js">
			
 
				+>>>>>>> 16e47ee3dad289d8aec3392e7bee169c477ddc04
			
 
				   <link rel="stylesheet" href="./css/index-0e9d5ebe.css">
			
 
				   <link rel="stylesheet" href="./css/colexiu-e8b419b5.css">
			
 
				   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
			
@@ -56,8 +68,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="./js/polyfills-legacy-40603d5c.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/colexiu-legacy-6f2e357c.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-d06b42a6.js"></script>
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/colexiu-legacy-3455b5fa.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> 16e47ee3dad289d8aec3392e7bee169c477ddc04
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/dist/index.html
+++ b/dist/index.html
@@ -2,7 +2,11 @@
 
				 <html lang="ZH-cn">
			
 
				 
			
 
				 <head>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/polyfills-eb47a7de.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-336fef56.js"></script>
			
 
				+>>>>>>> 16e47ee3dad289d8aec3392e7bee169c477ddc04
			
 
				 
			
 
				   <meta charset="UTF-8">
			
 
				   <link rel="icon" href="./favicon.ico" />
			
@@ -75,11 +79,19 @@
 
				       }
			
 
				     })
			
 
				   </script>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/gym-a203c829.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-0b27d424.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-6358d95c.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-c5960176.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-728a4f8f.js">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/gym-1470be8b.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-5bbbe457.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-522f7332.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-e9c8f4b1.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-d7bafa9a.js">
			
 
				+>>>>>>> 16e47ee3dad289d8aec3392e7bee169c477ddc04
			
 
				   <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
			
 
				   <link rel="stylesheet" href="./css/index-0e9d5ebe.css">
			
 
				   <link rel="stylesheet" href="./css/index-85f95688.css">
			
@@ -98,8 +110,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="./js/polyfills-legacy-40603d5c.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/gym-legacy-dbec86eb.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-d06b42a6.js"></script>
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/gym-legacy-3f3a9a20.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> 16e47ee3dad289d8aec3392e7bee169c477ddc04
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/dist/instrument.html
+++ b/dist/instrument.html
@@ -2,7 +2,11 @@
 
				 <html lang="en">
			
 
				 
			
 
				 <head>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/polyfills-eb47a7de.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-336fef56.js"></script>
			
 
				+>>>>>>> 16e47ee3dad289d8aec3392e7bee169c477ddc04
			
 
				 
			
 
				   <meta charset="UTF-8" />
			
 
				   <meta name="viewport"
			
@@ -41,8 +45,13 @@
 
				       })
			
 
				     }
			
 
				   </script>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/instrument-c4cbb21d.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-0b27d424.js">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/instrument-4b0ee13e.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-5bbbe457.js">
			
 
				+>>>>>>> 16e47ee3dad289d8aec3392e7bee169c477ddc04
			
 
				   <link rel="stylesheet" href="./css/index-0e9d5ebe.css">
			
 
				   <link rel="stylesheet" href="./css/instrument-118f68d3.css">
			
 
				   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
			
@@ -67,8 +76,13 @@
 
				     var vConsole = new window.VConsole();
			
 
				   </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="./js/polyfills-legacy-40603d5c.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-c44344da.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-d06b42a6.js"></script>
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-4f902f35.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> 16e47ee3dad289d8aec3392e7bee169c477ddc04
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/dist/js/colexiu-513a065b.js
+++ b/dist/js/colexiu-513a065b.js
--- a/dist/js/colexiu-f563e656.js
+++ b/dist/js/colexiu-f563e656.js
--- a/dist/js/colexiu-legacy-3455b5fa.js
+++ b/dist/js/colexiu-legacy-3455b5fa.js
--- a/dist/js/colexiu-legacy-6f2e357c.js
+++ b/dist/js/colexiu-legacy-6f2e357c.js
--- a/dist/js/gym-1470be8b.js
+++ b/dist/js/gym-1470be8b.js
--- a/dist/js/gym-a203c829.js
+++ b/dist/js/gym-a203c829.js
--- a/dist/js/gym-legacy-3f3a9a20.js
+++ b/dist/js/gym-legacy-3f3a9a20.js
--- a/dist/js/gym-legacy-dbec86eb.js
+++ b/dist/js/gym-legacy-dbec86eb.js
--- a/dist/js/index-0b27d424.js
+++ b/dist/js/index-0b27d424.js
--- a/dist/js/index-3f1d65f9.js
+++ b/dist/js/index-3f1d65f9.js
--- a/dist/js/index-522f7332.js
+++ b/dist/js/index-522f7332.js
--- a/dist/js/index-5b49d6de.js
+++ b/dist/js/index-5b49d6de.js
--- a/dist/js/index-5bbbe457.js
+++ b/dist/js/index-5bbbe457.js
--- a/dist/js/index-6358d95c.js
+++ b/dist/js/index-6358d95c.js
--- a/dist/js/index-68946d68.js
+++ b/dist/js/index-68946d68.js
--- a/dist/js/index-728a4f8f.js
+++ b/dist/js/index-728a4f8f.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-728a4f8f.js
			
 
				 import{b7 as l,d as i,h as a,bh as v,ba as r,bc as d,bz as _,bd as m,bA as w,bg as u,bk as g,F as A}from"./index-0b27d424.js";const[$,y]=l("skeleton-title"),P={round:Boolean,titleWidth:r};var p=i({name:$,props:P,setup(t){return()=>a("h3",{class:y([{round:t.round}]),style:{width:v(t.titleWidth)}},null)}});const T=d(p);var z=T;const[B,D]=l("skeleton-avatar"),F={avatarSize:r,avatarShape:m("round")};var N=i({name:B,props:F,setup(t){return()=>a("div",{class:D([t.avatarShape]),style:_(t.avatarSize)},null)}});const R=d(N);var I=R;const s="100%",L={round:Boolean,rowWidth:{type:r,default:s}},[U,C]=l("skeleton-paragraph");var E=i({name:U,props:L,setup(t){return()=>a("div",{class:C([{round:t.round}]),style:{width:t.rowWidth}},null)}});const H=d(E);var O=H;const[V,c]=l("skeleton"),j="60%",q={row:w(0),round:Boolean,title:Boolean,titleWidth:r,avatar:Boolean,avatarSize:r,avatarShape:m("round"),loading:u,animate:u,rowWidth:{type:[Number,String,Array],default:s}};var x=i({name:V,inheritAttrs:!1,props:q,setup(t,{slots:o,attrs:h}){const f=()=>{if(t.avatar)return a(I,{avatarShape:t.avatarShape,avatarSize:t.avatarSize},null)},S=()=>{if(t.title)return a(z,{round:t.round,titleWidth:t.titleWidth},null)},k=n=>{const{rowWidth:e}=t;return e===s&&n===+t.row-1?j:Array.isArray(e)?e[n]:e},W=()=>Array(+t.row).fill("").map((n,e)=>a(O,{key:e,round:t.round,rowWidth:v(k(e))},null)),b=()=>o.template?o.template():a(A,null,[f(),a("div",{class:c("content")},[S(),W()])]);return()=>{var n;return t.loading?a("div",g({class:c({animate:t.animate,round:t.round})},h),[b()]):(n=o.default)==null?void 0:n.call(o)}}});const J=d(x);export{J as S};
			
 
				+========
			
 
				+import{b7 as l,d as i,h as a,bh as v,ba as r,bc as d,bz as _,bd as m,bA as w,bg as u,bk as g,F as A}from"./index-5bbbe457.js";const[$,y]=l("skeleton-title"),P={round:Boolean,titleWidth:r};var p=i({name:$,props:P,setup(t){return()=>a("h3",{class:y([{round:t.round}]),style:{width:v(t.titleWidth)}},null)}});const T=d(p);var z=T;const[B,D]=l("skeleton-avatar"),F={avatarSize:r,avatarShape:m("round")};var N=i({name:B,props:F,setup(t){return()=>a("div",{class:D([t.avatarShape]),style:_(t.avatarSize)},null)}});const R=d(N);var I=R;const s="100%",L={round:Boolean,rowWidth:{type:r,default:s}},[U,C]=l("skeleton-paragraph");var E=i({name:U,props:L,setup(t){return()=>a("div",{class:C([{round:t.round}]),style:{width:t.rowWidth}},null)}});const H=d(E);var O=H;const[V,c]=l("skeleton"),j="60%",q={row:w(0),round:Boolean,title:Boolean,titleWidth:r,avatar:Boolean,avatarSize:r,avatarShape:m("round"),loading:u,animate:u,rowWidth:{type:[Number,String,Array],default:s}};var x=i({name:V,inheritAttrs:!1,props:q,setup(t,{slots:o,attrs:h}){const f=()=>{if(t.avatar)return a(I,{avatarShape:t.avatarShape,avatarSize:t.avatarSize},null)},S=()=>{if(t.title)return a(z,{round:t.round,titleWidth:t.titleWidth},null)},k=n=>{const{rowWidth:e}=t;return e===s&&n===+t.row-1?j:Array.isArray(e)?e[n]:e},W=()=>Array(+t.row).fill("").map((n,e)=>a(O,{key:e,round:t.round,rowWidth:v(k(e))},null)),b=()=>o.template?o.template():a(A,null,[f(),a("div",{class:c("content")},[S(),W()])]);return()=>{var n;return t.loading?a("div",g({class:c({animate:t.animate,round:t.round})},h),[b()]):(n=o.default)==null?void 0:n.call(o)}}});const J=d(x);export{J as S};
			
 
				+>>>>>>>> 16e47ee3dad289d8aec3392e7bee169c477ddc04:dist/js/index-d7bafa9a.js
			
--- a/dist/js/index-97ac063f.js
+++ b/dist/js/index-97ac063f.js
--- a/dist/js/index-9d967fb0.js
+++ b/dist/js/index-9d967fb0.js
--- a/dist/js/index-b731d112.js
+++ b/dist/js/index-b731d112.js
--- a/dist/js/index-bc0a5e16.js
+++ b/dist/js/index-bc0a5e16.js
--- a/dist/js/index-c5960176.js
+++ b/dist/js/index-c5960176.js
--- a/dist/js/index-d1df7006.js
+++ b/dist/js/index-d1df7006.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-efdd0c2e.js
			
 
				+import{d as i,g as l,n as d,bM as e,c,m as r,h as s,au as u}from"./index-0b27d424.js";const m="_skeleton_vtlsh_1",f="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:m,detail:f,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,bM as e,c,m as r,h as s,au as u}from"./index-5bbbe457.js";const m="_skeleton_vtlsh_1",f="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:m,detail:f,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};
			
 
				+>>>>>>>> 16e47ee3dad289d8aec3392e7bee169c477ddc04:dist/js/index-d1df7006.js
			
--- a/dist/js/index-d7bafa9a.js
+++ b/dist/js/index-d7bafa9a.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-728a4f8f.js
			
 
				+import{b7 as l,d as i,h as a,bh as v,ba as r,bc as d,bz as _,bd as m,bA as w,bg as u,bk as g,F as A}from"./index-0b27d424.js";const[$,y]=l("skeleton-title"),P={round:Boolean,titleWidth:r};var p=i({name:$,props:P,setup(t){return()=>a("h3",{class:y([{round:t.round}]),style:{width:v(t.titleWidth)}},null)}});const T=d(p);var z=T;const[B,D]=l("skeleton-avatar"),F={avatarSize:r,avatarShape:m("round")};var N=i({name:B,props:F,setup(t){return()=>a("div",{class:D([t.avatarShape]),style:_(t.avatarSize)},null)}});const R=d(N);var I=R;const s="100%",L={round:Boolean,rowWidth:{type:r,default:s}},[U,C]=l("skeleton-paragraph");var E=i({name:U,props:L,setup(t){return()=>a("div",{class:C([{round:t.round}]),style:{width:t.rowWidth}},null)}});const H=d(E);var O=H;const[V,c]=l("skeleton"),j="60%",q={row:w(0),round:Boolean,title:Boolean,titleWidth:r,avatar:Boolean,avatarSize:r,avatarShape:m("round"),loading:u,animate:u,rowWidth:{type:[Number,String,Array],default:s}};var x=i({name:V,inheritAttrs:!1,props:q,setup(t,{slots:o,attrs:h}){const f=()=>{if(t.avatar)return a(I,{avatarShape:t.avatarShape,avatarSize:t.avatarSize},null)},S=()=>{if(t.title)return a(z,{round:t.round,titleWidth:t.titleWidth},null)},k=n=>{const{rowWidth:e}=t;return e===s&&n===+t.row-1?j:Array.isArray(e)?e[n]:e},W=()=>Array(+t.row).fill("").map((n,e)=>a(O,{key:e,round:t.round,rowWidth:v(k(e))},null)),b=()=>o.template?o.template():a(A,null,[f(),a("div",{class:c("content")},[S(),W()])]);return()=>{var n;return t.loading?a("div",g({class:c({animate:t.animate,round:t.round})},h),[b()]):(n=o.default)==null?void 0:n.call(o)}}});const J=d(x);export{J as S};
			
 
				+========
			
 
				+import{b7 as l,d as i,h as a,bh as v,ba as r,bc as d,bz as _,bd as m,bA as w,bg as u,bk as g,F as A}from"./index-5bbbe457.js";const[$,y]=l("skeleton-title"),P={round:Boolean,titleWidth:r};var p=i({name:$,props:P,setup(t){return()=>a("h3",{class:y([{round:t.round}]),style:{width:v(t.titleWidth)}},null)}});const T=d(p);var z=T;const[B,D]=l("skeleton-avatar"),F={avatarSize:r,avatarShape:m("round")};var N=i({name:B,props:F,setup(t){return()=>a("div",{class:D([t.avatarShape]),style:_(t.avatarSize)},null)}});const R=d(N);var I=R;const s="100%",L={round:Boolean,rowWidth:{type:r,default:s}},[U,C]=l("skeleton-paragraph");var E=i({name:U,props:L,setup(t){return()=>a("div",{class:C([{round:t.round}]),style:{width:t.rowWidth}},null)}});const H=d(E);var O=H;const[V,c]=l("skeleton"),j="60%",q={row:w(0),round:Boolean,title:Boolean,titleWidth:r,avatar:Boolean,avatarSize:r,avatarShape:m("round"),loading:u,animate:u,rowWidth:{type:[Number,String,Array],default:s}};var x=i({name:V,inheritAttrs:!1,props:q,setup(t,{slots:o,attrs:h}){const f=()=>{if(t.avatar)return a(I,{avatarShape:t.avatarShape,avatarSize:t.avatarSize},null)},S=()=>{if(t.title)return a(z,{round:t.round,titleWidth:t.titleWidth},null)},k=n=>{const{rowWidth:e}=t;return e===s&&n===+t.row-1?j:Array.isArray(e)?e[n]:e},W=()=>Array(+t.row).fill("").map((n,e)=>a(O,{key:e,round:t.round,rowWidth:v(k(e))},null)),b=()=>o.template?o.template():a(A,null,[f(),a("div",{class:c("content")},[S(),W()])]);return()=>{var n;return t.loading?a("div",g({class:c({animate:t.animate,round:t.round})},h),[b()]):(n=o.default)==null?void 0:n.call(o)}}});const J=d(x);export{J as S};
			
 
				+>>>>>>>> 16e47ee3dad289d8aec3392e7bee169c477ddc04:dist/js/index-d7bafa9a.js
			
--- a/dist/js/index-e9c8f4b1.js
+++ b/dist/js/index-e9c8f4b1.js
--- a/dist/js/index-efdd0c2e.js
+++ b/dist/js/index-efdd0c2e.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-efdd0c2e.js
			
 
				 import{d as i,g as l,n as d,bM as e,c,m as r,h as s,au as u}from"./index-0b27d424.js";const m="_skeleton_vtlsh_1",f="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:m,detail:f,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,bM as e,c,m as r,h as s,au as u}from"./index-5bbbe457.js";const m="_skeleton_vtlsh_1",f="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:m,detail:f,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};
			
 
				+>>>>>>>> 16e47ee3dad289d8aec3392e7bee169c477ddc04:dist/js/index-d1df7006.js
			
--- a/dist/js/index-f7986896.js
+++ b/dist/js/index-f7986896.js
--- a/dist/js/index-legacy-01199403.js
+++ b/dist/js/index-legacy-01199403.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-01199403.js
			
 
				 System.register(["./index-legacy-e13f4c1f.js"],(function(t,a){"use strict";var r,e,n,l,o,i,s,u,d,p,v,h;return{setters:[t=>{r=t.b7,e=t.d,n=t.h,l=t.bh,o=t.ba,i=t.bc,s=t.bz,u=t.bd,d=t.bA,p=t.bg,v=t.bk,h=t.F}],execute:function(){const[a,c]=r("skeleton-title"),S={round:Boolean,titleWidth:o};var m=e({name:a,props:S,setup:t=>()=>n("h3",{class:c([{round:t.round}]),style:{width:l(t.titleWidth)}},null)}),y=i(m);const[b,w]=r("skeleton-avatar"),W={avatarSize:o,avatarShape:u("round")};var f=e({name:b,props:W,setup:t=>()=>n("div",{class:w([t.avatarShape]),style:s(t.avatarSize)},null)}),g=i(f);const k="100%",z={round:Boolean,rowWidth:{type:o,default:k}},[A,B]=r("skeleton-paragraph");var x=e({name:A,props:z,setup:t=>()=>n("div",{class:B([{round:t.round}]),style:{width:t.rowWidth}},null)}),j=i(x);const[F,N]=r("skeleton"),q={row:d(0),round:Boolean,title:Boolean,titleWidth:o,avatar:Boolean,avatarSize:o,avatarShape:u("round"),loading:p,animate:p,rowWidth:{type:[Number,String,Array],default:k}};var C=e({name:F,inheritAttrs:!1,props:q,setup(t,{slots:a,attrs:r}){const e=()=>{if(t.avatar)return n(g,{avatarShape:t.avatarShape,avatarSize:t.avatarSize},null)},o=()=>{if(t.title)return n(y,{round:t.round,titleWidth:t.titleWidth},null)},i=a=>{const{rowWidth:r}=t;return r===k&&a===+t.row-1?"60%":Array.isArray(r)?r[a]:r};return()=>{var s;return t.loading?n("div",v({class:N({animate:t.animate,round:t.round})},r),[a.template?a.template():n(h,null,[e(),n("div",{class:N("content")},[o(),Array(+t.row).fill("").map(((a,r)=>n(j,{key:r,round:t.round,rowWidth:l(i(r))},null)))])])]):null==(s=a.default)?void 0:s.call(a)}}});t("S",i(C))}}}));
			
 
				+========
			
 
				+System.register(["./index-legacy-c2fd5365.js"],(function(t,a){"use strict";var r,e,n,l,o,i,s,u,d,p,v,h;return{setters:[t=>{r=t.b7,e=t.d,n=t.h,l=t.bh,o=t.ba,i=t.bc,s=t.bz,u=t.bd,d=t.bA,p=t.bg,v=t.bk,h=t.F}],execute:function(){const[a,c]=r("skeleton-title"),S={round:Boolean,titleWidth:o};var m=e({name:a,props:S,setup:t=>()=>n("h3",{class:c([{round:t.round}]),style:{width:l(t.titleWidth)}},null)}),y=i(m);const[b,w]=r("skeleton-avatar"),W={avatarSize:o,avatarShape:u("round")};var f=e({name:b,props:W,setup:t=>()=>n("div",{class:w([t.avatarShape]),style:s(t.avatarSize)},null)}),g=i(f);const k="100%",z={round:Boolean,rowWidth:{type:o,default:k}},[A,B]=r("skeleton-paragraph");var x=e({name:A,props:z,setup:t=>()=>n("div",{class:B([{round:t.round}]),style:{width:t.rowWidth}},null)}),j=i(x);const[F,N]=r("skeleton"),q={row:d(0),round:Boolean,title:Boolean,titleWidth:o,avatar:Boolean,avatarSize:o,avatarShape:u("round"),loading:p,animate:p,rowWidth:{type:[Number,String,Array],default:k}};var C=e({name:F,inheritAttrs:!1,props:q,setup(t,{slots:a,attrs:r}){const e=()=>{if(t.avatar)return n(g,{avatarShape:t.avatarShape,avatarSize:t.avatarSize},null)},o=()=>{if(t.title)return n(y,{round:t.round,titleWidth:t.titleWidth},null)},i=a=>{const{rowWidth:r}=t;return r===k&&a===+t.row-1?"60%":Array.isArray(r)?r[a]:r};return()=>{var s;return t.loading?n("div",v({class:N({animate:t.animate,round:t.round})},r),[a.template?a.template():n(h,null,[e(),n("div",{class:N("content")},[o(),Array(+t.row).fill("").map(((a,r)=>n(j,{key:r,round:t.round,rowWidth:l(i(r))},null)))])])]):null==(s=a.default)?void 0:s.call(a)}}});t("S",i(C))}}}));
			
 
				+>>>>>>>> 16e47ee3dad289d8aec3392e7bee169c477ddc04:dist/js/index-legacy-99e81ac9.js
			
--- a/dist/js/index-legacy-099c9eb4.js
+++ b/dist/js/index-legacy-099c9eb4.js
--- a/dist/js/index-legacy-100fd3d5.js
+++ b/dist/js/index-legacy-100fd3d5.js
--- a/dist/js/index-legacy-1fd26204.js
+++ b/dist/js/index-legacy-1fd26204.js
--- a/dist/js/index-legacy-3e5cb743.js
+++ b/dist/js/index-legacy-3e5cb743.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-3e5cb743.js
			
 
				 System.register(["./index-legacy-e13f4c1f.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.bM,r=e.c,s=e.m,d=e.h,l=e.au}],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)])])}}))}}}));
			
 
				+========
			
 
				+System.register(["./index-legacy-c2fd5365.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.bM,r=e.c,s=e.m,d=e.h,l=e.au}],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)])])}}))}}}));
			
 
				+>>>>>>>> 16e47ee3dad289d8aec3392e7bee169c477ddc04:dist/js/index-legacy-60e49413.js
			
--- a/dist/js/index-legacy-60e49413.js
+++ b/dist/js/index-legacy-60e49413.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-3e5cb743.js
			
 
				+System.register(["./index-legacy-e13f4c1f.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.bM,r=e.c,s=e.m,d=e.h,l=e.au}],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)])])}}))}}}));
			
 
				+========
			
 
				+System.register(["./index-legacy-c2fd5365.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.bM,r=e.c,s=e.m,d=e.h,l=e.au}],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)])])}}))}}}));
			
 
				+>>>>>>>> 16e47ee3dad289d8aec3392e7bee169c477ddc04:dist/js/index-legacy-60e49413.js
			
--- a/dist/js/index-legacy-62b75ef6.js
+++ b/dist/js/index-legacy-62b75ef6.js
--- a/dist/js/index-legacy-6761d899.js
+++ b/dist/js/index-legacy-6761d899.js
--- a/dist/js/index-legacy-79e7573c.js
+++ b/dist/js/index-legacy-79e7573c.js
--- a/dist/js/index-legacy-880a1dd8.js
+++ b/dist/js/index-legacy-880a1dd8.js
--- a/dist/js/index-legacy-99e81ac9.js
+++ b/dist/js/index-legacy-99e81ac9.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-01199403.js
			
 
				+System.register(["./index-legacy-e13f4c1f.js"],(function(t,a){"use strict";var r,e,n,l,o,i,s,u,d,p,v,h;return{setters:[t=>{r=t.b7,e=t.d,n=t.h,l=t.bh,o=t.ba,i=t.bc,s=t.bz,u=t.bd,d=t.bA,p=t.bg,v=t.bk,h=t.F}],execute:function(){const[a,c]=r("skeleton-title"),S={round:Boolean,titleWidth:o};var m=e({name:a,props:S,setup:t=>()=>n("h3",{class:c([{round:t.round}]),style:{width:l(t.titleWidth)}},null)}),y=i(m);const[b,w]=r("skeleton-avatar"),W={avatarSize:o,avatarShape:u("round")};var f=e({name:b,props:W,setup:t=>()=>n("div",{class:w([t.avatarShape]),style:s(t.avatarSize)},null)}),g=i(f);const k="100%",z={round:Boolean,rowWidth:{type:o,default:k}},[A,B]=r("skeleton-paragraph");var x=e({name:A,props:z,setup:t=>()=>n("div",{class:B([{round:t.round}]),style:{width:t.rowWidth}},null)}),j=i(x);const[F,N]=r("skeleton"),q={row:d(0),round:Boolean,title:Boolean,titleWidth:o,avatar:Boolean,avatarSize:o,avatarShape:u("round"),loading:p,animate:p,rowWidth:{type:[Number,String,Array],default:k}};var C=e({name:F,inheritAttrs:!1,props:q,setup(t,{slots:a,attrs:r}){const e=()=>{if(t.avatar)return n(g,{avatarShape:t.avatarShape,avatarSize:t.avatarSize},null)},o=()=>{if(t.title)return n(y,{round:t.round,titleWidth:t.titleWidth},null)},i=a=>{const{rowWidth:r}=t;return r===k&&a===+t.row-1?"60%":Array.isArray(r)?r[a]:r};return()=>{var s;return t.loading?n("div",v({class:N({animate:t.animate,round:t.round})},r),[a.template?a.template():n(h,null,[e(),n("div",{class:N("content")},[o(),Array(+t.row).fill("").map(((a,r)=>n(j,{key:r,round:t.round,rowWidth:l(i(r))},null)))])])]):null==(s=a.default)?void 0:s.call(a)}}});t("S",i(C))}}}));
			
 
				+========
			
 
				+System.register(["./index-legacy-c2fd5365.js"],(function(t,a){"use strict";var r,e,n,l,o,i,s,u,d,p,v,h;return{setters:[t=>{r=t.b7,e=t.d,n=t.h,l=t.bh,o=t.ba,i=t.bc,s=t.bz,u=t.bd,d=t.bA,p=t.bg,v=t.bk,h=t.F}],execute:function(){const[a,c]=r("skeleton-title"),S={round:Boolean,titleWidth:o};var m=e({name:a,props:S,setup:t=>()=>n("h3",{class:c([{round:t.round}]),style:{width:l(t.titleWidth)}},null)}),y=i(m);const[b,w]=r("skeleton-avatar"),W={avatarSize:o,avatarShape:u("round")};var f=e({name:b,props:W,setup:t=>()=>n("div",{class:w([t.avatarShape]),style:s(t.avatarSize)},null)}),g=i(f);const k="100%",z={round:Boolean,rowWidth:{type:o,default:k}},[A,B]=r("skeleton-paragraph");var x=e({name:A,props:z,setup:t=>()=>n("div",{class:B([{round:t.round}]),style:{width:t.rowWidth}},null)}),j=i(x);const[F,N]=r("skeleton"),q={row:d(0),round:Boolean,title:Boolean,titleWidth:o,avatar:Boolean,avatarSize:o,avatarShape:u("round"),loading:p,animate:p,rowWidth:{type:[Number,String,Array],default:k}};var C=e({name:F,inheritAttrs:!1,props:q,setup(t,{slots:a,attrs:r}){const e=()=>{if(t.avatar)return n(g,{avatarShape:t.avatarShape,avatarSize:t.avatarSize},null)},o=()=>{if(t.title)return n(y,{round:t.round,titleWidth:t.titleWidth},null)},i=a=>{const{rowWidth:r}=t;return r===k&&a===+t.row-1?"60%":Array.isArray(r)?r[a]:r};return()=>{var s;return t.loading?n("div",v({class:N({animate:t.animate,round:t.round})},r),[a.template?a.template():n(h,null,[e(),n("div",{class:N("content")},[o(),Array(+t.row).fill("").map(((a,r)=>n(j,{key:r,round:t.round,rowWidth:l(i(r))},null)))])])]):null==(s=a.default)?void 0:s.call(a)}}});t("S",i(C))}}}));
			
 
				+>>>>>>>> 16e47ee3dad289d8aec3392e7bee169c477ddc04:dist/js/index-legacy-99e81ac9.js
			
--- a/dist/js/index-legacy-9b46c15f.js
+++ b/dist/js/index-legacy-9b46c15f.js
--- a/dist/js/index-legacy-af92ffca.js
+++ b/dist/js/index-legacy-af92ffca.js
--- a/dist/js/index-legacy-c2fd5365.js
+++ b/dist/js/index-legacy-c2fd5365.js
--- a/dist/js/index-legacy-c97d4b76.js
+++ b/dist/js/index-legacy-c97d4b76.js
--- a/dist/js/index-legacy-e13f4c1f.js
+++ b/dist/js/index-legacy-e13f4c1f.js
--- a/dist/js/index-legacy-e287cbe1.js
+++ b/dist/js/index-legacy-e287cbe1.js
--- a/dist/js/index-legacy-f4c20750.js
+++ b/dist/js/index-legacy-f4c20750.js
--- a/dist/js/instrument-4b0ee13e.js
+++ b/dist/js/instrument-4b0ee13e.js
--- a/dist/js/instrument-c4cbb21d.js
+++ b/dist/js/instrument-c4cbb21d.js
--- a/dist/js/instrument-legacy-4f902f35.js
+++ b/dist/js/instrument-legacy-4f902f35.js
--- a/dist/js/instrument-legacy-c44344da.js
+++ b/dist/js/instrument-legacy-c44344da.js
--- a/dist/js/modeView-5a8737fb.js
+++ b/dist/js/modeView-5a8737fb.js
--- a/dist/js/modeView-7c83a6b2.js
+++ b/dist/js/modeView-7c83a6b2.js
--- a/dist/js/modeView-legacy-33bc6e62.js
+++ b/dist/js/modeView-legacy-33bc6e62.js
--- a/dist/js/modeView-legacy-6247ce8d.js
+++ b/dist/js/modeView-legacy-6247ce8d.js
--- a/dist/js/orchestra-20bf1af2.js
+++ b/dist/js/orchestra-20bf1af2.js
--- a/dist/js/orchestra-65d6be9a.js
+++ b/dist/js/orchestra-65d6be9a.js
--- a/dist/js/orchestra-legacy-2340407a.js
+++ b/dist/js/orchestra-legacy-2340407a.js
--- a/dist/js/orchestra-legacy-6b8fa61e.js
+++ b/dist/js/orchestra-legacy-6b8fa61e.js
--- a/dist/js/polyfills-336fef56.js
+++ b/dist/js/polyfills-336fef56.js
--- a/dist/js/polyfills-eb47a7de.js
+++ b/dist/js/polyfills-eb47a7de.js
--- a/dist/js/polyfills-legacy-d06b42a6.js
+++ b/dist/js/polyfills-legacy-d06b42a6.js
--- a/dist/js/report-share-1380041c.js
+++ b/dist/js/report-share-1380041c.js
--- a/dist/js/report-share-f1f9b7ea.js
+++ b/dist/js/report-share-f1f9b7ea.js
--- a/dist/js/report-share-legacy-9d7055cd.js
+++ b/dist/js/report-share-legacy-9d7055cd.js
--- a/dist/js/report-share-legacy-e3272ef1.js
+++ b/dist/js/report-share-legacy-e3272ef1.js
--- a/dist/orchestra.html
+++ b/dist/orchestra.html
@@ -2,7 +2,11 @@
 
				 <html lang="en">
			
 
				 
			
 
				 <head>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/polyfills-eb47a7de.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-336fef56.js"></script>
			
 
				+>>>>>>> 16e47ee3dad289d8aec3392e7bee169c477ddc04
			
 
				 
			
 
				   <meta charset="UTF-8" />
			
 
				   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
			
@@ -41,12 +45,21 @@
 
				       transition: opacity .3s;
			
 
				     }
			
 
				   </style>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/orchestra-20bf1af2.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-0b27d424.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-6358d95c.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-3f1d65f9.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-c5960176.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-728a4f8f.js">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/orchestra-65d6be9a.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-5bbbe457.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-522f7332.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-68946d68.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-e9c8f4b1.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-d7bafa9a.js">
			
 
				+>>>>>>> 16e47ee3dad289d8aec3392e7bee169c477ddc04
			
 
				   <link rel="stylesheet" href="./css/index-0e9d5ebe.css">
			
 
				   <link rel="stylesheet" href="./css/index-85f95688.css">
			
 
				   <link rel="stylesheet" href="./css/orchestra-8e05e751.css">
			
@@ -70,8 +83,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="./js/polyfills-legacy-40603d5c.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/orchestra-legacy-2340407a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-d06b42a6.js"></script>
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/orchestra-legacy-6b8fa61e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> 16e47ee3dad289d8aec3392e7bee169c477ddc04
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/dist/report-share.html
+++ b/dist/report-share.html
@@ -2,7 +2,11 @@
 
				 <html lang="en">
			
 
				 
			
 
				 <head>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/polyfills-eb47a7de.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-336fef56.js"></script>
			
 
				+>>>>>>> 16e47ee3dad289d8aec3392e7bee169c477ddc04
			
 
				 
			
 
				   <meta charset="UTF-8" />
			
 
				   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
			
@@ -25,10 +29,17 @@
 
				       transition: opacity .3s;
			
 
				     }
			
 
				   </style>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/report-share-1380041c.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-0b27d424.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-728a4f8f.js">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/report-share-f1f9b7ea.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-5bbbe457.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-d7bafa9a.js">
			
 
				+>>>>>>> 16e47ee3dad289d8aec3392e7bee169c477ddc04
			
 
				   <link rel="stylesheet" href="./css/index-0e9d5ebe.css">
			
 
				   <link rel="stylesheet" href="./css/plyr-ad8ef5ae.css">
			
 
				   <link rel="stylesheet" href="./css/report-share-0f4c3151.css">
			
@@ -52,8 +63,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="./js/polyfills-legacy-40603d5c.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/report-share-legacy-9d7055cd.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-d06b42a6.js"></script>
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/report-share-legacy-e3272ef1.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> 16e47ee3dad289d8aec3392e7bee169c477ddc04
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/helpers/beatConfig.ts
+++ b/src/helpers/beatConfig.ts
@@ -0,0 +1,72 @@
 
				+export const unitObj = {
			
 
				+   "1/1": 1 / 1,
			
 
				+   "1/2": 1 / 2,
			
 
				+   "1/4": 1 / 4,
			
 
				+   "1/8": 1 / 8,
			
 
				+   "1/16": 1 / 16,
			
 
				+   "1/2.": (1 / 2) * 1.5,
			
 
				+   "1/4.": (1 / 4) * 1.5,
			
 
				+   "1/8.": (1 / 8) * 1.5
			
 
				+} as Record<string, any>
			
 
				+
			
 
				+/**
			
 
				+ * 速度转换，几分音符的速度转为几分音符的速度
			
 
				+ */
			
 
				+export const speedBeatTo = (speedBeat: { unit: string; speed: number }, unit: string) => {
			
 
				+   return (unitObj[speedBeat.unit] * speedBeat.speed) / unitObj[unit]
			
 
				+}
			
 
				+
			
 
				+/** 谱面速度节拍器转为 约定的节拍器符号 */
			
 
				+export function beatUnitTo(beatUnit: string, isDot: boolean) {
			
 
				+   let multiple = "1/4"
			
 
				+   switch (beatUnit) {
			
 
				+      case "1024th":
			
 
				+         multiple = "1/1024"
			
 
				+         break
			
 
				+      case "512th":
			
 
				+         multiple = "1/512"
			
 
				+         break
			
 
				+      case "256th":
			
 
				+         multiple = "1/256"
			
 
				+         break
			
 
				+      case "128th":
			
 
				+         multiple = "1/128"
			
 
				+         break
			
 
				+      case "64th":
			
 
				+         multiple = "1/64"
			
 
				+         break
			
 
				+      case "32nd":
			
 
				+         multiple = "1/32"
			
 
				+         break
			
 
				+      case "16th":
			
 
				+         multiple = "1/16"
			
 
				+         break
			
 
				+      case "eighth":
			
 
				+         multiple = "1/8"
			
 
				+         break
			
 
				+      case "quarter":
			
 
				+         multiple = "1/4"
			
 
				+         break
			
 
				+      case "half":
			
 
				+         multiple = "1/2"
			
 
				+         break
			
 
				+      case "whole":
			
 
				+         multiple = "1/1"
			
 
				+      default:
			
 
				+         break
			
 
				+   }
			
 
				+   isDot && (multiple += ".")
			
 
				+   return multiple
			
 
				+}
			
 
				+
			
 
				+/** 几分音符对应的速度图片 */
			
 
				+export const unitImgs = {
			
 
				+   "1/1": 'speed1',
			
 
				+   "1/2": 'speed2',
			
 
				+   "1/4": 'speed3',
			
 
				+   "1/8": 'speed4',
			
 
				+   "1/16": 'spee5',
			
 
				+   "1/2.": 'speed6',
			
 
				+   "1/4.": 'speed7',
			
 
				+   "1/8.": 'speed8',
			
 
				+} as Record<string, any>
			
--- a/src/helpers/metronome.ts
+++ b/src/helpers/metronome.ts
@@ -282,6 +282,11 @@ class Metronome {
 
				 			// console.log("🚀 ~ measureNumberXML", measureNumberXML, note)
			
 
				 			// console.log("🚀 ~ measureNumberXML", note)
			
 
				 			const measureListIndex = measureNumberXML - 1;
			
 
				+			// 当渐快渐慢的时候  不播节拍器
			
 
				+			if(isWithinRange(state.gradual, measureListIndex)){
			
 
				+				xmlNumber = measureNumberXML;
			
 
				+				continue
			
 
				+			}
			
 
				 			if (measureNumberXML > -1) {
			
 
				 				if (measureNumberXML != xmlNumber) {
			
 
				 					// 弱起的时候 根据音符结尾时间减去音符开头时间，得到的不是正常小节的时间，然后平均分配节拍之后，当前节拍间隔会非常短 这里弱起取整个小节的时间
			
@@ -660,4 +665,15 @@ function hideCursorTip() {
 
				 	}
			
 
				 }
			
 
				 
			
 
				+function isWithinRange(ranges:any[], index:number) {
			
 
				+	for (const range of ranges) {
			
 
				+		const start = range[0].measureIndex;
			
 
				+		const end = range[1].measureIndex;
			
 
				+		if (index >= start && index < end) {
			
 
				+			return true;
			
 
				+		}
			
 
				+	}
			
 
				+	return false;
			
 
				+}
			
 
				+
			
 
				 export default Metronome;
			
--- a/src/state.ts
+++ b/src/state.ts
@@ -22,6 +22,7 @@ import { musicScoreRef, headerColumnHide } from "/src/page-instrument/view-detai
 
				 import { headTopData } from "/src/page-instrument/header-top/index";
			
 
				 import { api_lessonTrainingTrainingStudentDetail } from "/src/page-instrument/api"
			
 
				 import { undoData, moveData } from "/src/view/plugins/move-music-score"
			
 
				+import { speedBeatTo } from "/src/helpers/beatConfig"
			
 
				 
			
 
				 const query: any = getQuery();
			
 
				 
			
@@ -358,6 +359,8 @@ const state = reactive({
 
				   bizMusicCategoryId: 0,
			
 
				   /** 资源类型: mp3 | midi */
			
 
				   playMode: "MP3" as "MP3" | "MIDI",
			
 
				+  /** 谱面的速度节拍 */
			
 
				+  speedBeatUnit: "1/4",
			
 
				   /** 设置的速度 */
			
 
				   speed: 0,
			
 
				   /** 曲谱音频正常的速度 */
			
@@ -1673,7 +1676,10 @@ const setState = (data: any, index: number) => {
 
				   state.musicSheetCategoriesId = data.musicCategoryId;
			
 
				   state.bizMusicCategoryId = data.bizMusicCategoryId
			
 
				   state.playMode = data.playMode === "MP3" ? "MP3" : "MIDI";
			
 
				-  state.originSpeed = state.speed = parseFloat(data.playSpeed) || 0;
			
 
				+  // 设置速度节拍
			
 
				+  state.speedBeatUnit = data.speedBeatUnit || "1/4"
			
 
				+  // 这里把后台设置的速度 转换为1/4拍的速度 
			
 
				+  state.originSpeed = state.speed = speedBeatTo({unit: data.speedBeatUnit || "1/4",speed: parseFloat(data.playSpeed) || 0}, `1/4`);
			
 
				   // state.originSpeed = state.speed = data.playSpeed;
			
 
				   // state.playIngSpeed = data.playSpeed;
			
 
				   const track = data.code || data.track;
			
--- a/stats.html
+++ b/stats.html