hace 3 semanas · d73f22e412
--- a/dist/colexiu.html
+++ b/dist/colexiu.html
@@ -2,7 +2,11 @@
 
				 <html lang="en">
			
 
				 
			
 
				 <head>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/polyfills-336fef56.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-bdbb13e0.js"></script>
			
 
				+>>>>>>> feature-patch
			
 
				 
			
 
				   <meta charset="UTF-8" />
			
 
				   <link rel="icon" type="image/svg+xml" href="./vite.svg" />
			
@@ -40,11 +44,19 @@
 
				       },
			
 
				     })
			
 
				   </script>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/colexiu-9d55b6fb.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-f7a5b5dd.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-0f65e958.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-ee7bc841.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-49b6901e.js">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/colexiu-6797f344.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-139c70d3.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-204e8585.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-890ff5f7.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-4ef6f5b9.js">
			
 
				+>>>>>>> feature-patch
			
 
				   <link rel="stylesheet" href="./css/index-1ec513a0.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>
			
@@ -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-ae95c351.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/colexiu-legacy-22ed920b.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-021b26ee.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> feature-patch
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/dist/index.html
+++ b/dist/index.html
@@ -2,7 +2,11 @@
 
				 <html lang="ZH-cn">
			
 
				 
			
 
				 <head>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/polyfills-336fef56.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-bdbb13e0.js"></script>
			
 
				+>>>>>>> feature-patch
			
 
				 
			
 
				   <meta charset="UTF-8">
			
 
				   <link rel="icon" href="./favicon.ico" />
			
@@ -75,11 +79,19 @@
 
				       }
			
 
				     })
			
 
				   </script>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/gym-5ad66b23.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-f7a5b5dd.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-0f65e958.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-f1d8ca4c.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-49b6901e.js">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/gym-e57d2e74.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-139c70d3.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-204e8585.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-7dad5569.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-4ef6f5b9.js">
			
 
				+>>>>>>> feature-patch
			
 
				   <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
			
 
				   <link rel="stylesheet" href="./css/index-1ec513a0.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-ae95c351.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/gym-legacy-a9050635.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-bd35c562.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-336fef56.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-bdbb13e0.js"></script>
			
 
				+>>>>>>> feature-patch
			
 
				 
			
 
				   <meta charset="UTF-8" />
			
 
				   <meta name="viewport"
			
@@ -41,8 +45,13 @@
 
				       })
			
 
				     }
			
 
				   </script>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/instrument-68317320.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-f7a5b5dd.js">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/instrument-b316f97b.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-139c70d3.js">
			
 
				+>>>>>>> feature-patch
			
 
				   <link rel="stylesheet" href="./css/index-1ec513a0.css">
			
 
				   <link rel="stylesheet" href="./css/instrument-7b1512ed.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-ae95c351.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-ea8dd046.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-b016555e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> feature-patch
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/dist/js/colexiu-6797f344.js
+++ b/dist/js/colexiu-6797f344.js
--- a/dist/js/colexiu-9d55b6fb.js
+++ b/dist/js/colexiu-9d55b6fb.js
--- a/dist/js/colexiu-legacy-021b26ee.js
+++ b/dist/js/colexiu-legacy-021b26ee.js
--- a/dist/js/colexiu-legacy-22ed920b.js
+++ b/dist/js/colexiu-legacy-22ed920b.js
--- a/dist/js/gym-5ad66b23.js
+++ b/dist/js/gym-5ad66b23.js
--- a/dist/js/gym-e57d2e74.js
+++ b/dist/js/gym-e57d2e74.js
--- a/dist/js/gym-legacy-a9050635.js
+++ b/dist/js/gym-legacy-a9050635.js
--- a/dist/js/gym-legacy-bd35c562.js
+++ b/dist/js/gym-legacy-bd35c562.js
--- a/dist/js/index-074ee934.js
+++ b/dist/js/index-074ee934.js
--- a/dist/js/index-0f65e958.js
+++ b/dist/js/index-0f65e958.js
--- a/dist/js/index-139c70d3.js
+++ b/dist/js/index-139c70d3.js
--- a/dist/js/index-204e8585.js
+++ b/dist/js/index-204e8585.js
--- a/dist/js/index-29a489a4.js
+++ b/dist/js/index-29a489a4.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-40e89029.js
			
 
				+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-f7a5b5dd.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};
			
 
				+========
			
 
				+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-139c70d3.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};
			
 
				+>>>>>>>> feature-patch:dist/js/index-29a489a4.js
			
--- a/dist/js/index-40e89029.js
+++ b/dist/js/index-40e89029.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-40e89029.js
			
 
				 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-f7a5b5dd.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};
			
 
				+========
			
 
				+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-139c70d3.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};
			
 
				+>>>>>>>> feature-patch:dist/js/index-29a489a4.js
			
--- a/dist/js/index-49b6901e.js
+++ b/dist/js/index-49b6901e.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-49b6901e.js
			
 
				 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-f7a5b5dd.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};
			
 
				+========
			
 
				+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-139c70d3.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};
			
 
				+>>>>>>>> feature-patch:dist/js/index-4ef6f5b9.js
			
--- a/dist/js/index-4ef6f5b9.js
+++ b/dist/js/index-4ef6f5b9.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-49b6901e.js
			
 
				+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-f7a5b5dd.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};
			
 
				+========
			
 
				+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-139c70d3.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};
			
 
				+>>>>>>>> feature-patch:dist/js/index-4ef6f5b9.js
			
--- a/dist/js/index-603bbe7d.js
+++ b/dist/js/index-603bbe7d.js
--- a/dist/js/index-640fa115.js
+++ b/dist/js/index-640fa115.js
--- a/dist/js/index-7dad5569.js
+++ b/dist/js/index-7dad5569.js
--- a/dist/js/index-890ff5f7.js
+++ b/dist/js/index-890ff5f7.js
--- a/dist/js/index-89f36e8b.js
+++ b/dist/js/index-89f36e8b.js
--- a/dist/js/index-b5659e41.js
+++ b/dist/js/index-b5659e41.js
--- a/dist/js/index-de4e4bb8.js
+++ b/dist/js/index-de4e4bb8.js
--- a/dist/js/index-ee7bc841.js
+++ b/dist/js/index-ee7bc841.js
--- a/dist/js/index-f1d8ca4c.js
+++ b/dist/js/index-f1d8ca4c.js
--- a/dist/js/index-f7a5b5dd.js
+++ b/dist/js/index-f7a5b5dd.js
--- a/dist/js/index-legacy-21fcfe5f.js
+++ b/dist/js/index-legacy-21fcfe5f.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-f0f7b7cc.js
			
 
				+System.register(["./index-legacy-ebcfeb6b.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)])])}}))}}}));
			
 
				+========
			
 
				+System.register(["./index-legacy-e352db17.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-21fcfe5f.js
			
--- a/dist/js/index-legacy-40921853.js
+++ b/dist/js/index-legacy-40921853.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-40921853.js
			
 
				 System.register(["./index-legacy-ebcfeb6b.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))}}}));
			
 
				+========
			
 
				+System.register(["./index-legacy-e352db17.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))}}}));
			
 
				+>>>>>>>> feature-patch:dist/js/index-legacy-68f9fc7c.js
			
--- a/dist/js/index-legacy-46433986.js
+++ b/dist/js/index-legacy-46433986.js
--- a/dist/js/index-legacy-4ac51454.js
+++ b/dist/js/index-legacy-4ac51454.js
--- a/dist/js/index-legacy-606494f3.js
+++ b/dist/js/index-legacy-606494f3.js
--- a/dist/js/index-legacy-627d044f.js
+++ b/dist/js/index-legacy-627d044f.js
--- a/dist/js/index-legacy-6756c292.js
+++ b/dist/js/index-legacy-6756c292.js
--- a/dist/js/index-legacy-68f9fc7c.js
+++ b/dist/js/index-legacy-68f9fc7c.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-40921853.js
			
 
				+System.register(["./index-legacy-ebcfeb6b.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))}}}));
			
 
				+========
			
 
				+System.register(["./index-legacy-e352db17.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))}}}));
			
 
				+>>>>>>>> feature-patch:dist/js/index-legacy-68f9fc7c.js
			
--- a/dist/js/index-legacy-7787e22d.js
+++ b/dist/js/index-legacy-7787e22d.js
--- a/dist/js/index-legacy-7f50f9f0.js
+++ b/dist/js/index-legacy-7f50f9f0.js
--- a/dist/js/index-legacy-89bfe514.js
+++ b/dist/js/index-legacy-89bfe514.js
--- a/dist/js/index-legacy-93c90b23.js
+++ b/dist/js/index-legacy-93c90b23.js
--- a/dist/js/index-legacy-c4f2a05f.js
+++ b/dist/js/index-legacy-c4f2a05f.js
--- a/dist/js/index-legacy-d97fd70a.js
+++ b/dist/js/index-legacy-d97fd70a.js
--- a/dist/js/index-legacy-e352db17.js
+++ b/dist/js/index-legacy-e352db17.js
--- a/dist/js/index-legacy-e9a0a46a.js
+++ b/dist/js/index-legacy-e9a0a46a.js
--- a/dist/js/index-legacy-ebcfeb6b.js
+++ b/dist/js/index-legacy-ebcfeb6b.js
--- a/dist/js/index-legacy-f0f7b7cc.js
+++ b/dist/js/index-legacy-f0f7b7cc.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-f0f7b7cc.js
			
 
				 System.register(["./index-legacy-ebcfeb6b.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)])])}}))}}}));
			
 
				+========
			
 
				+System.register(["./index-legacy-e352db17.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-21fcfe5f.js
			
--- a/dist/js/instrument-68317320.js
+++ b/dist/js/instrument-68317320.js
--- a/dist/js/instrument-b316f97b.js
+++ b/dist/js/instrument-b316f97b.js
--- a/dist/js/instrument-legacy-b016555e.js
+++ b/dist/js/instrument-legacy-b016555e.js
--- a/dist/js/instrument-legacy-ea8dd046.js
+++ b/dist/js/instrument-legacy-ea8dd046.js
--- a/dist/js/modeView-7e57fec5.js
+++ b/dist/js/modeView-7e57fec5.js
--- a/dist/js/modeView-84ce18f2.js
+++ b/dist/js/modeView-84ce18f2.js
--- a/dist/js/modeView-legacy-8c38640e.js
+++ b/dist/js/modeView-legacy-8c38640e.js
--- a/dist/js/modeView-legacy-9a73f1b8.js
+++ b/dist/js/modeView-legacy-9a73f1b8.js
--- a/dist/js/orchestra-4da094e9.js
+++ b/dist/js/orchestra-4da094e9.js
--- a/dist/js/orchestra-a130c006.js
+++ b/dist/js/orchestra-a130c006.js
--- a/dist/js/orchestra-legacy-2c2d2394.js
+++ b/dist/js/orchestra-legacy-2c2d2394.js
--- a/dist/js/orchestra-legacy-5c5fd267.js
+++ b/dist/js/orchestra-legacy-5c5fd267.js
--- a/dist/js/polyfills-bdbb13e0.js
+++ b/dist/js/polyfills-bdbb13e0.js
--- a/dist/js/report-share-45d51a75.js
+++ b/dist/js/report-share-45d51a75.js
--- a/dist/js/report-share-cd5a973e.js
+++ b/dist/js/report-share-cd5a973e.js
--- a/dist/js/report-share-legacy-223752da.js
+++ b/dist/js/report-share-legacy-223752da.js
--- a/dist/js/report-share-legacy-3c3b08e1.js
+++ b/dist/js/report-share-legacy-3c3b08e1.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-336fef56.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-bdbb13e0.js"></script>
			
 
				+>>>>>>> feature-patch
			
 
				 
			
 
				   <meta charset="UTF-8" />
			
 
				   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
			
@@ -41,12 +45,21 @@
 
				       transition: opacity .3s;
			
 
				     }
			
 
				   </style>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/orchestra-4da094e9.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-f7a5b5dd.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-0f65e958.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-ee7bc841.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-f1d8ca4c.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-49b6901e.js">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/orchestra-a130c006.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-139c70d3.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-204e8585.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-890ff5f7.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-7dad5569.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-4ef6f5b9.js">
			
 
				+>>>>>>> feature-patch
			
 
				   <link rel="stylesheet" href="./css/index-1ec513a0.css">
			
 
				   <link rel="stylesheet" href="./css/index-85f95688.css">
			
 
				   <link rel="stylesheet" href="./css/orchestra-8bc1a9c0.css">
			
@@ -70,8 +83,13 @@
 
				   </script>
			
 
				   
			
 
				   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
			
 
				+<<<<<<< HEAD
			
 
				   <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-ae95c351.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/orchestra-legacy-2c2d2394.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-5c5fd267.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> feature-patch
			
 
				 </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-336fef56.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-bdbb13e0.js"></script>
			
 
				+>>>>>>> feature-patch
			
 
				 
			
 
				   <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-45d51a75.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-f7a5b5dd.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-49b6901e.js">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/report-share-cd5a973e.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-139c70d3.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-4ef6f5b9.js">
			
 
				+>>>>>>> feature-patch
			
 
				   <link rel="stylesheet" href="./css/index-1ec513a0.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-ae95c351.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/report-share-legacy-3c3b08e1.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/report-share-legacy-223752da.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> feature-patch
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/constant/instruments.ts
+++ b/src/constant/instruments.ts
@@ -433,22 +433,30 @@ export let instruments: any = {}
 
				 
			
 
				 /** 获取分轨名称 */
			
 
				 export const getInstrumentName = (name = '') => {
			
 
				-  name = name.toLocaleLowerCase().replace(/ /g, '')
			
 
				-  if (!name) return ''
			
 
				-  for(let key in instruments){
			
 
				-    const _key = key.toLocaleLowerCase().replace(/ /g, '')
			
 
				-    if (_key.includes(name)){
			
 
				-      return instruments[key]
			
 
				-    }
			
 
				-  }
			
 
				-  for(let key in instruments){
			
 
				-    const _key = key.toLocaleLowerCase().replace(/ /g, '')
			
 
				-    if (name.includes(_key)){
			
 
				-      return instruments[key]
			
 
				-    }
			
 
				-  }
			
 
				-  return ''
			
 
				-};
			
 
				+	name = name.toLocaleLowerCase().replace(/[0-9\s]/g, '')
			
 
				+	if (!name) return ''
			
 
				+	// 全匹配声轨名称
			
 
				+	for(let key in instruments){
			
 
				+	  const _key = key.toLocaleLowerCase().replace(/ /g, '')
			
 
				+	  if (_key === name){
			
 
				+		return instruments[key]
			
 
				+	  }
			
 
				+	}
			
 
				+	// 用返回的code模糊匹配传入的xml声轨名称name
			
 
				+	for(let key in instruments){
			
 
				+	  const _key = key.toLocaleLowerCase().replace(/ /g, '')
			
 
				+	  if (_key.includes(name)){
			
 
				+		return instruments[key]
			
 
				+	  }
			
 
				+	}
			
 
				+  //   for(let key in instruments){
			
 
				+  //     const _key = key.toLocaleLowerCase().replace(/ /g, '')
			
 
				+  //     if (name.includes(_key)){
			
 
				+  //       return instruments[key]
			
 
				+  //     }
			
 
				+  //   }
			
 
				+	return ''
			
 
				+  };
			
 
				 
			
 
				 /**
			
 
				  * 乐器排序
			
--- a/src/state.ts
+++ b/src/state.ts
@@ -1271,9 +1271,11 @@ const getMusicInfo = async (res: any) => {
 
				   const { track, index, musicalInstrumentId } = state.isSimplePage ? { track:tracks[0], index: state.partIndex, musicalInstrumentId: '' } : initMusicSource(res.data, tracks, partIndex, workRecordInstrumentId)
			
 
				   // 这里返回的track可能和实际的对不上，所以重新筛选一下
			
 
				   const realTrack = musicalInstrumentId && res.data?.musicalInstruments?.length ? res.data?.musicalInstruments.find((item: any) => item?.id == musicalInstrumentId)?.code?.split(',')?.[0] : '';
			
 
				+  const instrumentCodes = musicalInstrumentId && res.data?.musicalInstruments?.length ? res.data?.musicalInstruments.find((item: any) => item?.id == musicalInstrumentId)?.code : '';
			
 
				   const musicInfo = {
			
 
				     ...res.data,
			
 
				-    track: res.data.musicSheetType === 'CONCERT' ? track : realTrack
			
 
				+    track: res.data.musicSheetType === 'CONCERT' ? track : realTrack,
			
 
				+    instrumentCodes
			
 
				   };
			
 
				   console.log("🚀 ~ musicInfo:", musicInfo);
			
 
				   setState(musicInfo, index);
			
@@ -1616,6 +1618,20 @@ const setState = (data: any, index: number) => {
 
				   }
			
 
				 
			
 
				   let code = matchVoicePart(state.trackId, "CONCERT")
			
 
				+  /**
			
 
				+   * 曲子：中音萨克斯教程2-4，返回的乐器code是"Alto Sax,Alto Saxophone"，使用第一个Alto Sax去找，找不到对应的指法，这种情况下需要使用多个code去匹配指法
			
 
				+   * 如果当前的第一code找不到，用instrumentCodes去找，
			
 
				+   * 
			
 
				+   * */ 
			
 
				+  if ( data.instrumentCodes && (code == 1 || !code) ) {
			
 
				+    for (let name of data.instrumentCodes.split(',')) {
			
 
				+      let matchCode = matchVoicePart(name, "CONCERT")
			
 
				+      if (matchCode && matchCode !== 1) {
			
 
				+        code = matchCode
			
 
				+        break;
			
 
				+      }
			
 
				+    }
			
 
				+  }    
			
 
				   if (code == 1 || !code) {
			
 
				     code = fixInstrumentNameCode(state.trackId)
			
 
				   }
			
--- a/stats.html
+++ b/stats.html
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -76,8 +76,8 @@ export default defineConfig({
 
				         // target: "https://kt.colexiu.com",
			
 
				         // target: "https://test.lexiaoya.cn",
			
 
				         // target: "https://kt.colexiu.com",
			
 
				-        // target: "https://test.resource.colexiu.com", // 内容平台开发环境，内容平台开发，需在url链接上加上isCbs=true
			
 
				-        target: "https://test.kt.colexiu.com",
			
 
				+        target: "https://test.resource.colexiu.com", // 内容平台开发环境，内容平台开发，需在url链接上加上isCbs=true
			
 
				+        // target: "https://dev.kt.colexiu.com",
			
 
				         // target: "https://mec.colexiu.com",
			
 
				         changeOrigin: true,
			
 
				         rewrite: (path) => path.replace(/^\/instrument/, ""),