1 month ago · 8441019b48
--- a/dist/colexiu.html
+++ b/dist/colexiu.html
@@ -2,7 +2,11 @@
 
				 <html lang="en">
			
 
				 
			
 
				 <head>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/polyfills-e26b5460.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-da8f0a4a.js"></script>
			
 
				+>>>>>>> c921cbbfaf0bac921dd61009be8ae1352619ba2f
			
 
				 
			
 
				   <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-37662591.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-97fa34d5.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-b2444195.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-0beaeecb.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-b151b087.js">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/colexiu-2bf974ad.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-164a03ad.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-bbfa6aeb.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-94cc5202.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-444ffe79.js">
			
 
				+>>>>>>> c921cbbfaf0bac921dd61009be8ae1352619ba2f
			
 
				   <link rel="stylesheet" href="./css/index-c14a2cb8.css">
			
 
				   <link rel="stylesheet" href="./css/colexiu-62f31c4f.css">
			
 
				   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
			
@@ -57,7 +69,11 @@
 
				   
			
 
				   <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>
			
 
				   <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-90771e26.js"></script>
			
 
				+<<<<<<< HEAD
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/colexiu-legacy-afdf8a8e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/colexiu-legacy-fd34b914.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> c921cbbfaf0bac921dd61009be8ae1352619ba2f
			
 
				 </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-e26b5460.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-da8f0a4a.js"></script>
			
 
				+>>>>>>> c921cbbfaf0bac921dd61009be8ae1352619ba2f
			
 
				 
			
 
				   <meta charset="UTF-8">
			
 
				   <link rel="icon" href="./favicon.ico" />
			
@@ -75,11 +79,19 @@
 
				       }
			
 
				     })
			
 
				   </script>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/gym-08ed1ba1.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-97fa34d5.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-b2444195.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-914a771f.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-b151b087.js">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/gym-205522e4.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-164a03ad.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-bbfa6aeb.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-3ccdda4a.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-444ffe79.js">
			
 
				+>>>>>>> c921cbbfaf0bac921dd61009be8ae1352619ba2f
			
 
				   <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
			
 
				   <link rel="stylesheet" href="./css/index-c14a2cb8.css">
			
 
				   <link rel="stylesheet" href="./css/index-85f95688.css">
			
@@ -99,7 +111,11 @@
 
				   
			
 
				   <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>
			
 
				   <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-90771e26.js"></script>
			
 
				+<<<<<<< HEAD
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/gym-legacy-29dbe4a8.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/gym-legacy-12286c74.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> c921cbbfaf0bac921dd61009be8ae1352619ba2f
			
 
				 </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-e26b5460.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-da8f0a4a.js"></script>
			
 
				+>>>>>>> c921cbbfaf0bac921dd61009be8ae1352619ba2f
			
 
				 
			
 
				   <meta charset="UTF-8" />
			
 
				   <meta name="viewport"
			
@@ -41,8 +45,13 @@
 
				       })
			
 
				     }
			
 
				   </script>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/instrument-37b3077c.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-97fa34d5.js">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/instrument-cc91e66a.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-164a03ad.js">
			
 
				+>>>>>>> c921cbbfaf0bac921dd61009be8ae1352619ba2f
			
 
				   <link rel="stylesheet" href="./css/index-c14a2cb8.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>
			
@@ -68,7 +77,11 @@
 
				   </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>
			
 
				   <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-90771e26.js"></script>
			
 
				+<<<<<<< HEAD
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-35aacfce.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-a71ac5ed.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> c921cbbfaf0bac921dd61009be8ae1352619ba2f
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/dist/js/colexiu-2bf974ad.js
+++ b/dist/js/colexiu-2bf974ad.js
--- a/dist/js/colexiu-37662591.js
+++ b/dist/js/colexiu-37662591.js
--- a/dist/js/colexiu-legacy-afdf8a8e.js
+++ b/dist/js/colexiu-legacy-afdf8a8e.js
--- a/dist/js/colexiu-legacy-fd34b914.js
+++ b/dist/js/colexiu-legacy-fd34b914.js
--- a/dist/js/gym-08ed1ba1.js
+++ b/dist/js/gym-08ed1ba1.js
--- a/dist/js/gym-205522e4.js
+++ b/dist/js/gym-205522e4.js
--- a/dist/js/gym-legacy-12286c74.js
+++ b/dist/js/gym-legacy-12286c74.js
--- a/dist/js/gym-legacy-29dbe4a8.js
+++ b/dist/js/gym-legacy-29dbe4a8.js
--- a/dist/js/index-0beaeecb.js
+++ b/dist/js/index-0beaeecb.js
--- a/dist/js/index-164a03ad.js
+++ b/dist/js/index-164a03ad.js
--- a/dist/js/index-23868d7b.js
+++ b/dist/js/index-23868d7b.js
--- a/dist/js/index-25785b28.js
+++ b/dist/js/index-25785b28.js
--- a/dist/js/index-3ccdda4a.js
+++ b/dist/js/index-3ccdda4a.js
--- a/dist/js/index-444ffe79.js
+++ b/dist/js/index-444ffe79.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-b151b087.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-97fa34d5.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-164a03ad.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};
			
 
				+>>>>>>>> c921cbbfaf0bac921dd61009be8ae1352619ba2f:dist/js/index-444ffe79.js
			
--- a/dist/js/index-5345375f.js
+++ b/dist/js/index-5345375f.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-5345375f.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-97fa34d5.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-164a03ad.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};
			
 
				+>>>>>>>> c921cbbfaf0bac921dd61009be8ae1352619ba2f:dist/js/index-fee9946b.js
			
--- a/dist/js/index-6c3bc664.js
+++ b/dist/js/index-6c3bc664.js
--- a/dist/js/index-914a771f.js
+++ b/dist/js/index-914a771f.js
--- a/dist/js/index-91f32971.js
+++ b/dist/js/index-91f32971.js
--- a/dist/js/index-94cc5202.js
+++ b/dist/js/index-94cc5202.js
--- a/dist/js/index-97fa34d5.js
+++ b/dist/js/index-97fa34d5.js
--- a/dist/js/index-aac90692.js
+++ b/dist/js/index-aac90692.js
--- a/dist/js/index-b151b087.js
+++ b/dist/js/index-b151b087.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-b151b087.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-97fa34d5.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-164a03ad.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};
			
 
				+>>>>>>>> c921cbbfaf0bac921dd61009be8ae1352619ba2f:dist/js/index-444ffe79.js
			
--- a/dist/js/index-b2444195.js
+++ b/dist/js/index-b2444195.js
--- a/dist/js/index-bbfa6aeb.js
+++ b/dist/js/index-bbfa6aeb.js
--- a/dist/js/index-fee9946b.js
+++ b/dist/js/index-fee9946b.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-5345375f.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-97fa34d5.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-164a03ad.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};
			
 
				+>>>>>>>> c921cbbfaf0bac921dd61009be8ae1352619ba2f:dist/js/index-fee9946b.js
			
--- a/dist/js/index-legacy-20cc44fc.js
+++ b/dist/js/index-legacy-20cc44fc.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-20cc44fc.js
			
 
				 System.register(["./index-legacy-905a7c79.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-79104db2.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)])])}}))}}}));
			
 
				+>>>>>>>> c921cbbfaf0bac921dd61009be8ae1352619ba2f:dist/js/index-legacy-9e72e6e6.js
			
--- a/dist/js/index-legacy-249e3b63.js
+++ b/dist/js/index-legacy-249e3b63.js
--- a/dist/js/index-legacy-3f14d9a6.js
+++ b/dist/js/index-legacy-3f14d9a6.js
--- a/dist/js/index-legacy-48ab9139.js
+++ b/dist/js/index-legacy-48ab9139.js
--- a/dist/js/index-legacy-4d7f9acf.js
+++ b/dist/js/index-legacy-4d7f9acf.js
--- a/dist/js/index-legacy-76ef9510.js
+++ b/dist/js/index-legacy-76ef9510.js
--- a/dist/js/index-legacy-79104db2.js
+++ b/dist/js/index-legacy-79104db2.js
--- a/dist/js/index-legacy-8262cdf4.js
+++ b/dist/js/index-legacy-8262cdf4.js
--- a/dist/js/index-legacy-8dcd42a9.js
+++ b/dist/js/index-legacy-8dcd42a9.js
--- a/dist/js/index-legacy-905a7c79.js
+++ b/dist/js/index-legacy-905a7c79.js
--- a/dist/js/index-legacy-9e72e6e6.js
+++ b/dist/js/index-legacy-9e72e6e6.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-20cc44fc.js
			
 
				+System.register(["./index-legacy-905a7c79.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-79104db2.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)])])}}))}}}));
			
 
				+>>>>>>>> c921cbbfaf0bac921dd61009be8ae1352619ba2f:dist/js/index-legacy-9e72e6e6.js
			
--- a/dist/js/index-legacy-b0a0f1b5.js
+++ b/dist/js/index-legacy-b0a0f1b5.js
--- a/dist/js/index-legacy-b40d5797.js
+++ b/dist/js/index-legacy-b40d5797.js
--- a/dist/js/index-legacy-bd83cf40.js
+++ b/dist/js/index-legacy-bd83cf40.js
--- a/dist/js/index-legacy-bdf69429.js
+++ b/dist/js/index-legacy-bdf69429.js
--- a/dist/js/index-legacy-cc7092a9.js
+++ b/dist/js/index-legacy-cc7092a9.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-ec69039e.js
			
 
				+System.register(["./index-legacy-905a7c79.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-79104db2.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))}}}));
			
 
				+>>>>>>>> c921cbbfaf0bac921dd61009be8ae1352619ba2f:dist/js/index-legacy-cc7092a9.js
			
--- a/dist/js/index-legacy-ec69039e.js
+++ b/dist/js/index-legacy-ec69039e.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-ec69039e.js
			
 
				 System.register(["./index-legacy-905a7c79.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-79104db2.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))}}}));
			
 
				+>>>>>>>> c921cbbfaf0bac921dd61009be8ae1352619ba2f:dist/js/index-legacy-cc7092a9.js
			
--- a/dist/js/instrument-37b3077c.js
+++ b/dist/js/instrument-37b3077c.js
--- a/dist/js/instrument-cc91e66a.js
+++ b/dist/js/instrument-cc91e66a.js
--- a/dist/js/instrument-legacy-35aacfce.js
+++ b/dist/js/instrument-legacy-35aacfce.js
--- a/dist/js/instrument-legacy-a71ac5ed.js
+++ b/dist/js/instrument-legacy-a71ac5ed.js
--- a/dist/js/modeView-0aba735f.js
+++ b/dist/js/modeView-0aba735f.js
--- a/dist/js/modeView-57ed06d6.js
+++ b/dist/js/modeView-57ed06d6.js
--- a/dist/js/modeView-legacy-6527a430.js
+++ b/dist/js/modeView-legacy-6527a430.js
--- a/dist/js/modeView-legacy-884feaa9.js
+++ b/dist/js/modeView-legacy-884feaa9.js
--- a/dist/js/orchestra-117cca24.js
+++ b/dist/js/orchestra-117cca24.js
--- a/dist/js/orchestra-5c29f3ce.js
+++ b/dist/js/orchestra-5c29f3ce.js
--- a/dist/js/orchestra-legacy-019f04ad.js
+++ b/dist/js/orchestra-legacy-019f04ad.js
--- a/dist/js/orchestra-legacy-f9350f95.js
+++ b/dist/js/orchestra-legacy-f9350f95.js
--- a/dist/js/polyfills-da8f0a4a.js
+++ b/dist/js/polyfills-da8f0a4a.js
--- a/dist/js/polyfills-e26b5460.js
+++ b/dist/js/polyfills-e26b5460.js
--- a/dist/js/report-share-2221852e.js
+++ b/dist/js/report-share-2221852e.js
--- a/dist/js/report-share-afa28a08.js
+++ b/dist/js/report-share-afa28a08.js
--- a/dist/js/report-share-legacy-6e3ccf40.js
+++ b/dist/js/report-share-legacy-6e3ccf40.js
--- a/dist/js/report-share-legacy-ef20eb4d.js
+++ b/dist/js/report-share-legacy-ef20eb4d.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-e26b5460.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-da8f0a4a.js"></script>
			
 
				+>>>>>>> c921cbbfaf0bac921dd61009be8ae1352619ba2f
			
 
				 
			
 
				   <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-117cca24.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-97fa34d5.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-b2444195.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-0beaeecb.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-914a771f.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-b151b087.js">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/orchestra-5c29f3ce.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-164a03ad.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-bbfa6aeb.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-94cc5202.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-3ccdda4a.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-444ffe79.js">
			
 
				+>>>>>>> c921cbbfaf0bac921dd61009be8ae1352619ba2f
			
 
				   <link rel="stylesheet" href="./css/index-c14a2cb8.css">
			
 
				   <link rel="stylesheet" href="./css/index-85f95688.css">
			
 
				   <link rel="stylesheet" href="./css/orchestra-8bc1a9c0.css">
			
@@ -71,7 +84,11 @@
 
				   
			
 
				   <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>
			
 
				   <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-90771e26.js"></script>
			
 
				+<<<<<<< HEAD
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/orchestra-legacy-019f04ad.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/orchestra-legacy-f9350f95.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> c921cbbfaf0bac921dd61009be8ae1352619ba2f
			
 
				 </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-e26b5460.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-da8f0a4a.js"></script>
			
 
				+>>>>>>> c921cbbfaf0bac921dd61009be8ae1352619ba2f
			
 
				 
			
 
				   <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-afa28a08.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-97fa34d5.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-b151b087.js">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/report-share-2221852e.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-164a03ad.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-444ffe79.js">
			
 
				+>>>>>>> c921cbbfaf0bac921dd61009be8ae1352619ba2f
			
 
				   <link rel="stylesheet" href="./css/index-c14a2cb8.css">
			
 
				   <link rel="stylesheet" href="./css/plyr-ad8ef5ae.css">
			
 
				   <link rel="stylesheet" href="./css/report-share-0f4c3151.css">
			
@@ -53,7 +64,11 @@
 
				   
			
 
				   <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>
			
 
				   <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-90771e26.js"></script>
			
 
				+<<<<<<< HEAD
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/report-share-legacy-ef20eb4d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/report-share-legacy-6e3ccf40.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> c921cbbfaf0bac921dd61009be8ae1352619ba2f
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/helpers/customMusicScore.ts
+++ b/src/helpers/customMusicScore.ts
@@ -613,16 +613,14 @@ export const resetFormate = () => {
 
				 					}
			
 
				 				} catch (error) {}
			
 
				 				const bbox = stave?.getBBox() || {};
			
 
				-				const bgColor = state.isEvaluatReport ? '#132D4C' : state.isCbsView ? 'transparent' : '#609FCF';
			
 
				-				const botColor = state.isEvaluatReport ? '#040D1E' : state.isCbsView ? 'transparent' : '#2B70A5';
			
 
				+				const bgColor = 'transparent';
			
 
				 				const rect = `<rect class="vf-custom-bg" x="${bbox.x}" y="${bbox.y}" width="${bbox.width}" height="${bbox.height}" fill=${bgColor} />`
			
 
				-				const rectBottom = `<rect class="vf-custom-bot" x="${bbox.x}" y="${bbox.y+bbox.height}" width="${bbox.width}" height="7.5" fill=${botColor} />`
			
 
				 				// const filterDom = `<defs>
			
 
				 				// 						<filter id="shadow">
			
 
				 				// 						<feDropShadow dx="5" dy="5" stdDeviation="3" flood-color="black" />
			
 
				 				// 						</filter>
			
 
				 				// 					</defs>`
			
 
				-				const customG = `<g>${rect}${rectBottom}</g>`
			
 
				+				const customG = `<g>${rect}</g>`
			
 
				 				try {
			
 
				 					if (list.length) {
			
 
				 						for(const _el of list) {
			
--- a/src/helpers/metronome.ts
+++ b/src/helpers/metronome.ts
@@ -192,7 +192,7 @@ class Metronome {
 
				 			if(state.playType === "sing" && state.playSource === "background" && audioDataState.songCollection.beatBanSongEle){
			
 
				 				return
			
 
				 			}			
			
 
				-			if(state.playType === "sing" && state.playSource === "mingSong" && audioDataState.songCollection.beatMingSongEle){
			
 
				+			if(state.playSource === "mingSong" && audioDataState.songCollection.beatMingSongEle){
			
 
				 				return
			
 
				 			}			
			
 
				 		}
			
--- a/src/page-instrument/component/authorName/index.module.less
+++ b/src/page-instrument/component/authorName/index.module.less
@@ -18,7 +18,7 @@
 
				             padding: 0;
			
 
				             font-weight: 600;
			
 
				             font-size: 22px;
			
 
				-            color: #FFFFFF;
			
 
				+            color: #333333;
			
 
				             .van-notice-bar__wrap{
			
 
				                 justify-content: center;
			
 
				             }
			
@@ -37,7 +37,7 @@
 
				                 padding: 0;
			
 
				                 font-weight: 400;
			
 
				                 font-size: 13px;
			
 
				-                color: #FFFFFF;
			
 
				+                color: #333333;
			
 
				                 line-height: 20px;
			
 
				                 .van-notice-bar__wrap{
			
 
				                     justify-content: flex-end;
			
--- a/src/page-instrument/custom-plugins/guide-driver/images/practise/d777.png
+++ b/src/page-instrument/custom-plugins/guide-driver/images/practise/d777.png
--- a/src/page-instrument/custom-plugins/guide-driver/index.less
+++ b/src/page-instrument/custom-plugins/guide-driver/index.less
@@ -124,6 +124,18 @@
 
				   }
			
 
				 }
			
 
				 
			
 
				+.popoverClass777 {
			
 
				+  width: 265px;
			
 
				+  height: 245px;
			
 
				+  background: url("./images/practise/d777.png") no-repeat center;
			
 
				+  background-size: contain;
			
 
				+
			
 
				+  .driver-popover-next-btn {
			
 
				+    right: 25px;
			
 
				+    bottom: 23px;
			
 
				+  }
			
 
				+}
			
 
				+
			
 
				 .popoverClass5 {
			
 
				   width: 264px;
			
 
				   height: 245px;
			
--- a/src/page-instrument/custom-plugins/guide-driver/index.tsx
+++ b/src/page-instrument/custom-plugins/guide-driver/index.tsx
@@ -169,6 +169,21 @@ export const PractiseDriver = defineComponent({
 
				       }
			
 
				       options.steps?.push(
			
 
				         {
			
 
				+          element: ".driver-777",
			
 
				+          popover: {
			
 
				+            title: "",
			
 
				+            description: "",
			
 
				+            popoverClass: "popoverClass popoverClass777",
			
 
				+            align: "start",
			
 
				+            side: "top",
			
 
				+            nextBtnText: `下一步 (${options.steps.length + 1}/${length})`,
			
 
				+            showButtons: ["next"],
			
 
				+            onPopoverRender: (popover: PopoverDOM, options: { config: Config; state: State }) => {
			
 
				+              driverInitialPosition(popover, options);
			
 
				+            },
			
 
				+          },
			
 
				+        },
			
 
				+        {
			
 
				           element: ".driver-4",
			
 
				           popover: {
			
 
				             title: "",
			
@@ -176,7 +191,7 @@ export const PractiseDriver = defineComponent({
 
				             popoverClass: "popoverClass popoverClass4",
			
 
				             align: "start",
			
 
				             side: "top",
			
 
				-            nextBtnText: `下一步 (${options.steps.length + 1}/${length})`,
			
 
				+            nextBtnText: `下一步 (${options.steps.length + 2}/${length})`,
			
 
				             showButtons: ["next"],
			
 
				             onPopoverRender: (popover: PopoverDOM, options: { config: Config; state: State }) => {
			
 
				               driverInitialPosition(popover, options);
			
@@ -191,7 +206,7 @@ export const PractiseDriver = defineComponent({
 
				             popoverClass: "popoverClass popoverClass5",
			
 
				             align: "start",
			
 
				             side: "top",
			
 
				-            nextBtnText: `下一步 (${options.steps.length + 2}/${length})`,
			
 
				+            nextBtnText: `下一步 (${options.steps.length + 3}/${length})`,
			
 
				             showButtons: ["next"],
			
 
				             onPopoverRender: (popover: PopoverDOM, options: { config: Config; state: State }) => {
			
 
				               driverInitialPosition(popover, options);
			
--- a/src/page-instrument/evaluat-model/countdown/imgs/step1.png
+++ b/src/page-instrument/evaluat-model/countdown/imgs/step1.png
--- a/src/page-instrument/evaluat-model/countdown/imgs/step2.png
+++ b/src/page-instrument/evaluat-model/countdown/imgs/step2.png
--- a/src/page-instrument/evaluat-model/countdown/imgs/step3.png
+++ b/src/page-instrument/evaluat-model/countdown/imgs/step3.png
--- a/src/page-instrument/evaluat-model/icons/confirm.png
+++ b/src/page-instrument/evaluat-model/icons/confirm.png
--- a/src/page-instrument/evaluat-model/icons/lanya_erji.png
+++ b/src/page-instrument/evaluat-model/icons/lanya_erji.png
--- a/src/page-instrument/evaluat-model/icons/no_erji.png
+++ b/src/page-instrument/evaluat-model/icons/no_erji.png
--- a/src/page-instrument/evaluat-model/icons/tip_btn.png
+++ b/src/page-instrument/evaluat-model/icons/tip_btn.png
--- a/src/page-instrument/evaluat-model/icons/tip_erji.png
+++ b/src/page-instrument/evaluat-model/icons/tip_erji.png
--- a/src/page-instrument/evaluat-model/icons/youxian_erji.png
+++ b/src/page-instrument/evaluat-model/icons/youxian_erji.png
--- a/src/page-instrument/follow-model/microphone/images/microBg.png
+++ b/src/page-instrument/follow-model/microphone/images/microBg.png
--- a/src/page-instrument/follow-model/microphone/images/micro_cancel.png
+++ b/src/page-instrument/follow-model/microphone/images/micro_cancel.png
--- a/src/page-instrument/follow-model/microphone/images/micro_confirm.png
+++ b/src/page-instrument/follow-model/microphone/images/micro_confirm.png
--- a/src/page-instrument/header-top/image/background.png
+++ b/src/page-instrument/header-top/image/background.png
--- a/src/page-instrument/header-top/image/background1.png
+++ b/src/page-instrument/header-top/image/background1.png
--- a/src/page-instrument/header-top/image/background1Act.png
+++ b/src/page-instrument/header-top/image/background1Act.png
--- a/src/page-instrument/header-top/image/backgroundAct.png
+++ b/src/page-instrument/header-top/image/backgroundAct.png
--- a/src/page-instrument/header-top/image/bg.png
+++ b/src/page-instrument/header-top/image/bg.png
--- a/src/page-instrument/header-top/image/icon_menu.png
+++ b/src/page-instrument/header-top/image/icon_menu.png
--- a/src/page-instrument/header-top/image/icon_menuAct.png
+++ b/src/page-instrument/header-top/image/icon_menuAct.png
--- a/src/page-instrument/header-top/image/icon_pause.png
+++ b/src/page-instrument/header-top/image/icon_pause.png
--- a/src/page-instrument/header-top/image/icon_play.png
+++ b/src/page-instrument/header-top/image/icon_play.png
--- a/src/page-instrument/header-top/image/icon_reset.png
+++ b/src/page-instrument/header-top/image/icon_reset.png
--- a/src/page-instrument/header-top/image/mingsong.png
+++ b/src/page-instrument/header-top/image/mingsong.png
--- a/src/page-instrument/header-top/image/mingsongAct.png
+++ b/src/page-instrument/header-top/image/mingsongAct.png
--- a/src/page-instrument/header-top/image/mode.png
+++ b/src/page-instrument/header-top/image/mode.png
--- a/src/page-instrument/header-top/image/music.png
+++ b/src/page-instrument/header-top/image/music.png
--- a/src/page-instrument/header-top/image/music1.png
+++ b/src/page-instrument/header-top/image/music1.png
--- a/src/page-instrument/header-top/image/music1Act.png
+++ b/src/page-instrument/header-top/image/music1Act.png
--- a/src/page-instrument/header-top/image/musicAct.png
+++ b/src/page-instrument/header-top/image/musicAct.png