5 months ago · c50960cda1
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
 
				+[submodule "osmd-extended"]
			
 
				+	path = osmd-extended
			
 
				+	url = http://git.dayaedu.com/yonge/osdm.git
			
--- a/dist/colexiu.html
+++ b/dist/colexiu.html
@@ -2,7 +2,11 @@
 
				 <html lang="en">
			
 
				 
			
 
				 <head>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/polyfills-da8f0a4a.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-6b4fae76.js"></script>
			
 
				+>>>>>>> feature-patch
			
 
				 
			
 
				   <meta charset="UTF-8" />
			
 
				   <link rel="icon" type="image/svg+xml" href="./vite.svg" />
			
@@ -40,12 +44,21 @@
 
				       },
			
 
				     })
			
 
				   </script>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/colexiu-97abd2a9.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-a9ba4b3e.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-b2a684b6.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-7459e5aa.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-b9e67090.js">
			
 
				   <link rel="stylesheet" href="./css/index-bfccc570.css">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/colexiu-1dd52313.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-557da405.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-82ec78ed.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-7f5c97b1.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-22bb3984.js">
			
 
				+  <link rel="stylesheet" href="./css/index-1ec513a0.css">
			
 
				+>>>>>>> feature-patch
			
 
				   <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>
			
@@ -56,8 +69,13 @@
 
				   <img id="loading" class="show" src="./loading.svg" alt="loading" />
			
 
				   
			
 
				   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
			
 
				+<<<<<<< HEAD
			
 
				   <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-1067395b.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/colexiu-legacy-ef43e84f.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-1d2158fb.js"></script>
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/colexiu-legacy-4fceae41.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> feature-patch
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/dist/css/index-1ec513a0.css
+++ b/dist/css/index-1ec513a0.css
--- a/dist/css/index-55dea78a.css
+++ b/dist/css/index-55dea78a.css
--- a/dist/css/index-bfccc570.css
+++ b/dist/css/index-bfccc570.css
--- a/dist/css/index-dbb7c2bb.css
+++ b/dist/css/index-dbb7c2bb.css
--- a/dist/css/instrument-118f68d3.css
+++ b/dist/css/instrument-118f68d3.css
--- a/dist/css/instrument-7b1512ed.css
+++ b/dist/css/instrument-7b1512ed.css
--- a/dist/css/modeView-0e3b6c94.css
+++ b/dist/css/modeView-0e3b6c94.css
@@ -0,0 +1 @@
 
				+._container_mqzx3_1{position:relative;width:7.41333rem;height:5.68rem;background:url(../png/icon_bg-c8684de6.png) no-repeat;background-size:contain;display:flex;flex-direction:column;padding-top:2.4rem}._close_mqzx3_11{position:absolute;right:0;top:.8rem;width:.64rem;height:.64rem}._title_mqzx3_18{margin-left:.37333rem;width:2.13333rem;display:block}._content_mqzx3_23{position:relative;padding:0 .34667rem .66667rem;font-size:.37333rem;font-weight:400;color:#333;line-height:.58667rem;z-index:10}._btns_mqzx3_32{margin:0 auto .61333rem;display:flex;justify-content:center;font-size:.42667rem;color:#777;line-height:.58667rem;text-align:center}._btns_mqzx3_32 ._btn_mqzx3_32{width:2.69333rem;height:.98667rem;cursor:pointer}._btns_mqzx3_32 ._btnCancel_mqzx3_46{margin-right:.26667rem}._btns_mqzx3_32 img{width:100%}
			
--- a/dist/css/modeView-c4c5480d.css
+++ b/dist/css/modeView-c4c5480d.css
@@ -1 +0,0 @@
 
				-._container_jp744_1{position:relative;width:7.41333rem;height:6.72rem;background:url(../png/icon_bg-d91f5fbc.png) no-repeat;background-size:contain;display:flex;flex-direction:column;padding-top:3.36rem}._close_jp744_11{position:absolute;right:0;top:.8rem;width:.64rem;height:.64rem}._title_jp744_18{margin-left:.37333rem;width:2.13333rem;display:block}._content_jp744_23{position:relative;padding:0 .34667rem .66667rem;font-size:.37333rem;font-weight:400;color:#333;line-height:.58667rem;z-index:10}._btns_jp744_32{margin:0 auto .61333rem;display:flex;justify-content:center;font-size:.42667rem;color:#777;line-height:.58667rem;text-align:center}._btns_jp744_32 ._btn_jp744_32{width:2.69333rem;height:.98667rem;cursor:pointer}._btns_jp744_32 ._btnCancel_jp744_46{margin-right:.26667rem}._btns_jp744_32 img{width:100%}
			
--- 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-da8f0a4a.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-6b4fae76.js"></script>
			
 
				+>>>>>>> feature-patch
			
 
				 
			
 
				   <meta charset="UTF-8">
			
 
				   <link rel="icon" href="./favicon.ico" />
			
@@ -75,6 +79,7 @@
 
				       }
			
 
				     })
			
 
				   </script>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/gym-73aa45d8.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-a9ba4b3e.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-b2a684b6.js">
			
@@ -82,6 +87,15 @@
 
				   <link rel="modulepreload" crossorigin href="./js/index-b9e67090.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
			
 
				   <link rel="stylesheet" href="./css/index-bfccc570.css">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/gym-16eb931f.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-557da405.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-82ec78ed.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-e50e863f.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-22bb3984.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
			
 
				+  <link rel="stylesheet" href="./css/index-1ec513a0.css">
			
 
				+>>>>>>> feature-patch
			
 
				   <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-1067395b.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/gym-legacy-ad15db68.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-1d2158fb.js"></script>
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/gym-legacy-b063b8c0.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> feature-patch
			
 
				 </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-da8f0a4a.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-6b4fae76.js"></script>
			
 
				+>>>>>>> feature-patch
			
 
				 
			
 
				   <meta charset="UTF-8" />
			
 
				   <meta name="viewport"
			
@@ -41,10 +45,17 @@
 
				       })
			
 
				     }
			
 
				   </script>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/instrument-450dd3f2.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-a9ba4b3e.js">
			
 
				   <link rel="stylesheet" href="./css/index-bfccc570.css">
			
 
				   <link rel="stylesheet" href="./css/instrument-118f68d3.css">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/instrument-2c7bbc6d.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-557da405.js">
			
 
				+  <link rel="stylesheet" href="./css/index-1ec513a0.css">
			
 
				+  <link rel="stylesheet" href="./css/instrument-7b1512ed.css">
			
 
				+>>>>>>> feature-patch
			
 
				   <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>
			
@@ -67,8 +78,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-1067395b.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-fcd84388.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-1d2158fb.js"></script>
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-545b5ab0.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> feature-patch
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/dist/js/colexiu-1dd52313.js
+++ b/dist/js/colexiu-1dd52313.js
--- a/dist/js/colexiu-legacy-4fceae41.js
+++ b/dist/js/colexiu-legacy-4fceae41.js
--- a/dist/js/gym-16eb931f.js
+++ b/dist/js/gym-16eb931f.js
--- a/dist/js/gym-legacy-b063b8c0.js
+++ b/dist/js/gym-legacy-b063b8c0.js
--- a/dist/js/index-017c5edd.js
+++ b/dist/js/index-017c5edd.js
--- a/dist/js/index-03c84c67.js
+++ b/dist/js/index-03c84c67.js
--- a/dist/js/index-22bb3984.js
+++ b/dist/js/index-22bb3984.js
@@ -0,0 +1 @@
 
				+import{c as l,d as i,j as e,bx as v,n as r,D as s,bM as w,s as m,q as A,t as u,A as P,P as $}from"./index-557da405.js";const[g,y]=l("skeleton-title"),p={round:Boolean,titleWidth:r};var T=i({name:g,props:p,setup(t){return()=>e("h3",{class:y([{round:t.round}]),style:{width:v(t.titleWidth)}},null)}});const b=s(T);var z=b;const[B,D]=l("skeleton-avatar"),N={avatarSize:r,avatarShape:m("round")};var R=i({name:B,props:N,setup(t){return()=>e("div",{class:D([t.avatarShape]),style:w(t.avatarSize)},null)}});const F=s(R);var I=F;const d="100%",L={round:Boolean,rowWidth:{type:r,default:d}},[U,C]=l("skeleton-paragraph");var E=i({name:U,props:L,setup(t){return()=>e("div",{class:C([{round:t.round}]),style:{width:t.rowWidth}},null)}});const H=s(E);var O=H;const[j,c]=l("skeleton"),q="60%",x={row:A(0),round:Boolean,title:Boolean,titleWidth:r,avatar:Boolean,avatarSize:r,avatarShape:m("round"),loading:u,animate:u,rowWidth:{type:[Number,String,Array],default:d}};var M=i({name:j,inheritAttrs:!1,props:x,setup(t,{slots:o,attrs:h}){const f=()=>{if(t.avatar)return e(I,{avatarShape:t.avatarShape,avatarSize:t.avatarSize},null)},S=()=>{if(t.title)return e(z,{round:t.round,titleWidth:t.titleWidth},null)},k=n=>{const{rowWidth:a}=t;return a===d&&n===+t.row-1?q:Array.isArray(a)?a[n]:a},W=()=>Array(+t.row).fill("").map((n,a)=>e(O,{key:a,round:t.round,rowWidth:v(k(a))},null)),_=()=>o.template?o.template():e($,null,[f(),e("div",{class:c("content")},[S(),W()])]);return()=>{var n;return t.loading?e("div",P({class:c({animate:t.animate,round:t.round})},h),[_()]):(n=o.default)==null?void 0:n.call(o)}}});const G=s(M);export{G as S};
			
--- a/dist/js/index-32bb1767.js
+++ b/dist/js/index-32bb1767.js
--- a/dist/js/index-557da405.js
+++ b/dist/js/index-557da405.js
--- a/dist/js/index-5cc697f0.js
+++ b/dist/js/index-5cc697f0.js
--- a/dist/js/index-7bbeb264.js
+++ b/dist/js/index-7bbeb264.js
--- a/dist/js/index-7f5c97b1.js
+++ b/dist/js/index-7f5c97b1.js
--- a/dist/js/index-7f897739.js
+++ b/dist/js/index-7f897739.js
--- a/dist/js/index-82ec78ed.js
+++ b/dist/js/index-82ec78ed.js
--- a/dist/js/index-92ce9794.js
+++ b/dist/js/index-92ce9794.js
--- a/dist/js/index-96412f25.js
+++ b/dist/js/index-96412f25.js
--- a/dist/js/index-9f88b4d1.js
+++ b/dist/js/index-9f88b4d1.js
--- a/dist/js/index-e44e67ea.js
+++ b/dist/js/index-e44e67ea.js
@@ -0,0 +1 @@
 
				+import{d as i,F as l,W as d,bY as e,M as r,V as c,j as s,aT as u}from"./index-557da405.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});r(()=>{window.appName="colexiu",c.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};
			
--- a/dist/js/index-e50e863f.js
+++ b/dist/js/index-e50e863f.js
--- a/dist/js/index-e6478c8b.js
+++ b/dist/js/index-e6478c8b.js
--- a/dist/js/index-legacy-08fdfaaf.js
+++ b/dist/js/index-legacy-08fdfaaf.js
--- a/dist/js/index-legacy-28c7aa88.js
+++ b/dist/js/index-legacy-28c7aa88.js
--- a/dist/js/index-legacy-30f27a38.js
+++ b/dist/js/index-legacy-30f27a38.js
--- a/dist/js/index-legacy-3e652f0d.js
+++ b/dist/js/index-legacy-3e652f0d.js
--- a/dist/js/index-legacy-4989aa57.js
+++ b/dist/js/index-legacy-4989aa57.js
--- a/dist/js/index-legacy-6aeecb18.js
+++ b/dist/js/index-legacy-6aeecb18.js
--- a/dist/js/index-legacy-6c2b033e.js
+++ b/dist/js/index-legacy-6c2b033e.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-da22fed7.js
			
 
				+System.register(["./index-legacy-dd34bc58.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-e9a839dc.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.F,a=e.W,o=e.bY,r=e.M,s=e.V,d=e.j,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)])])}}))}}}));
			
 
				+>>>>>>>> feature-patch:dist/js/index-legacy-6c2b033e.js
			
--- a/dist/js/index-legacy-7f19d6d4.js
+++ b/dist/js/index-legacy-7f19d6d4.js
--- a/dist/js/index-legacy-80c07336.js
+++ b/dist/js/index-legacy-80c07336.js
--- a/dist/js/index-legacy-8145061d.js
+++ b/dist/js/index-legacy-8145061d.js
--- a/dist/js/index-legacy-a469b033.js
+++ b/dist/js/index-legacy-a469b033.js
--- a/dist/js/index-legacy-a75d53bd.js
+++ b/dist/js/index-legacy-a75d53bd.js
--- a/dist/js/index-legacy-aa2c56ab.js
+++ b/dist/js/index-legacy-aa2c56ab.js
@@ -0,0 +1 @@
 
				+System.register(["./index-legacy-e9a839dc.js"],(function(t,a){"use strict";var r,e,n,l,o,i,s,u,d,p,v,h;return{setters:[t=>{r=t.c,e=t.d,n=t.j,l=t.bx,o=t.n,i=t.D,s=t.bM,u=t.s,d=t.q,p=t.t,v=t.A,h=t.P}],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[w,W]=r("skeleton-avatar"),f={avatarSize:o,avatarShape:u("round")};var g=e({name:w,props:f,setup:t=>()=>n("div",{class:W([t.avatarShape]),style:s(t.avatarSize)},null)}),A=i(g);const k="100%",z={round:Boolean,rowWidth:{type:o,default:k}},[B,b]=r("skeleton-paragraph");var x=e({name:B,props:z,setup:t=>()=>n("div",{class:b([{round:t.round}]),style:{width:t.rowWidth}},null)}),j=i(x);const[q,D]=r("skeleton"),M={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:q,inheritAttrs:!1,props:M,setup(t,{slots:a,attrs:r}){const e=()=>{if(t.avatar)return n(A,{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(j,{key:r,round:t.round,rowWidth:l(i(r))},null)))])])]):null==(s=a.default)?void 0:s.call(a)}}});t("S",i(N))}}}));
			
--- a/dist/js/index-legacy-ab4c9aeb.js
+++ b/dist/js/index-legacy-ab4c9aeb.js
--- a/dist/js/index-legacy-c946490a.js
+++ b/dist/js/index-legacy-c946490a.js
--- a/dist/js/index-legacy-da22fed7.js
+++ b/dist/js/index-legacy-da22fed7.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-da22fed7.js
			
 
				 System.register(["./index-legacy-dd34bc58.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-e9a839dc.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.F,a=e.W,o=e.bY,r=e.M,s=e.V,d=e.j,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)])])}}))}}}));
			
 
				+>>>>>>>> feature-patch:dist/js/index-legacy-6c2b033e.js
			
--- a/dist/js/index-legacy-e9a839dc.js
+++ b/dist/js/index-legacy-e9a839dc.js
--- a/dist/js/instrument-2c7bbc6d.js
+++ b/dist/js/instrument-2c7bbc6d.js
--- a/dist/js/instrument-legacy-545b5ab0.js
+++ b/dist/js/instrument-legacy-545b5ab0.js
--- a/dist/js/modeView-a7c468e4.js
+++ b/dist/js/modeView-a7c468e4.js
--- a/dist/js/modeView-cd74e0c2.js
+++ b/dist/js/modeView-cd74e0c2.js
--- a/dist/js/modeView-legacy-68b8ca9c.js
+++ b/dist/js/modeView-legacy-68b8ca9c.js
--- a/dist/js/orchestra-784c6644.js
+++ b/dist/js/orchestra-784c6644.js
--- a/dist/js/orchestra-legacy-9065e9a9.js
+++ b/dist/js/orchestra-legacy-9065e9a9.js
--- a/dist/js/polyfills-6b4fae76.js
+++ b/dist/js/polyfills-6b4fae76.js
--- a/dist/js/polyfills-legacy-1d2158fb.js
+++ b/dist/js/polyfills-legacy-1d2158fb.js
--- a/dist/js/report-share-4ae43dec.js
+++ b/dist/js/report-share-4ae43dec.js
--- a/dist/js/report-share-legacy-1716c7eb.js
+++ b/dist/js/report-share-legacy-1716c7eb.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-da8f0a4a.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-6b4fae76.js"></script>
			
 
				+>>>>>>> feature-patch
			
 
				 
			
 
				   <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-288d34e9.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-a9ba4b3e.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-b2a684b6.js">
			
@@ -48,6 +53,15 @@
 
				   <link rel="modulepreload" crossorigin href="./js/index-96412f25.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-b9e67090.js">
			
 
				   <link rel="stylesheet" href="./css/index-bfccc570.css">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/orchestra-784c6644.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-557da405.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-82ec78ed.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-7f5c97b1.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-e50e863f.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-22bb3984.js">
			
 
				+  <link rel="stylesheet" href="./css/index-1ec513a0.css">
			
 
				+>>>>>>> feature-patch
			
 
				   <link rel="stylesheet" href="./css/index-85f95688.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>
			
@@ -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-1067395b.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/orchestra-legacy-847461ea.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-1d2158fb.js"></script>
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/orchestra-legacy-9065e9a9.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> feature-patch
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/dist/png/1-0bfdbe3a.png
+++ b/dist/png/1-0bfdbe3a.png
--- a/dist/png/icon_expression4-2efddc6f.png
+++ b/dist/png/icon_expression4-2efddc6f.png
--- a/dist/png/1-a0d5037d.png
+++ b/dist/png/1-a0d5037d.png
--- a/dist/png/2-5c4c2ef5.png
+++ b/dist/png/2-5c4c2ef5.png
--- a/dist/png/2-b595cfb6.png
+++ b/dist/png/2-b595cfb6.png
--- a/dist/png/icon_expression3-ed1128a2.png
+++ b/dist/png/icon_expression3-ed1128a2.png
--- a/dist/png/icon_expression2-874c6bf2.png
+++ b/dist/png/icon_expression2-874c6bf2.png
--- a/dist/png/3-a5b1fd44.png
+++ b/dist/png/3-a5b1fd44.png
--- a/dist/png/3-d02c685a.png
+++ b/dist/png/3-d02c685a.png
--- a/dist/png/4-83acde8c.png
+++ b/dist/png/4-83acde8c.png
--- a/dist/png/4-cfa387c7.png
+++ b/dist/png/4-cfa387c7.png
--- a/dist/png/icon_expression1-f13be586.png
+++ b/dist/png/icon_expression1-f13be586.png
--- a/dist/png/5-348326f8.png
+++ b/dist/png/5-348326f8.png
--- a/dist/png/icon_expression0-b8991383.png
+++ b/dist/png/icon_expression0-b8991383.png
--- a/dist/png/5-d8bfbf51.png
+++ b/dist/png/5-d8bfbf51.png
--- a/dist/png/6-b723e4fb.png
+++ b/dist/png/6-b723e4fb.png
--- a/dist/png/7-31136e07.png
+++ b/dist/png/7-31136e07.png
--- a/dist/png/audioBg-182d47e6.png
+++ b/dist/png/audioBg-182d47e6.png
--- a/dist/png/audioBg-fcf5ca66.png
+++ b/dist/png/audioBg-fcf5ca66.png
--- a/dist/png/bg-20e7cc98.png
+++ b/dist/png/bg-20e7cc98.png
--- a/dist/png/bg-7ad74e56.png
+++ b/dist/png/bg-7ad74e56.png
--- a/dist/png/bg2_left_zs-028c8762.png
+++ b/dist/png/bg2_left_zs-028c8762.png
--- a/dist/png/confirm-17f9443c.png
+++ b/dist/png/confirm-17f9443c.png
--- a/dist/png/confirm-44317bcb.png
+++ b/dist/png/confirm-44317bcb.png
--- a/dist/png/d3-05468672.png
+++ b/dist/png/d3-05468672.png
--- a/dist/png/d3-0ed41305.png
+++ b/dist/png/d3-0ed41305.png
--- a/dist/png/d777-2af1f5b5.png
+++ b/dist/png/d777-2af1f5b5.png
--- a/dist/png/headImg-5dd11ae5.png
+++ b/dist/png/headImg-5dd11ae5.png
--- a/dist/png/headImg1-0839d410.png
+++ b/dist/png/headImg1-0839d410.png
--- a/dist/png/headImg2-a8e50675.png
+++ b/dist/png/headImg2-a8e50675.png
--- a/dist/png/icon-huifang-f5a8e961.png
+++ b/dist/png/icon-huifang-f5a8e961.png
--- a/dist/png/icon-shiyi-5dfda242.png
+++ b/dist/png/icon-shiyi-5dfda242.png
--- a/dist/png/icon_bg-c8684de6.png
+++ b/dist/png/icon_bg-c8684de6.png
--- a/dist/png/icon_bg-d91f5fbc.png
+++ b/dist/png/icon_bg-d91f5fbc.png
--- a/dist/png/icon_pause-282011bd.png
+++ b/dist/png/icon_pause-282011bd.png
--- a/dist/png/icon_reset-51a1bf04.png
+++ b/dist/png/icon_reset-51a1bf04.png
--- a/dist/png/lanya_erji-56285e98.png
+++ b/dist/png/lanya_erji-56285e98.png
--- a/dist/png/lanya_erji-9fa0be22.png
+++ b/dist/png/lanya_erji-9fa0be22.png
--- a/dist/png/microBg-3d54e4c6.png
+++ b/dist/png/microBg-3d54e4c6.png