5 tháng trước cách đây · ca7a918279
--- a/dist/colexiu.html
+++ b/dist/colexiu.html
@@ -2,7 +2,11 @@
 
				 <html lang="en">
			
 
				 
			
 
				 <head>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/polyfills-6e07d034.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-87bc2b5a.js"></script>
			
 
				+>>>>>>> 456ca80ebc2e35b9994e59c39558dfbc1a373ef9
			
 
				 
			
 
				   <meta charset="UTF-8" />
			
 
				   <link rel="icon" type="image/svg+xml" href="./vite.svg" />
			
@@ -40,6 +44,7 @@
 
				       },
			
 
				     })
			
 
				   </script>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/colexiu-46ec011c.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-41e9795a.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-09d9b84e.js">
			
@@ -47,6 +52,15 @@
 
				   <link rel="modulepreload" crossorigin href="./js/index-fdc180f0.js">
			
 
				   <link rel="stylesheet" href="./css/index-b5f47611.css">
			
 
				   <link rel="stylesheet" href="./css/colexiu-e8b419b5.css">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/colexiu-d0b1093b.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-b541353a.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-4112339e.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-be596935.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-8ebcfcd6.js">
			
 
				+  <link rel="stylesheet" href="./css/index-96d419ce.css">
			
 
				+  <link rel="stylesheet" href="./css/colexiu-62f31c4f.css">
			
 
				+>>>>>>> 456ca80ebc2e35b9994e59c39558dfbc1a373ef9
			
 
				   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
			
 
				   <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
			
 
				 </head>
			
@@ -56,8 +70,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-207e93cc.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/colexiu-legacy-bbd59cc9.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-2b34d33c.js"></script>
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/colexiu-legacy-19e0cdd6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> 456ca80ebc2e35b9994e59c39558dfbc1a373ef9
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/dist/css/index-96d419ce.css
+++ b/dist/css/index-96d419ce.css
--- a/dist/css/index-b5f47611.css
+++ b/dist/css/index-b5f47611.css
--- 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-6e07d034.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-87bc2b5a.js"></script>
			
 
				+>>>>>>> 456ca80ebc2e35b9994e59c39558dfbc1a373ef9
			
 
				 
			
 
				   <meta charset="UTF-8">
			
 
				   <link rel="icon" href="./favicon.ico" />
			
@@ -75,6 +79,7 @@
 
				       }
			
 
				     })
			
 
				   </script>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/gym-0b1d8d9d.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-41e9795a.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-09d9b84e.js">
			
@@ -82,6 +87,15 @@
 
				   <link rel="modulepreload" crossorigin href="./js/index-fdc180f0.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
			
 
				   <link rel="stylesheet" href="./css/index-b5f47611.css">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/gym-dec6a9fb.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-b541353a.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-4112339e.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-1ccc0cff.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-8ebcfcd6.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
			
 
				+  <link rel="stylesheet" href="./css/index-96d419ce.css">
			
 
				+>>>>>>> 456ca80ebc2e35b9994e59c39558dfbc1a373ef9
			
 
				   <link rel="stylesheet" href="./css/index-85f95688.css">
			
 
				   <link rel="stylesheet" href="./css/plyr-ad8ef5ae.css">
			
 
				   <link rel="stylesheet" href="./css/index-171cd132.css">
			
@@ -98,8 +112,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-207e93cc.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/gym-legacy-6f24a04b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-2b34d33c.js"></script>
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/gym-legacy-7942cd07.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> 456ca80ebc2e35b9994e59c39558dfbc1a373ef9
			
 
				 </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-6e07d034.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-87bc2b5a.js"></script>
			
 
				+>>>>>>> 456ca80ebc2e35b9994e59c39558dfbc1a373ef9
			
 
				 
			
 
				   <meta charset="UTF-8" />
			
 
				   <meta name="viewport"
			
@@ -41,9 +45,15 @@
 
				       })
			
 
				     }
			
 
				   </script>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/instrument-b3b547fb.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-41e9795a.js">
			
 
				   <link rel="stylesheet" href="./css/index-b5f47611.css">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/instrument-f33569c8.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-b541353a.js">
			
 
				+  <link rel="stylesheet" href="./css/index-96d419ce.css">
			
 
				+>>>>>>> 456ca80ebc2e35b9994e59c39558dfbc1a373ef9
			
 
				   <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>
			
 
				   <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
			
@@ -67,8 +77,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-207e93cc.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-20b99df0.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-2b34d33c.js"></script>
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-6b9f480e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> 456ca80ebc2e35b9994e59c39558dfbc1a373ef9
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/dist/js/colexiu-46ec011c.js
+++ b/dist/js/colexiu-46ec011c.js
--- a/dist/js/colexiu-d0b1093b.js
+++ b/dist/js/colexiu-d0b1093b.js
--- a/dist/js/colexiu-legacy-19e0cdd6.js
+++ b/dist/js/colexiu-legacy-19e0cdd6.js
--- a/dist/js/colexiu-legacy-bbd59cc9.js
+++ b/dist/js/colexiu-legacy-bbd59cc9.js
--- a/dist/js/gym-0b1d8d9d.js
+++ b/dist/js/gym-0b1d8d9d.js
--- a/dist/js/gym-dec6a9fb.js
+++ b/dist/js/gym-dec6a9fb.js
--- a/dist/js/gym-legacy-6f24a04b.js
+++ b/dist/js/gym-legacy-6f24a04b.js
--- a/dist/js/gym-legacy-7942cd07.js
+++ b/dist/js/gym-legacy-7942cd07.js
--- a/dist/js/index-003be81e.js
+++ b/dist/js/index-003be81e.js
--- a/dist/js/index-09d9b84e.js
+++ b/dist/js/index-09d9b84e.js
--- a/dist/js/index-15ef0c25.js
+++ b/dist/js/index-15ef0c25.js
--- a/dist/js/index-1ccc0cff.js
+++ b/dist/js/index-1ccc0cff.js
--- a/dist/js/index-219b8b84.js
+++ b/dist/js/index-219b8b84.js
--- a/dist/js/index-4112339e.js
+++ b/dist/js/index-4112339e.js
--- a/dist/js/index-41e9795a.js
+++ b/dist/js/index-41e9795a.js
--- a/dist/js/index-7f3d36fa.js
+++ b/dist/js/index-7f3d36fa.js
--- a/dist/js/index-8a3b0f85.js
+++ b/dist/js/index-8a3b0f85.js
--- a/dist/js/index-8c7f8155.js
+++ b/dist/js/index-8c7f8155.js
--- a/dist/js/index-8ebcfcd6.js
+++ b/dist/js/index-8ebcfcd6.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-fdc180f0.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-41e9795a.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-b541353a.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};
			
 
				+>>>>>>>> 456ca80ebc2e35b9994e59c39558dfbc1a373ef9:dist/js/index-8ebcfcd6.js
			
--- a/dist/js/index-9198d179.js
+++ b/dist/js/index-9198d179.js
--- a/dist/js/index-9759524c.js
+++ b/dist/js/index-9759524c.js
--- a/dist/js/index-b541353a.js
+++ b/dist/js/index-b541353a.js
--- a/dist/js/index-be596935.js
+++ b/dist/js/index-be596935.js
--- a/dist/js/index-e78adaac.js
+++ b/dist/js/index-e78adaac.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-f6190264.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-41e9795a.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-b541353a.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};
			
 
				+>>>>>>>> 456ca80ebc2e35b9994e59c39558dfbc1a373ef9:dist/js/index-e78adaac.js
			
--- a/dist/js/index-f6190264.js
+++ b/dist/js/index-f6190264.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-f6190264.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-41e9795a.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-b541353a.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};
			
 
				+>>>>>>>> 456ca80ebc2e35b9994e59c39558dfbc1a373ef9:dist/js/index-e78adaac.js
			
--- a/dist/js/index-fdc180f0.js
+++ b/dist/js/index-fdc180f0.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-fdc180f0.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-41e9795a.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-b541353a.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};
			
 
				+>>>>>>>> 456ca80ebc2e35b9994e59c39558dfbc1a373ef9:dist/js/index-8ebcfcd6.js
			
--- a/dist/js/index-legacy-09f3514a.js
+++ b/dist/js/index-legacy-09f3514a.js
--- a/dist/js/index-legacy-0ebc8f42.js
+++ b/dist/js/index-legacy-0ebc8f42.js
--- a/dist/js/index-legacy-186ffa2b.js
+++ b/dist/js/index-legacy-186ffa2b.js
--- a/dist/js/index-legacy-1ab3954c.js
+++ b/dist/js/index-legacy-1ab3954c.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-a80f13f2.js
			
 
				+System.register(["./index-legacy-2d84c3d0.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-4be0dd84.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))}}}));
			
 
				+>>>>>>>> 456ca80ebc2e35b9994e59c39558dfbc1a373ef9:dist/js/index-legacy-1ab3954c.js
			
--- a/dist/js/index-legacy-2d84c3d0.js
+++ b/dist/js/index-legacy-2d84c3d0.js
--- a/dist/js/index-legacy-3b9f8a6d.js
+++ b/dist/js/index-legacy-3b9f8a6d.js
--- a/dist/js/index-legacy-4be0dd84.js
+++ b/dist/js/index-legacy-4be0dd84.js
--- a/dist/js/index-legacy-79999219.js
+++ b/dist/js/index-legacy-79999219.js
--- a/dist/js/index-legacy-8c07e270.js
+++ b/dist/js/index-legacy-8c07e270.js
--- a/dist/js/index-legacy-966f05db.js
+++ b/dist/js/index-legacy-966f05db.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-aaa3a572.js
			
 
				+System.register(["./index-legacy-2d84c3d0.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-4be0dd84.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)])])}}))}}}));
			
 
				+>>>>>>>> 456ca80ebc2e35b9994e59c39558dfbc1a373ef9:dist/js/index-legacy-966f05db.js
			
--- a/dist/js/index-legacy-a80f13f2.js
+++ b/dist/js/index-legacy-a80f13f2.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-a80f13f2.js
			
 
				 System.register(["./index-legacy-2d84c3d0.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-4be0dd84.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))}}}));
			
 
				+>>>>>>>> 456ca80ebc2e35b9994e59c39558dfbc1a373ef9:dist/js/index-legacy-1ab3954c.js
			
--- a/dist/js/index-legacy-aaa3a572.js
+++ b/dist/js/index-legacy-aaa3a572.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-aaa3a572.js
			
 
				 System.register(["./index-legacy-2d84c3d0.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-4be0dd84.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)])])}}))}}}));
			
 
				+>>>>>>>> 456ca80ebc2e35b9994e59c39558dfbc1a373ef9:dist/js/index-legacy-966f05db.js
			
--- a/dist/js/index-legacy-acec755e.js
+++ b/dist/js/index-legacy-acec755e.js
--- a/dist/js/index-legacy-bf44662a.js
+++ b/dist/js/index-legacy-bf44662a.js
--- a/dist/js/index-legacy-cdb90aa5.js
+++ b/dist/js/index-legacy-cdb90aa5.js
--- a/dist/js/index-legacy-dff189a8.js
+++ b/dist/js/index-legacy-dff189a8.js
--- a/dist/js/index-legacy-f417fc33.js
+++ b/dist/js/index-legacy-f417fc33.js
--- a/dist/js/index-legacy-fdeb7299.js
+++ b/dist/js/index-legacy-fdeb7299.js
--- a/dist/js/instrument-b3b547fb.js
+++ b/dist/js/instrument-b3b547fb.js
--- a/dist/js/instrument-f33569c8.js
+++ b/dist/js/instrument-f33569c8.js
--- a/dist/js/instrument-legacy-20b99df0.js
+++ b/dist/js/instrument-legacy-20b99df0.js
--- a/dist/js/instrument-legacy-6b9f480e.js
+++ b/dist/js/instrument-legacy-6b9f480e.js
--- a/dist/js/modeView-142f1c1a.js
+++ b/dist/js/modeView-142f1c1a.js
--- a/dist/js/modeView-f2a58e40.js
+++ b/dist/js/modeView-f2a58e40.js
--- a/dist/js/modeView-legacy-b6bab6f6.js
+++ b/dist/js/modeView-legacy-b6bab6f6.js
--- a/dist/js/orchestra-8a2bd0cd.js
+++ b/dist/js/orchestra-8a2bd0cd.js
--- a/dist/js/orchestra-df140876.js
+++ b/dist/js/orchestra-df140876.js
--- a/dist/js/orchestra-legacy-28ac870b.js
+++ b/dist/js/orchestra-legacy-28ac870b.js
--- a/dist/js/orchestra-legacy-5e6e2f53.js
+++ b/dist/js/orchestra-legacy-5e6e2f53.js
--- a/dist/js/polyfills-6e07d034.js
+++ b/dist/js/polyfills-6e07d034.js
--- a/dist/js/polyfills-87bc2b5a.js
+++ b/dist/js/polyfills-87bc2b5a.js
--- a/dist/js/polyfills-legacy-207e93cc.js
+++ b/dist/js/polyfills-legacy-207e93cc.js
--- a/dist/js/polyfills-legacy-2b34d33c.js
+++ b/dist/js/polyfills-legacy-2b34d33c.js
--- a/dist/js/report-share-41f70f96.js
+++ b/dist/js/report-share-41f70f96.js
--- a/dist/js/report-share-5881500f.js
+++ b/dist/js/report-share-5881500f.js
--- a/dist/js/report-share-legacy-5a523691.js
+++ b/dist/js/report-share-legacy-5a523691.js
--- a/dist/js/report-share-legacy-b5bee79f.js
+++ b/dist/js/report-share-legacy-b5bee79f.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-6e07d034.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-87bc2b5a.js"></script>
			
 
				+>>>>>>> 456ca80ebc2e35b9994e59c39558dfbc1a373ef9
			
 
				 
			
 
				   <meta charset="UTF-8" />
			
 
				   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
			
@@ -41,6 +45,7 @@
 
				       transition: opacity .3s;
			
 
				     }
			
 
				   </style>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/orchestra-8a2bd0cd.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-41e9795a.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-09d9b84e.js">
			
@@ -48,6 +53,15 @@
 
				   <link rel="modulepreload" crossorigin href="./js/index-8c7f8155.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-fdc180f0.js">
			
 
				   <link rel="stylesheet" href="./css/index-b5f47611.css">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/orchestra-df140876.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-b541353a.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-4112339e.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-be596935.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-1ccc0cff.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-8ebcfcd6.js">
			
 
				+  <link rel="stylesheet" href="./css/index-96d419ce.css">
			
 
				+>>>>>>> 456ca80ebc2e35b9994e59c39558dfbc1a373ef9
			
 
				   <link rel="stylesheet" href="./css/index-85f95688.css">
			
 
				   <link rel="stylesheet" href="./css/orchestra-8e05e751.css">
			
 
				   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
			
@@ -70,8 +84,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-207e93cc.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/orchestra-legacy-5e6e2f53.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-2b34d33c.js"></script>
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/orchestra-legacy-28ac870b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> 456ca80ebc2e35b9994e59c39558dfbc1a373ef9
			
 
				 </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-6e07d034.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-87bc2b5a.js"></script>
			
 
				+>>>>>>> 456ca80ebc2e35b9994e59c39558dfbc1a373ef9
			
 
				 
			
 
				   <meta charset="UTF-8" />
			
 
				   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
			
@@ -25,11 +29,19 @@
 
				       transition: opacity .3s;
			
 
				     }
			
 
				   </style>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/report-share-5881500f.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-41e9795a.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-fdc180f0.js">
			
 
				   <link rel="stylesheet" href="./css/index-b5f47611.css">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/report-share-41f70f96.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-b541353a.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-8ebcfcd6.js">
			
 
				+  <link rel="stylesheet" href="./css/index-96d419ce.css">
			
 
				+>>>>>>> 456ca80ebc2e35b9994e59c39558dfbc1a373ef9
			
 
				   <link rel="stylesheet" href="./css/plyr-ad8ef5ae.css">
			
 
				   <link rel="stylesheet" href="./css/report-share-0f4c3151.css">
			
 
				   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
			
@@ -52,8 +64,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-207e93cc.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/report-share-legacy-5a523691.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-2b34d33c.js"></script>
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/report-share-legacy-b5bee79f.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> 456ca80ebc2e35b9994e59c39558dfbc1a373ef9
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/stats.html
+++ b/stats.html