1 месяц назад · a2ce11229a
--- a/dist/colexiu.html
+++ b/dist/colexiu.html
@@ -2,7 +2,11 @@
 
				 <html lang="en">
			
 
				 
			
 
				 <head>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/polyfills-a52e866f.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-bdbb13e0.js"></script>
			
 
				+>>>>>>> 792cad2705bd39d6a97f2e161ec737947b4951df
			
 
				 
			
 
				   <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-79dcb6b4.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-89a275b5.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-1875e149.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-2144ba58.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-d157e1cf.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">
			
 
				+>>>>>>> 792cad2705bd39d6a97f2e161ec737947b4951df
			
 
				   <link rel="stylesheet" href="./css/index-1ec513a0.css">
			
 
				   <link rel="stylesheet" href="./css/colexiu-e8b419b5.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-ca18fcc6.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/colexiu-legacy-afd54933.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>
			
 
				+>>>>>>> 792cad2705bd39d6a97f2e161ec737947b4951df
			
 
				 </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-a52e866f.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-bdbb13e0.js"></script>
			
 
				+>>>>>>> 792cad2705bd39d6a97f2e161ec737947b4951df
			
 
				 
			
 
				   <meta charset="UTF-8">
			
 
				   <link rel="icon" href="./favicon.ico" />
			
@@ -75,11 +79,19 @@
 
				       }
			
 
				     })
			
 
				   </script>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/gym-1aac89b0.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-89a275b5.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-1875e149.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-4371b6d6.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-d157e1cf.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">
			
 
				+>>>>>>> 792cad2705bd39d6a97f2e161ec737947b4951df
			
 
				   <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-ca18fcc6.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/gym-legacy-8881e5b8.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>
			
 
				+>>>>>>> 792cad2705bd39d6a97f2e161ec737947b4951df
			
 
				 </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-a52e866f.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-bdbb13e0.js"></script>
			
 
				+>>>>>>> 792cad2705bd39d6a97f2e161ec737947b4951df
			
 
				 
			
 
				   <meta charset="UTF-8" />
			
 
				   <meta name="viewport"
			
@@ -41,8 +45,13 @@
 
				       })
			
 
				     }
			
 
				   </script>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/instrument-65c6052d.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-89a275b5.js">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/instrument-b316f97b.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-139c70d3.js">
			
 
				+>>>>>>> 792cad2705bd39d6a97f2e161ec737947b4951df
			
 
				   <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-ca18fcc6.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-b2a7ecf8.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>
			
 
				+>>>>>>> 792cad2705bd39d6a97f2e161ec737947b4951df
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/dist/js/colexiu-6797f344.js
+++ b/dist/js/colexiu-6797f344.js
--- a/dist/js/colexiu-79dcb6b4.js
+++ b/dist/js/colexiu-79dcb6b4.js
--- a/dist/js/colexiu-legacy-021b26ee.js
+++ b/dist/js/colexiu-legacy-021b26ee.js
--- a/dist/js/colexiu-legacy-afd54933.js
+++ b/dist/js/colexiu-legacy-afd54933.js
--- a/dist/js/gym-1aac89b0.js
+++ b/dist/js/gym-1aac89b0.js
--- a/dist/js/gym-e57d2e74.js
+++ b/dist/js/gym-e57d2e74.js
--- a/dist/js/gym-legacy-8881e5b8.js
+++ b/dist/js/gym-legacy-8881e5b8.js
--- a/dist/js/gym-legacy-bd35c562.js
+++ b/dist/js/gym-legacy-bd35c562.js
--- a/dist/js/index-139c70d3.js
+++ b/dist/js/index-139c70d3.js
--- a/dist/js/index-1875e149.js
+++ b/dist/js/index-1875e149.js
--- a/dist/js/index-204e8585.js
+++ b/dist/js/index-204e8585.js
--- a/dist/js/index-2144ba58.js
+++ b/dist/js/index-2144ba58.js
--- a/dist/js/index-29a489a4.js
+++ b/dist/js/index-29a489a4.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-d403e0dc.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-89a275b5.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};
			
 
				+>>>>>>>> 792cad2705bd39d6a97f2e161ec737947b4951df:dist/js/index-29a489a4.js
			
--- a/dist/js/index-37042afc.js
+++ b/dist/js/index-37042afc.js
--- a/dist/js/index-3cef0b96.js
+++ b/dist/js/index-3cef0b96.js
--- a/dist/js/index-4371b6d6.js
+++ b/dist/js/index-4371b6d6.js
--- a/dist/js/index-4ef6f5b9.js
+++ b/dist/js/index-4ef6f5b9.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-d157e1cf.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-89a275b5.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};
			
 
				+>>>>>>>> 792cad2705bd39d6a97f2e161ec737947b4951df:dist/js/index-4ef6f5b9.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-89a275b5.js
+++ b/dist/js/index-89a275b5.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-d098f819.js
+++ b/dist/js/index-d098f819.js
--- a/dist/js/index-d157e1cf.js
+++ b/dist/js/index-d157e1cf.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-d157e1cf.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-89a275b5.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};
			
 
				+>>>>>>>> 792cad2705bd39d6a97f2e161ec737947b4951df:dist/js/index-4ef6f5b9.js
			
--- a/dist/js/index-d403e0dc.js
+++ b/dist/js/index-d403e0dc.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-d403e0dc.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-89a275b5.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};
			
 
				+>>>>>>>> 792cad2705bd39d6a97f2e161ec737947b4951df:dist/js/index-29a489a4.js
			
--- a/dist/js/index-de4e4bb8.js
+++ b/dist/js/index-de4e4bb8.js
--- a/dist/js/index-legacy-21fcfe5f.js
+++ b/dist/js/index-legacy-21fcfe5f.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-a478fb86.js
			
 
				+System.register(["./index-legacy-f7e20993.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)])])}}))}}}));
			
 
				+>>>>>>>> 792cad2705bd39d6a97f2e161ec737947b4951df:dist/js/index-legacy-21fcfe5f.js
			
--- a/dist/js/index-legacy-45c3f722.js
+++ b/dist/js/index-legacy-45c3f722.js
--- a/dist/js/index-legacy-46433986.js
+++ b/dist/js/index-legacy-46433986.js
--- a/dist/js/index-legacy-4d1030c0.js
+++ b/dist/js/index-legacy-4d1030c0.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-dc2c4b80.js
			
 
				+System.register(["./index-legacy-f7e20993.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))}}}));
			
 
				+>>>>>>>> 792cad2705bd39d6a97f2e161ec737947b4951df: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-78a02ab3.js
+++ b/dist/js/index-legacy-78a02ab3.js
--- a/dist/js/index-legacy-93c90b23.js
+++ b/dist/js/index-legacy-93c90b23.js
--- a/dist/js/index-legacy-a478fb86.js
+++ b/dist/js/index-legacy-a478fb86.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-a478fb86.js
			
 
				 System.register(["./index-legacy-f7e20993.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)])])}}))}}}));
			
 
				+>>>>>>>> 792cad2705bd39d6a97f2e161ec737947b4951df:dist/js/index-legacy-21fcfe5f.js
			
--- a/dist/js/index-legacy-a5ce2b82.js
+++ b/dist/js/index-legacy-a5ce2b82.js
--- a/dist/js/index-legacy-b34d147a.js
+++ b/dist/js/index-legacy-b34d147a.js
--- a/dist/js/index-legacy-ba404626.js
+++ b/dist/js/index-legacy-ba404626.js
--- a/dist/js/index-legacy-c4f2a05f.js
+++ b/dist/js/index-legacy-c4f2a05f.js
--- a/dist/js/index-legacy-dc2c4b80.js
+++ b/dist/js/index-legacy-dc2c4b80.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-dc2c4b80.js
			
 
				 System.register(["./index-legacy-f7e20993.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))}}}));
			
 
				+>>>>>>>> 792cad2705bd39d6a97f2e161ec737947b4951df:dist/js/index-legacy-68f9fc7c.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-f7e20993.js
+++ b/dist/js/index-legacy-f7e20993.js
--- a/dist/js/instrument-65c6052d.js
+++ b/dist/js/instrument-65c6052d.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-b2a7ecf8.js
+++ b/dist/js/instrument-legacy-b2a7ecf8.js
--- a/dist/js/modeView-7e57fec5.js
+++ b/dist/js/modeView-7e57fec5.js
--- a/dist/js/modeView-ef13b23a.js
+++ b/dist/js/modeView-ef13b23a.js
--- a/dist/js/modeView-legacy-9a73f1b8.js
+++ b/dist/js/modeView-legacy-9a73f1b8.js
--- a/dist/js/modeView-legacy-c0ae0cfb.js
+++ b/dist/js/modeView-legacy-c0ae0cfb.js
--- a/dist/js/orchestra-a130c006.js
+++ b/dist/js/orchestra-a130c006.js
--- a/dist/js/orchestra-a9a2bfbc.js
+++ b/dist/js/orchestra-a9a2bfbc.js
--- a/dist/js/orchestra-legacy-5c5fd267.js
+++ b/dist/js/orchestra-legacy-5c5fd267.js
--- a/dist/js/orchestra-legacy-708b3593.js
+++ b/dist/js/orchestra-legacy-708b3593.js
--- a/dist/js/polyfills-bdbb13e0.js
+++ b/dist/js/polyfills-bdbb13e0.js
--- a/dist/js/report-share-2dc021d3.js
+++ b/dist/js/report-share-2dc021d3.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-4c530bed.js
+++ b/dist/js/report-share-legacy-4c530bed.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-a52e866f.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-bdbb13e0.js"></script>
			
 
				+>>>>>>> 792cad2705bd39d6a97f2e161ec737947b4951df
			
 
				 
			
 
				   <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-a9a2bfbc.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-89a275b5.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-1875e149.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-2144ba58.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-4371b6d6.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-d157e1cf.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">
			
 
				+>>>>>>> 792cad2705bd39d6a97f2e161ec737947b4951df
			
 
				   <link rel="stylesheet" href="./css/index-1ec513a0.css">
			
 
				   <link rel="stylesheet" href="./css/index-85f95688.css">
			
 
				   <link rel="stylesheet" href="./css/orchestra-8e05e751.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-ca18fcc6.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/orchestra-legacy-708b3593.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>
			
 
				+>>>>>>> 792cad2705bd39d6a97f2e161ec737947b4951df
			
 
				 </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-a52e866f.js"></script>
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/polyfills-bdbb13e0.js"></script>
			
 
				+>>>>>>> 792cad2705bd39d6a97f2e161ec737947b4951df
			
 
				 
			
 
				   <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-2dc021d3.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-89a275b5.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-d157e1cf.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">
			
 
				+>>>>>>> 792cad2705bd39d6a97f2e161ec737947b4951df
			
 
				   <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-ca18fcc6.js"></script>
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/report-share-legacy-4c530bed.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>
			
 
				+>>>>>>> 792cad2705bd39d6a97f2e161ec737947b4951df
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/page-instrument/header-top/index.tsx
+++ b/src/page-instrument/header-top/index.tsx
@@ -437,8 +437,8 @@ export default defineComponent({
 
				     });
			
 
				     /** 模式切换按钮 */
			
 
				     const toggleBtn = computed(() => {
			
 
				-      // 上课页面不显示
			
 
				-      if(state.isAttendClass) return { display: false, disabled: false };
			
 
				+      // 上课页面不显示，作业模式也不显示，嵌入课件页面也不显示
			
 
				+      if(state.isAttendClass || query.workRecord || query.iscurseplay == "play") return { display: false, disabled: false };
			
 
				       // 老师端，打击乐&节奏练习不显示
			
 
				       if (state.isPercussion && state.platform === IPlatform.PC) return { display: false, disabled: false };
			
 
				       if(state.isCombineRender) return { display: false, disabled: false };
			
@@ -855,6 +855,19 @@ export default defineComponent({
 
				               style={{ display: playTypeBtn.value.display ? "" : "none" }}
			
 
				               class={["driver-2", styles.btn, playTypeBtn.value.disabled && styles.disabled, styles.playType]}
			
 
				               onClick={() => {
			
 
				+                // 总谱 并且开启了单个声轨音频时候
			
 
				+                if(state.isCombineRender && audioData.combineIndex !== "-1") {
			
 
				+                  audioData.combineIndex = "-1"
			
 
				+                  state.music = ""
			
 
				+                  // 有总谱范唱就切换到总谱范唱
			
 
				+                  if(audioData.scoreAudioUrl){
			
 
				+                    state.fanSong = audioData.scoreAudioUrl
			
 
				+                    audioData.songCollection.fanSongEle = audioData.scoreAudioEle
			
 
				+                    audioData.songCollection.beatFanSongEle = audioData.beatScoreAudioEle
			
 
				+                  }else{
			
 
				+                    state.fanSong = ""
			
 
				+                  }
			
 
				+                }
			
 
				                 const oldPlayType = state.playType;
			
 
				                 headTopData.oldPlayType = oldPlayType;
			
 
				                 const oldPlaySource = state.playSource;
			
@@ -898,6 +911,23 @@ export default defineComponent({
 
				               style={{ display: originBtn.value.display ? "" : "none" }}
			
 
				               class={["driver-3", styles.btn, originBtn.value.disabled && styles.disabled, state.playType === "play" ? styles.playSource : styles.songSource]}
			
 
				               onClick={async () => {
			
 
				+                // 总谱 并且开启了单个声轨音频时候
			
 
				+                if(state.isCombineRender && audioData.combineIndex !== "-1") {
			
 
				+                  audioData.combineIndex = "-1"
			
 
				+                  // 区分演奏和演唱
			
 
				+                  if(state.playType === "play") {
			
 
				+                    state.music = ""
			
 
				+                  }else{
			
 
				+                    // 有总谱范唱就切换到总谱范唱
			
 
				+                    if(audioData.scoreAudioUrl){
			
 
				+                      state.fanSong = audioData.scoreAudioUrl
			
 
				+                      audioData.songCollection.fanSongEle = audioData.scoreAudioEle
			
 
				+                      audioData.songCollection.beatFanSongEle = audioData.beatScoreAudioEle
			
 
				+                    }else{
			
 
				+                      state.fanSong = ""
			
 
				+                    }
			
 
				+                  }
			
 
				+                }
			
 
				                 const oldPlayType = state.playType;
			
 
				                 const oldPlaySource = state.playSource;
			
 
				                 if (state.playType === "play") {
			
@@ -918,11 +948,6 @@ export default defineComponent({
 
				                   }
			
 
				                 }
			
 
				                 await handlerModeChange(oldPlayType, oldPlaySource);
			
 
				-                // 总谱 并且开启了单个声轨音频时候
			
 
				-                if(state.isCombineRender && state.playSource === "background") {
			
 
				-                  audioData.combineIndex = -1
			
 
				-                  state.music = ""
			
 
				-                }
			
 
				                 showToast({
			
 
				                   message: state.playType === "play" ? (state.playSource === "music" ? "已切换为原声" : state.playSource === "background" ? "已切换为伴奏" : "已切换为唱名") : state.playSource === "music" ? "已切换为范唱" : state.playSource === "background" ? "已切换为伴唱" : "已切换为唱名",
			
 
				                   position: "top",
			
--- a/src/page-instrument/view-evaluat-report/component/share-top/index.module.less
+++ b/src/page-instrument/view-evaluat-report/component/share-top/index.module.less
@@ -321,7 +321,7 @@
 
				                         height: 12px;
			
 
				                         margin-top: -4px;
			
 
				                         box-shadow: initial;
			
 
				-                        background-color: #269EFE;
			
 
				+                        background-color: #1CACF1;
			
 
				                     }
			
 
				 
			
 
				                     .plyr__progress__buffer {
			
@@ -368,8 +368,8 @@
 
				                         background-color: #ffffff;
			
 
				                     }
			
 
				                     .plyr__progress__buffer {
			
 
				-                        color: #fff;
			
 
				-                        background-color: #fff;
			
 
				+                        color: rgba(255, 255, 255, 0.5);
			
 
				+                        background-color: rgba(255, 255, 255, 0.3);
			
 
				                     }
			
 
				                 }
			
 
				                 .plyr__controls__item.plyr__time{
			
--- a/src/state.ts
+++ b/src/state.ts
@@ -1348,17 +1348,29 @@ function initMusicSource(data: any, tracks: string[], partIndex: number, workRec
 
				         if(state.combinePartIndexs.length) {
			
 
				           // 当选择多个分轨时候
			
 
				           state.combinePartIndexs.map( partI => {
			
 
				+            // 演奏
			
 
				             const musicSheetSound = musicSheetSoundList.find((item:any)=>{
			
 
				               return item.track?.toLowerCase().trim() === tracks[partI]?.toLowerCase().trim() && item.audioPlayType === "PLAY"
			
 
				             })
			
 
				             musicSheetSound?.audioFileUrl && (audioData.combineMusics[partI] = musicSheetSound.audioFileUrl)
			
 
				+            // 演唱
			
 
				+            const singMusicSheetSound = musicSheetSoundList.find((item:any)=>{
			
 
				+              return item.track?.toLowerCase().trim() === tracks[partI]?.toLowerCase().trim() && item.audioPlayType === "SING"
			
 
				+            })
			
 
				+            singMusicSheetSound?.audioFileUrl && (audioData.combineMusics[`sing_${partI}`] = singMusicSheetSound.audioFileUrl)
			
 
				           })
			
 
				         }else{
			
 
				           tracks.map((itemTrack:any, partI:number) => {
			
 
				+            // 演奏
			
 
				             const musicSheetSound = musicSheetSoundList.find((item:any)=>{
			
 
				               return item.track?.toLowerCase().trim() === itemTrack?.toLowerCase().trim() && item.audioPlayType === "PLAY"
			
 
				             })
			
 
				             musicSheetSound?.audioFileUrl && (audioData.combineMusics[partI] = musicSheetSound.audioFileUrl)
			
 
				+            // 演唱
			
 
				+            const singMusicSheetSound = musicSheetSoundList.find((item:any)=>{
			
 
				+              return item.track?.toLowerCase().trim() === itemTrack?.toLowerCase().trim() && item.audioPlayType === "SING"
			
 
				+            })
			
 
				+            singMusicSheetSound?.audioFileUrl && (audioData.combineMusics[`sing_${partI}`] = singMusicSheetSound.audioFileUrl)
			
 
				           })
			
 
				         }
			
 
				         // 总谱演奏模式是 伴奏
			
--- a/src/view/audio-list/index.tsx
+++ b/src/view/audio-list/index.tsx
@@ -46,9 +46,12 @@ export const audioData = reactive({
 
				 		beatMingSongEle: null as HTMLAudioElement | null,
			
 
				 		beatMingSongGirlEle: null as HTMLAudioElement | null
			
 
				 	},
			
 
				-	combineIndex: -1, // 当前 播放的总谱音频索引
			
 
				+	combineIndex: "-1", // 当前 播放的总谱音频索引
			
 
				 	combineMusics: {} as Record<string, any>, // 音频 url
			
 
				-	combineMusicEles:[] as {key:number, value:HTMLAudioElement, beatValue:HTMLAudioElement|null}[] // 存储的音频el 当大于4个时候删除
			
 
				+	combineMusicEles:[] as {key:string, value:HTMLAudioElement, beatValue:HTMLAudioElement|null}[], // 存储的音频el 当大于4个时候删除
			
 
				+	scoreAudioUrl:"",  // 总谱范唱 存一个备份
			
 
				+	scoreAudioEle: null as HTMLAudioElement | null,  // 总谱范唱 存一个备份
			
 
				+	beatScoreAudioEle: null as HTMLAudioElement | null,  // 总谱范唱节拍器 存一个备份
			
 
				 });
			
 
				 const midiRef = ref();
			
 
				 /** 播放或暂停 */
			
@@ -326,12 +329,6 @@ export const handleLoadBeatMusic = async () => {
 
				 	state.loadingText = "音频资源加载中，请稍后…"
			
 
				 	state.isLoading = true
			
 
				 	const musicAudio = await mergeBeatAudio(currentMusic) as any
			
 
				-	const playEleObj = {
			
 
				-		"play_music":"beatSongEle",
			
 
				-		"play_background":"beatBackgroundEle",
			
 
				-		"sing_music":"beatFanSongEle",
			
 
				-		"sing_background":"beatBanSongEle"
			
 
				-	}
			
 
				 	// 给音频赋值
			
 
				 	if(playSource === "mingSong"){
			
 
				 		// 当男声女声都有的时候 才区分
			
@@ -364,22 +361,39 @@ export const handleLoadBeatMusic = async () => {
 
				 			}
			
 
				 		}
			
 
				 		// @ts-ignore
			
 
				-		audioData.songCollection[playEleObj[`${playType}_${playSource}`]] = musicAudio
			
 
				+		audioData.songCollection[beatPlayObj[`${playType}_${playSource}`]] = musicAudio
			
 
				+		// 总谱范唱需要保存一份备份
			
 
				+		if(audioData.combineIndex === "-1" && playType === "sing" && playSource==="music" ){
			
 
				+			audioData.beatScoreAudioEle = musicAudio
			
 
				+		}
			
 
				 	}
			
 
				 	state.isLoading = false
			
 
				 }
			
 
				 
			
 
				 // 切换对应的声轨，并且配置当前的audio
			
 
				-export async function changeCombineAudio (combineIndex: number){
			
 
				+export async function changeCombineAudio (combineIndex: string){
			
 
				 	// 重复点击的时候取消选中 原音
			
 
				 	if(combineIndex === audioData.combineIndex){
			
 
				-		audioData.combineIndex = -1
			
 
				-		state.playSource = "background"
			
 
				-		state.music = ""
			
 
				+		audioData.combineIndex = "-1"
			
 
				+		// 区分演奏和演唱
			
 
				+		if(state.playType === "play") {
			
 
				+			state.playSource = "background"
			
 
				+			state.music = ""
			
 
				+		}else{
			
 
				+			// 有总谱范唱就切换到总谱范唱
			
 
				+			if(audioData.scoreAudioUrl){
			
 
				+				state.fanSong = audioData.scoreAudioUrl
			
 
				+				audioData.songCollection.fanSongEle = audioData.scoreAudioEle
			
 
				+				audioData.songCollection.beatFanSongEle = audioData.beatScoreAudioEle
			
 
				+			}else{
			
 
				+				state.playSource = "background"
			
 
				+				state.fanSong = ""
			
 
				+			}
			
 
				+		}
			
 
				 		// 当开启节拍器的时候，切为伴奏的时候合成节拍器1
			
 
				 		await handleLoadBeatMusic()
			
 
				 		// 当没有背景音文件的时候
			
 
				-		if(!state.accompany) {
			
 
				+		if(!state.accompany && !state.fanSong && !state.banSong) {
			
 
				 			state.noMusicSource = true
			
 
				 		}
			
 
				 		return
			
@@ -393,28 +407,23 @@ export async function changeCombineAudio (combineIndex: number){
 
				 	})
			
 
				 	const cacheMusic = audioData.combineMusicEles[cacheMusicIndex]
			
 
				 	if(cacheMusic?.value){
			
 
				-		audioData.songCollection.songEle = cacheMusic.value
			
 
				-		audioData.songCollection.beatSongEle = cacheMusic.beatValue
			
 
				+		if(state.playType === "play") {
			
 
				+			audioData.songCollection.songEle = cacheMusic.value
			
 
				+			audioData.songCollection.beatSongEle = cacheMusic.beatValue
			
 
				+		}else{
			
 
				+			audioData.songCollection.fanSongEle = cacheMusic.value
			
 
				+			audioData.songCollection.beatFanSongEle = cacheMusic.beatValue
			
 
				+		}
			
 
				 		// 使用缓存之后 当前数据位置向后偏移，删除缓存的时候以使用顺序位置
			
 
				 		const itemMusic = audioData.combineMusicEles.splice(cacheMusicIndex, 1)
			
 
				 		audioData.combineMusicEles.push(...itemMusic)
			
 
				 	}else{
			
 
				 		const music = await createAudio(musicUrl)
			
 
				 		const beatMusic = await mergeBeatAudio(musicUrl) as any 
			
 
				-		// 当没有背景音的时候 需要绑定事件
			
 
				-		if(!audioData.songCollection.backgroundEle){
			
 
				-			if(music){
			
 
				-				music.addEventListener("play", onPlay);
			
 
				-				music.addEventListener("ended", onEnded);
			
 
				-			}			
			
 
				-		}
			
 
				-		// 取消掉背景音绑定的时候，然后给当前原音节拍音频绑定事件，这样防止没有背景节拍的时候，能给
			
 
				-		if(beatMusic){
			
 
				-			audioData.songCollection.beatBackgroundEle?.removeEventListener("play", onPlay)
			
 
				-			audioData.songCollection.beatBackgroundEle?.removeEventListener("ended", onEnded)
			
 
				-			beatMusic.addEventListener("play", onPlay);
			
 
				-			beatMusic.addEventListener("ended", onEnded);
			
 
				-		}
			
 
				+		music?.addEventListener("play", onPlay);
			
 
				+		music?.addEventListener("ended", onEnded);
			
 
				+		beatMusic?.addEventListener("play", onPlay);
			
 
				+		beatMusic?.addEventListener("ended", onEnded);
			
 
				 		audioData.combineMusicEles.push({
			
 
				 			key: combineIndex,
			
 
				 			value: music!,
			
@@ -424,18 +433,27 @@ export async function changeCombineAudio (combineIndex: number){
 
				 		if(audioData.combineMusicEles.length > 4){
			
 
				 			audioData.combineMusicEles.splice(0,1)
			
 
				 		}
			
 
				-		audioData.songCollection.songEle = music
			
 
				-		audioData.songCollection.beatSongEle = beatMusic!
			
 
				+		if(state.playType === "play") {
			
 
				+			audioData.songCollection.songEle = music
			
 
				+			audioData.songCollection.beatSongEle = beatMusic!
			
 
				+		}else{
			
 
				+			audioData.songCollection.fanSongEle = music
			
 
				+			audioData.songCollection.beatFanSongEle = beatMusic!
			
 
				+		}
			
 
				 	}
			
 
				 	audioData.combineIndex = combineIndex
			
 
				-	state.music = musicUrl
			
 
				+	if(state.playType === "play"){
			
 
				+		state.music = musicUrl
			
 
				+	}else{
			
 
				+		state.fanSong = musicUrl
			
 
				+	}
			
 
				 	state.playSource = "music"
			
 
				 	// 当没有背景音文件的时候
			
 
				-	if(!state.accompany) {
			
 
				+	if(!state.accompany && !state.fanSong && !state.banSong) {
			
 
				 		state.noMusicSource = false
			
 
				 	}
			
 
				 	showToast({
			
 
				-		message:  "已开启原声",
			
 
				+		message:  state.playType === "play" ? "已开启原声" : "已开启范唱",
			
 
				 		position: "top",
			
 
				 		className: "selectionToast",
			
 
				 	});
			
@@ -567,6 +585,8 @@ export default defineComponent({
 
				 					banSongEle:banSong,
			
 
				 					mingSongEle:mingSong
			
 
				 				})
			
 
				+				audioData.scoreAudioUrl = state.fanSong
			
 
				+				audioData.scoreAudioEle = fanSong
			
 
				 				Object.assign(audioData.mingSongTypeCollection, {
			
 
				 					mingSongEle: mingSong,
			
 
				 					mingSongGirlEle:mingSongGirl
			
--- a/src/view/music-score/combineAudio/index.tsx
+++ b/src/view/music-score/combineAudio/index.tsx
@@ -8,7 +8,7 @@ import state from "/src/state"
 
				 export default defineComponent({
			
 
				    name: "combineAudio",
			
 
				    setup(props, { emit }) {
			
 
				-      const elementsData = ref<{ index: number; top: number; left: number }[]>([])
			
 
				+      const elementsData = ref<{ index: string; top: number; left: number }[]>([])
			
 
				       onMounted(() => {
			
 
				          const parent = document.querySelector("#osmdCanvasPage1")
			
 
				          const elements = document.querySelectorAll("g[data-trackIdx]")
			
@@ -19,17 +19,20 @@ export default defineComponent({
 
				          const combineMusicsIndexs = Object.keys(audioData.combineMusics)
			
 
				          elements.forEach(element => {
			
 
				             const dataTrackIdx = element.getAttribute("data-trackIdx")
			
 
				-            // 当有 dataTrackIdx 并且有原音的时候 显示
			
 
				-            if (dataTrackIdx && combineMusicsIndexs.includes(dataTrackIdx)) {
			
 
				-               const elementRect = element.getBoundingClientRect()
			
 
				-               const height = elementRect.height
			
 
				-               let top = elementRect.top + height / 2 - 11 - musicContainerPos.top
			
 
				-               let left = elementRect.left - 22 - 10 - musicContainerPos.left
			
 
				-               elementsData.value.push({
			
 
				-                  index: parseInt(dataTrackIdx),
			
 
				-                  top: top,
			
 
				-                  left: left
			
 
				-               })
			
 
				+            // 当有 dataTrackIdx 并且有原音的时候 显示  区分演奏演唱
			
 
				+            if (dataTrackIdx) {
			
 
				+               const musIndex = state.playType === "sing" ? `sing_${dataTrackIdx}` : dataTrackIdx
			
 
				+               if (combineMusicsIndexs.includes(musIndex)) {
			
 
				+                  const elementRect = element.getBoundingClientRect()
			
 
				+                  const height = elementRect.height
			
 
				+                  let top = elementRect.top + height / 2 - 11 - musicContainerPos.top
			
 
				+                  let left = elementRect.left - 22 - 10 - musicContainerPos.left
			
 
				+                  elementsData.value.push({
			
 
				+                     index: musIndex,
			
 
				+                     top: top,
			
 
				+                     left: left
			
 
				+                  })
			
 
				+               }
			
 
				             }
			
 
				          })
			
 
				       })
			
--- a/src/view/music-score/index.tsx
+++ b/src/view/music-score/index.tsx
@@ -278,7 +278,7 @@ export default defineComponent({
 
				 				{slots.default?.()}
			
 
				 				{props.showSelection && musicData.showSelection && !state.isEvaluatReport &&!state.isSimplePage && state.musicRendered && <Selection />}
			
 
				 				{/* 目前只有演奏模式下有 */}
			
 
				-				{props.showSelection && musicData.showSelection && state.isCombineRender &&!state.isSimplePage && !state.isPreView && state.musicRendered && state.playType === "play" && <CombineAudio></CombineAudio> }
			
 
				+				{props.showSelection && musicData.showSelection && state.isCombineRender &&!state.isSimplePage && !state.isPreView && state.musicRendered && <CombineAudio></CombineAudio> }
			
 
				 			</div>
			
 
				 		);
			
 
				 	},
			
--- a/stats.html
+++ b/stats.html
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -77,7 +77,7 @@ export default defineConfig({
 
				         // target: "https://test.lexiaoya.cn",
			
 
				         // target: "https://kt.colexiu.com",
			
 
				         target: "https://test.resource.colexiu.com", // 内容平台开发环境，内容平台开发，需在url链接上加上isCbs=true
			
 
				-        // target: "https://dev.kt.colexiu.com",
			
 
				+        //target: "https://test.kt.colexiu.com",
			
 
				         // target: "https://mec.colexiu.com",
			
 
				         changeOrigin: true,
			
 
				         rewrite: (path) => path.replace(/^\/instrument/, ""),