1 month ago · 4b4d0f7d38
--- a/dist/colexiu.html
+++ b/dist/colexiu.html
@@ -2,7 +2,11 @@
 
				 <html lang="en">
			
 
				 
			
 
				 <head>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/polyfills-78d973a5.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-507539f2.js"></script>
			
 
				+>>>>>>> 8990c583d750dee826ea8e30feb74c8ed8f5aab6
			
 
				 
			
 
				   <meta charset="UTF-8" />
			
 
				   <link rel="icon" type="image/svg+xml" href="./vite.svg" />
			
@@ -40,13 +44,21 @@
 
				       },
			
 
				     })
			
 
				   </script>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/colexiu-6e73d21f.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-03e4b0d9.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-77011272.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-cc5952e0.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-5228bf9e.js">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/colexiu-15ec0ddf.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-68a3f3d7.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-0632443a.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-dc1b2b22.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-58a8bd4b.js">
			
 
				+>>>>>>> 8990c583d750dee826ea8e30feb74c8ed8f5aab6
			
 
				   <link rel="stylesheet" href="./css/index-8a4b28ae.css">
			
 
				-  <link rel="stylesheet" href="./css/colexiu-e8b419b5.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>
			
 
				   <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 +68,13 @@
 
				   <img id="loading" class="show" src="./loading.svg" alt="loading" />
			
 
				   
			
 
				   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
			
 
				+<<<<<<< HEAD
			
 
				   <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-695b780b.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/colexiu-legacy-7852d087.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-a9a3d08b.js"></script>
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/colexiu-legacy-1cc5e798.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> 8990c583d750dee826ea8e30feb74c8ed8f5aab6
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/dist/css/colexiu-62f31c4f.css
+++ b/dist/css/colexiu-62f31c4f.css
--- a/dist/css/orchestra-8bc1a9c0.css
+++ b/dist/css/orchestra-8bc1a9c0.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-78d973a5.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-507539f2.js"></script>
			
 
				+>>>>>>> 8990c583d750dee826ea8e30feb74c8ed8f5aab6
			
 
				 
			
 
				   <meta charset="UTF-8">
			
 
				   <link rel="icon" href="./favicon.ico" />
			
@@ -75,11 +79,19 @@
 
				       }
			
 
				     })
			
 
				   </script>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/gym-28d93760.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-03e4b0d9.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-77011272.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-baaa91c4.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-5228bf9e.js">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/gym-77f3701e.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-68a3f3d7.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-0632443a.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-f148b1e1.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-58a8bd4b.js">
			
 
				+>>>>>>> 8990c583d750dee826ea8e30feb74c8ed8f5aab6
			
 
				   <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
			
 
				   <link rel="stylesheet" href="./css/index-8a4b28ae.css">
			
 
				   <link rel="stylesheet" href="./css/index-85f95688.css">
			
@@ -98,8 +110,13 @@
 
				   <img id="loading" class="show" src="./loading.svg" alt="loading" />
			
 
				   
			
 
				   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
			
 
				+<<<<<<< HEAD
			
 
				   <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-695b780b.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/gym-legacy-1856fd75.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-a9a3d08b.js"></script>
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/gym-legacy-43318904.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> 8990c583d750dee826ea8e30feb74c8ed8f5aab6
			
 
				 </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-78d973a5.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-507539f2.js"></script>
			
 
				+>>>>>>> 8990c583d750dee826ea8e30feb74c8ed8f5aab6
			
 
				 
			
 
				   <meta charset="UTF-8" />
			
 
				   <meta name="viewport"
			
@@ -41,8 +45,13 @@
 
				       })
			
 
				     }
			
 
				   </script>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/instrument-d469cf80.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-03e4b0d9.js">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/instrument-3414814a.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-68a3f3d7.js">
			
 
				+>>>>>>> 8990c583d750dee826ea8e30feb74c8ed8f5aab6
			
 
				   <link rel="stylesheet" href="./css/index-8a4b28ae.css">
			
 
				   <link rel="stylesheet" href="./css/instrument-118f68d3.css">
			
 
				   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
			
@@ -67,8 +76,13 @@
 
				     var vConsole = new window.VConsole();
			
 
				   </script>   -->
			
 
				   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
			
 
				+<<<<<<< HEAD
			
 
				   <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-695b780b.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-2e793843.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-a9a3d08b.js"></script>
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-c06c2b9a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> 8990c583d750dee826ea8e30feb74c8ed8f5aab6
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/dist/js/colexiu-15ec0ddf.js
+++ b/dist/js/colexiu-15ec0ddf.js
--- a/dist/js/colexiu-6e73d21f.js
+++ b/dist/js/colexiu-6e73d21f.js
--- a/dist/js/colexiu-legacy-1cc5e798.js
+++ b/dist/js/colexiu-legacy-1cc5e798.js
--- a/dist/js/colexiu-legacy-7852d087.js
+++ b/dist/js/colexiu-legacy-7852d087.js
--- a/dist/js/gym-28d93760.js
+++ b/dist/js/gym-28d93760.js
--- a/dist/js/gym-77f3701e.js
+++ b/dist/js/gym-77f3701e.js
--- a/dist/js/gym-legacy-1856fd75.js
+++ b/dist/js/gym-legacy-1856fd75.js
--- a/dist/js/gym-legacy-43318904.js
+++ b/dist/js/gym-legacy-43318904.js
--- a/dist/js/index-03e4b0d9.js
+++ b/dist/js/index-03e4b0d9.js
--- a/dist/js/index-0632443a.js
+++ b/dist/js/index-0632443a.js
--- a/dist/js/index-346a5948.js
+++ b/dist/js/index-346a5948.js
--- a/dist/js/index-5228bf9e.js
+++ b/dist/js/index-5228bf9e.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-5228bf9e.js
			
 
				 import{b6 as l,d as i,h as e,bg as v,b9 as r,bb as d,bC as _,bc as m,bD as w,bf as u,bj as g,F as $}from"./index-03e4b0d9.js";const[y,A]=l("skeleton-title"),P={round:Boolean,titleWidth:r};var p=i({name:y,props:P,setup(t){return()=>e("h3",{class:A([{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()=>e("div",{class:D([t.avatarShape]),style:_(t.avatarSize)},null)}});const R=d(N);var C=R;const s="100%",I={round:Boolean,rowWidth:{type:r,default:s}},[L,U]=l("skeleton-paragraph");var E=i({name:L,props:I,setup(t){return()=>e("div",{class:U([{round:t.round}]),style:{width:t.rowWidth}},null)}});const H=d(E);var O=H;const[j,c]=l("skeleton"),V="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:j,inheritAttrs:!1,props:q,setup(t,{slots:o,attrs:h}){const f=()=>{if(t.avatar)return e(C,{avatarShape:t.avatarShape,avatarSize:t.avatarSize},null)},S=()=>{if(t.title)return e(z,{round:t.round,titleWidth:t.titleWidth},null)},b=n=>{const{rowWidth:a}=t;return a===s&&n===+t.row-1?V:Array.isArray(a)?a[n]:a},k=()=>Array(+t.row).fill("").map((n,a)=>e(O,{key:a,round:t.round,rowWidth:v(b(a))},null)),W=()=>o.template?o.template():e($,null,[f(),e("div",{class:c("content")},[S(),k()])]);return()=>{var n;return t.loading?e("div",g({class:c({animate:t.animate,round:t.round})},h),[W()]):(n=o.default)==null?void 0:n.call(o)}}});const J=d(x);export{J as S};
			
 
				+========
			
 
				+import{b6 as l,d as i,h as e,bg as v,b9 as r,bb as d,bC as _,bc as m,bD as w,bf as u,bj as g,F as $}from"./index-68a3f3d7.js";const[y,A]=l("skeleton-title"),P={round:Boolean,titleWidth:r};var p=i({name:y,props:P,setup(t){return()=>e("h3",{class:A([{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()=>e("div",{class:D([t.avatarShape]),style:_(t.avatarSize)},null)}});const R=d(N);var C=R;const s="100%",I={round:Boolean,rowWidth:{type:r,default:s}},[L,U]=l("skeleton-paragraph");var E=i({name:L,props:I,setup(t){return()=>e("div",{class:U([{round:t.round}]),style:{width:t.rowWidth}},null)}});const H=d(E);var O=H;const[j,c]=l("skeleton"),V="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:j,inheritAttrs:!1,props:q,setup(t,{slots:o,attrs:h}){const f=()=>{if(t.avatar)return e(C,{avatarShape:t.avatarShape,avatarSize:t.avatarSize},null)},S=()=>{if(t.title)return e(z,{round:t.round,titleWidth:t.titleWidth},null)},b=n=>{const{rowWidth:a}=t;return a===s&&n===+t.row-1?V:Array.isArray(a)?a[n]:a},k=()=>Array(+t.row).fill("").map((n,a)=>e(O,{key:a,round:t.round,rowWidth:v(b(a))},null)),W=()=>o.template?o.template():e($,null,[f(),e("div",{class:c("content")},[S(),k()])]);return()=>{var n;return t.loading?e("div",g({class:c({animate:t.animate,round:t.round})},h),[W()]):(n=o.default)==null?void 0:n.call(o)}}});const J=d(x);export{J as S};
			
 
				+>>>>>>>> 8990c583d750dee826ea8e30feb74c8ed8f5aab6:dist/js/index-58a8bd4b.js
			
--- a/dist/js/index-52d75530.js
+++ b/dist/js/index-52d75530.js
--- a/dist/js/index-58a8bd4b.js
+++ b/dist/js/index-58a8bd4b.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-5228bf9e.js
			
 
				+import{b6 as l,d as i,h as e,bg as v,b9 as r,bb as d,bC as _,bc as m,bD as w,bf as u,bj as g,F as $}from"./index-03e4b0d9.js";const[y,A]=l("skeleton-title"),P={round:Boolean,titleWidth:r};var p=i({name:y,props:P,setup(t){return()=>e("h3",{class:A([{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()=>e("div",{class:D([t.avatarShape]),style:_(t.avatarSize)},null)}});const R=d(N);var C=R;const s="100%",I={round:Boolean,rowWidth:{type:r,default:s}},[L,U]=l("skeleton-paragraph");var E=i({name:L,props:I,setup(t){return()=>e("div",{class:U([{round:t.round}]),style:{width:t.rowWidth}},null)}});const H=d(E);var O=H;const[j,c]=l("skeleton"),V="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:j,inheritAttrs:!1,props:q,setup(t,{slots:o,attrs:h}){const f=()=>{if(t.avatar)return e(C,{avatarShape:t.avatarShape,avatarSize:t.avatarSize},null)},S=()=>{if(t.title)return e(z,{round:t.round,titleWidth:t.titleWidth},null)},b=n=>{const{rowWidth:a}=t;return a===s&&n===+t.row-1?V:Array.isArray(a)?a[n]:a},k=()=>Array(+t.row).fill("").map((n,a)=>e(O,{key:a,round:t.round,rowWidth:v(b(a))},null)),W=()=>o.template?o.template():e($,null,[f(),e("div",{class:c("content")},[S(),k()])]);return()=>{var n;return t.loading?e("div",g({class:c({animate:t.animate,round:t.round})},h),[W()]):(n=o.default)==null?void 0:n.call(o)}}});const J=d(x);export{J as S};
			
 
				+========
			
 
				+import{b6 as l,d as i,h as e,bg as v,b9 as r,bb as d,bC as _,bc as m,bD as w,bf as u,bj as g,F as $}from"./index-68a3f3d7.js";const[y,A]=l("skeleton-title"),P={round:Boolean,titleWidth:r};var p=i({name:y,props:P,setup(t){return()=>e("h3",{class:A([{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()=>e("div",{class:D([t.avatarShape]),style:_(t.avatarSize)},null)}});const R=d(N);var C=R;const s="100%",I={round:Boolean,rowWidth:{type:r,default:s}},[L,U]=l("skeleton-paragraph");var E=i({name:L,props:I,setup(t){return()=>e("div",{class:U([{round:t.round}]),style:{width:t.rowWidth}},null)}});const H=d(E);var O=H;const[j,c]=l("skeleton"),V="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:j,inheritAttrs:!1,props:q,setup(t,{slots:o,attrs:h}){const f=()=>{if(t.avatar)return e(C,{avatarShape:t.avatarShape,avatarSize:t.avatarSize},null)},S=()=>{if(t.title)return e(z,{round:t.round,titleWidth:t.titleWidth},null)},b=n=>{const{rowWidth:a}=t;return a===s&&n===+t.row-1?V:Array.isArray(a)?a[n]:a},k=()=>Array(+t.row).fill("").map((n,a)=>e(O,{key:a,round:t.round,rowWidth:v(b(a))},null)),W=()=>o.template?o.template():e($,null,[f(),e("div",{class:c("content")},[S(),k()])]);return()=>{var n;return t.loading?e("div",g({class:c({animate:t.animate,round:t.round})},h),[W()]):(n=o.default)==null?void 0:n.call(o)}}});const J=d(x);export{J as S};
			
 
				+>>>>>>>> 8990c583d750dee826ea8e30feb74c8ed8f5aab6:dist/js/index-58a8bd4b.js
			
--- a/dist/js/index-68a3f3d7.js
+++ b/dist/js/index-68a3f3d7.js
--- a/dist/js/index-73670591.js
+++ b/dist/js/index-73670591.js
--- a/dist/js/index-77011272.js
+++ b/dist/js/index-77011272.js
--- a/dist/js/index-80e1891c.js
+++ b/dist/js/index-80e1891c.js
--- a/dist/js/index-8855ee9e.js
+++ b/dist/js/index-8855ee9e.js
--- a/dist/js/index-8d486650.js
+++ b/dist/js/index-8d486650.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-8d486650.js
			
 
				 import{d as i,g as l,n as d,bP as e,c,m as r,h as s,at as u}from"./index-03e4b0d9.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,bP as e,c,m as r,h as s,at as u}from"./index-68a3f3d7.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};
			
 
				+>>>>>>>> 8990c583d750dee826ea8e30feb74c8ed8f5aab6:dist/js/index-9f79d2e7.js
			
--- a/dist/js/index-9f79d2e7.js
+++ b/dist/js/index-9f79d2e7.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-8d486650.js
			
 
				+import{d as i,g as l,n as d,bP as e,c,m as r,h as s,at as u}from"./index-03e4b0d9.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,bP as e,c,m as r,h as s,at as u}from"./index-68a3f3d7.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};
			
 
				+>>>>>>>> 8990c583d750dee826ea8e30feb74c8ed8f5aab6:dist/js/index-9f79d2e7.js
			
--- a/dist/js/index-b32c42bd.js
+++ b/dist/js/index-b32c42bd.js
--- a/dist/js/index-baaa91c4.js
+++ b/dist/js/index-baaa91c4.js
--- a/dist/js/index-cc5952e0.js
+++ b/dist/js/index-cc5952e0.js
--- a/dist/js/index-dc1b2b22.js
+++ b/dist/js/index-dc1b2b22.js
--- a/dist/js/index-f148b1e1.js
+++ b/dist/js/index-f148b1e1.js
--- a/dist/js/index-legacy-253b24b3.js
+++ b/dist/js/index-legacy-253b24b3.js
--- a/dist/js/index-legacy-2f186ce5.js
+++ b/dist/js/index-legacy-2f186ce5.js
--- a/dist/js/index-legacy-364dbc17.js
+++ b/dist/js/index-legacy-364dbc17.js
--- a/dist/js/index-legacy-466bc6d1.js
+++ b/dist/js/index-legacy-466bc6d1.js
--- a/dist/js/index-legacy-47962393.js
+++ b/dist/js/index-legacy-47962393.js
--- a/dist/js/index-legacy-52cde84b.js
+++ b/dist/js/index-legacy-52cde84b.js
--- a/dist/js/index-legacy-57f20cf9.js
+++ b/dist/js/index-legacy-57f20cf9.js
--- a/dist/js/index-legacy-66809900.js
+++ b/dist/js/index-legacy-66809900.js
--- a/dist/js/index-legacy-7ad465ac.js
+++ b/dist/js/index-legacy-7ad465ac.js
--- a/dist/js/index-legacy-7eaeaaeb.js
+++ b/dist/js/index-legacy-7eaeaaeb.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-c45660ad.js
			
 
				+System.register(["./index-legacy-66809900.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.bP,r=e.c,s=e.m,d=e.h,l=e.at}],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-52cde84b.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.bP,r=e.c,s=e.m,d=e.h,l=e.at}],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)])])}}))}}}));
			
 
				+>>>>>>>> 8990c583d750dee826ea8e30feb74c8ed8f5aab6:dist/js/index-legacy-7eaeaaeb.js
			
--- a/dist/js/index-legacy-94a6f3c0.js
+++ b/dist/js/index-legacy-94a6f3c0.js
--- a/dist/js/index-legacy-af517004.js
+++ b/dist/js/index-legacy-af517004.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-af517004.js
			
 
				 System.register(["./index-legacy-66809900.js"],(function(t,a){"use strict";var r,e,n,l,o,i,s,u,d,p,v,h;return{setters:[t=>{r=t.b6,e=t.d,n=t.h,l=t.bg,o=t.b9,i=t.bb,s=t.bC,u=t.bc,d=t.bD,p=t.bf,v=t.bj,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 j=e({name:A,props:z,setup:t=>()=>n("div",{class:B([{round:t.round}]),style:{width:t.rowWidth}},null)}),x=i(j);const[C,D]=r("skeleton"),F={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 N=e({name:C,inheritAttrs:!1,props:F,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:D({animate:t.animate,round:t.round})},r),[a.template?a.template():n(h,null,[e(),n("div",{class:D("content")},[o(),Array(+t.row).fill("").map(((a,r)=>n(x,{key:r,round:t.round,rowWidth:l(i(r))},null)))])])]):null==(s=a.default)?void 0:s.call(a)}}});t("S",i(N))}}}));
			
 
				+========
			
 
				+System.register(["./index-legacy-52cde84b.js"],(function(t,a){"use strict";var r,e,n,l,o,i,s,u,d,p,v,h;return{setters:[t=>{r=t.b6,e=t.d,n=t.h,l=t.bg,o=t.b9,i=t.bb,s=t.bC,u=t.bc,d=t.bD,p=t.bf,v=t.bj,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 j=e({name:A,props:z,setup:t=>()=>n("div",{class:B([{round:t.round}]),style:{width:t.rowWidth}},null)}),x=i(j);const[C,D]=r("skeleton"),F={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 N=e({name:C,inheritAttrs:!1,props:F,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:D({animate:t.animate,round:t.round})},r),[a.template?a.template():n(h,null,[e(),n("div",{class:D("content")},[o(),Array(+t.row).fill("").map(((a,r)=>n(x,{key:r,round:t.round,rowWidth:l(i(r))},null)))])])]):null==(s=a.default)?void 0:s.call(a)}}});t("S",i(N))}}}));
			
 
				+>>>>>>>> 8990c583d750dee826ea8e30feb74c8ed8f5aab6:dist/js/index-legacy-f55a6577.js
			
--- a/dist/js/index-legacy-b77d4a6d.js
+++ b/dist/js/index-legacy-b77d4a6d.js
--- a/dist/js/index-legacy-c45660ad.js
+++ b/dist/js/index-legacy-c45660ad.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-c45660ad.js
			
 
				 System.register(["./index-legacy-66809900.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.bP,r=e.c,s=e.m,d=e.h,l=e.at}],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-52cde84b.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.bP,r=e.c,s=e.m,d=e.h,l=e.at}],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)])])}}))}}}));
			
 
				+>>>>>>>> 8990c583d750dee826ea8e30feb74c8ed8f5aab6:dist/js/index-legacy-7eaeaaeb.js
			
--- a/dist/js/index-legacy-cd38aed6.js
+++ b/dist/js/index-legacy-cd38aed6.js
--- a/dist/js/index-legacy-cf8d7048.js
+++ b/dist/js/index-legacy-cf8d7048.js
--- a/dist/js/index-legacy-df65f9b3.js
+++ b/dist/js/index-legacy-df65f9b3.js
--- a/dist/js/index-legacy-f55a6577.js
+++ b/dist/js/index-legacy-f55a6577.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-af517004.js
			
 
				+System.register(["./index-legacy-66809900.js"],(function(t,a){"use strict";var r,e,n,l,o,i,s,u,d,p,v,h;return{setters:[t=>{r=t.b6,e=t.d,n=t.h,l=t.bg,o=t.b9,i=t.bb,s=t.bC,u=t.bc,d=t.bD,p=t.bf,v=t.bj,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 j=e({name:A,props:z,setup:t=>()=>n("div",{class:B([{round:t.round}]),style:{width:t.rowWidth}},null)}),x=i(j);const[C,D]=r("skeleton"),F={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 N=e({name:C,inheritAttrs:!1,props:F,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:D({animate:t.animate,round:t.round})},r),[a.template?a.template():n(h,null,[e(),n("div",{class:D("content")},[o(),Array(+t.row).fill("").map(((a,r)=>n(x,{key:r,round:t.round,rowWidth:l(i(r))},null)))])])]):null==(s=a.default)?void 0:s.call(a)}}});t("S",i(N))}}}));
			
 
				+========
			
 
				+System.register(["./index-legacy-52cde84b.js"],(function(t,a){"use strict";var r,e,n,l,o,i,s,u,d,p,v,h;return{setters:[t=>{r=t.b6,e=t.d,n=t.h,l=t.bg,o=t.b9,i=t.bb,s=t.bC,u=t.bc,d=t.bD,p=t.bf,v=t.bj,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 j=e({name:A,props:z,setup:t=>()=>n("div",{class:B([{round:t.round}]),style:{width:t.rowWidth}},null)}),x=i(j);const[C,D]=r("skeleton"),F={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 N=e({name:C,inheritAttrs:!1,props:F,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:D({animate:t.animate,round:t.round})},r),[a.template?a.template():n(h,null,[e(),n("div",{class:D("content")},[o(),Array(+t.row).fill("").map(((a,r)=>n(x,{key:r,round:t.round,rowWidth:l(i(r))},null)))])])]):null==(s=a.default)?void 0:s.call(a)}}});t("S",i(N))}}}));
			
 
				+>>>>>>>> 8990c583d750dee826ea8e30feb74c8ed8f5aab6:dist/js/index-legacy-f55a6577.js
			
--- a/dist/js/instrument-3414814a.js
+++ b/dist/js/instrument-3414814a.js
--- a/dist/js/instrument-d469cf80.js
+++ b/dist/js/instrument-d469cf80.js
--- a/dist/js/instrument-legacy-2e793843.js
+++ b/dist/js/instrument-legacy-2e793843.js
--- a/dist/js/instrument-legacy-c06c2b9a.js
+++ b/dist/js/instrument-legacy-c06c2b9a.js
--- a/dist/js/modeView-673bf217.js
+++ b/dist/js/modeView-673bf217.js
--- a/dist/js/modeView-f1784950.js
+++ b/dist/js/modeView-f1784950.js
--- a/dist/js/modeView-legacy-34b0758e.js
+++ b/dist/js/modeView-legacy-34b0758e.js
--- a/dist/js/modeView-legacy-c25af01d.js
+++ b/dist/js/modeView-legacy-c25af01d.js
--- a/dist/js/orchestra-974aacde.js
+++ b/dist/js/orchestra-974aacde.js
--- a/dist/js/orchestra-f2769121.js
+++ b/dist/js/orchestra-f2769121.js
--- a/dist/js/orchestra-legacy-35cb97df.js
+++ b/dist/js/orchestra-legacy-35cb97df.js
--- a/dist/js/orchestra-legacy-6d517d66.js
+++ b/dist/js/orchestra-legacy-6d517d66.js
--- a/dist/js/polyfills-507539f2.js
+++ b/dist/js/polyfills-507539f2.js
--- a/dist/js/polyfills-78d973a5.js
+++ b/dist/js/polyfills-78d973a5.js
--- a/dist/js/polyfills-legacy-695b780b.js
+++ b/dist/js/polyfills-legacy-695b780b.js
--- a/dist/js/polyfills-legacy-a9a3d08b.js
+++ b/dist/js/polyfills-legacy-a9a3d08b.js
--- a/dist/js/report-share-620b2d3b.js
+++ b/dist/js/report-share-620b2d3b.js
--- a/dist/js/report-share-bc3d219f.js
+++ b/dist/js/report-share-bc3d219f.js
--- a/dist/js/report-share-legacy-7dfdddf7.js
+++ b/dist/js/report-share-legacy-7dfdddf7.js
--- a/dist/js/report-share-legacy-d98a4a92.js
+++ b/dist/js/report-share-legacy-d98a4a92.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-78d973a5.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-507539f2.js"></script>
			
 
				+>>>>>>> 8990c583d750dee826ea8e30feb74c8ed8f5aab6
			
 
				 
			
 
				   <meta charset="UTF-8" />
			
 
				   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
			
@@ -41,15 +45,24 @@
 
				       transition: opacity .3s;
			
 
				     }
			
 
				   </style>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/orchestra-f2769121.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-03e4b0d9.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-77011272.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-cc5952e0.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-baaa91c4.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-5228bf9e.js">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/orchestra-974aacde.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-68a3f3d7.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-0632443a.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-dc1b2b22.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-f148b1e1.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-58a8bd4b.js">
			
 
				+>>>>>>> 8990c583d750dee826ea8e30feb74c8ed8f5aab6
			
 
				   <link rel="stylesheet" href="./css/index-8a4b28ae.css">
			
 
				   <link rel="stylesheet" href="./css/index-85f95688.css">
			
 
				-  <link rel="stylesheet" href="./css/orchestra-8e05e751.css">
			
 
				+  <link rel="stylesheet" href="./css/orchestra-8bc1a9c0.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>
			
 
				 </head>
			
@@ -70,8 +83,13 @@
 
				   </script>
			
 
				   
			
 
				   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
			
 
				+<<<<<<< HEAD
			
 
				   <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-695b780b.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/orchestra-legacy-35cb97df.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-a9a3d08b.js"></script>
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/orchestra-legacy-6d517d66.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> 8990c583d750dee826ea8e30feb74c8ed8f5aab6
			
 
				 </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-78d973a5.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-507539f2.js"></script>
			
 
				+>>>>>>> 8990c583d750dee826ea8e30feb74c8ed8f5aab6
			
 
				 
			
 
				   <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-620b2d3b.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-03e4b0d9.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-5228bf9e.js">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/report-share-bc3d219f.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-68a3f3d7.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-58a8bd4b.js">
			
 
				+>>>>>>> 8990c583d750dee826ea8e30feb74c8ed8f5aab6
			
 
				   <link rel="stylesheet" href="./css/index-8a4b28ae.css">
			
 
				   <link rel="stylesheet" href="./css/plyr-ad8ef5ae.css">
			
 
				   <link rel="stylesheet" href="./css/report-share-0f4c3151.css">
			
@@ -52,8 +63,13 @@
 
				   </script>
			
 
				   
			
 
				   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
			
 
				+<<<<<<< HEAD
			
 
				   <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-695b780b.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/report-share-legacy-d98a4a92.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-a9a3d08b.js"></script>
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/report-share-legacy-7dfdddf7.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> 8990c583d750dee826ea8e30feb74c8ed8f5aab6
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/dist/svg/arrow-7d6e3644.svg
+++ b/dist/svg/arrow-7d6e3644.svg
--- a/dist/svg/background-b89deedf.svg
+++ b/dist/svg/background-b89deedf.svg
--- a/dist/svg/cadence-18a7a60b.svg
+++ b/dist/svg/cadence-18a7a60b.svg
--- a/dist/svg/cadence-89569b23.svg
+++ b/dist/svg/cadence-89569b23.svg
--- a/dist/svg/close2-9bf3f858.svg
+++ b/dist/svg/close2-9bf3f858.svg
--- a/dist/svg/clx1-3d063166.svg
+++ b/dist/svg/clx1-3d063166.svg
--- a/dist/svg/clx2-99f2ced3.svg
+++ b/dist/svg/clx2-99f2ced3.svg
--- a/dist/svg/clx3-82262a8a.svg
+++ b/dist/svg/clx3-82262a8a.svg
--- a/dist/svg/clx4-7a8a1657.svg
+++ b/dist/svg/clx4-7a8a1657.svg
--- a/dist/svg/clx5-b3331931.svg
+++ b/dist/svg/clx5-b3331931.svg
--- a/dist/svg/cursor-icon-1-b64224eb.svg
+++ b/dist/svg/cursor-icon-1-b64224eb.svg
--- a/dist/svg/cursor-icon-2-03a5f875.svg
+++ b/dist/svg/cursor-icon-2-03a5f875.svg
--- a/dist/svg/cursor-icon-3-020a25ee.svg
+++ b/dist/svg/cursor-icon-3-020a25ee.svg
--- a/dist/svg/down-1c21ed5a.svg
+++ b/dist/svg/down-1c21ed5a.svg
--- a/dist/svg/down-832f5248.svg
+++ b/dist/svg/down-832f5248.svg
--- a/dist/svg/guding-a3ea7233.svg
+++ b/dist/svg/guding-a3ea7233.svg
--- a/dist/svg/guding-active-4f98cd29.svg
+++ b/dist/svg/guding-active-4f98cd29.svg
--- a/dist/svg/guding-active-e8543b78.svg
+++ b/dist/svg/guding-active-e8543b78.svg
--- a/dist/svg/icon-back-563c3fba.svg
+++ b/dist/svg/icon-back-563c3fba.svg
--- a/dist/svg/icon-back-cc8f7b2a.svg
+++ b/dist/svg/icon-back-cc8f7b2a.svg
--- a/dist/svg/icon-badge-28fcacad.svg
+++ b/dist/svg/icon-badge-28fcacad.svg
--- a/dist/svg/icon-minus-72e10fdd.svg
+++ b/dist/svg/icon-minus-72e10fdd.svg
--- a/dist/svg/icon-plus-3bda4d0d.svg
+++ b/dist/svg/icon-plus-3bda4d0d.svg
--- a/dist/svg/icon-resetMinus-fb6d2ff3.svg
+++ b/dist/svg/icon-resetMinus-fb6d2ff3.svg
--- a/dist/svg/icon-sound_120-962a1f49.svg
+++ b/dist/svg/icon-sound_120-962a1f49.svg
--- a/dist/svg/icon-sound_12_4-28492c86.svg
+++ b/dist/svg/icon-sound_12_4-28492c86.svg
--- a/dist/svg/icon-sound_13-2896bc06.svg
+++ b/dist/svg/icon-sound_13-2896bc06.svg
--- a/dist/svg/icon-sound_14_15-80c26d1d.svg
+++ b/dist/svg/icon-sound_14_15-80c26d1d.svg
--- a/dist/svg/icon-sound_5_6-78a49e4b.svg
+++ b/dist/svg/icon-sound_5_6-78a49e4b.svg