6 月之前 · b266f45bc8
--- a/dist/colexiu.html
+++ b/dist/colexiu.html
@@ -2,7 +2,7 @@
 
				 <html lang="en">
			
 
				 
			
 
				 <head>
			
 
				-  <script type="module" crossorigin src="./js/polyfills-2e400f59.js"></script>
			
 
				+  <script type="module" crossorigin src="./js/polyfills-fda21288.js"></script>
			
 
				 
			
 
				   <meta charset="UTF-8" />
			
 
				   <link rel="icon" type="image/svg+xml" href="./vite.svg" />
			
@@ -40,12 +40,21 @@
 
				       },
			
 
				     })
			
 
				   </script>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/colexiu-73c4e7fb.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-88971aef.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-317fec7e.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-4ef5fa4a.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-890e40da.js">
			
 
				   <link rel="stylesheet" href="./css/index-f2089c1c.css">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/colexiu-eef4bdcf.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-84588ddf.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-75b08da5.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-5320fd21.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-a2b90afd.js">
			
 
				+  <link rel="stylesheet" href="./css/index-3642c4ba.css">
			
 
				+>>>>>>> ad48312a4218b12b77f39afa7da0b336de34b76c
			
 
				   <link rel="stylesheet" href="./css/colexiu-62f31c4f.css">
			
 
				   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
			
 
				   <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
			
@@ -57,7 +66,11 @@
 
				   
			
 
				   <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>
			
 
				   <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-241ca397.js"></script>
			
 
				+<<<<<<< HEAD
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/colexiu-legacy-1379b715.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/colexiu-legacy-7a3eb6fe.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> ad48312a4218b12b77f39afa7da0b336de34b76c
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/dist/css/index-3642c4ba.css
+++ b/dist/css/index-3642c4ba.css
--- a/dist/css/index-f2089c1c.css
+++ b/dist/css/index-f2089c1c.css
--- a/dist/index.html
+++ b/dist/index.html
@@ -2,7 +2,7 @@
 
				 <html lang="ZH-cn">
			
 
				 
			
 
				 <head>
			
 
				-  <script type="module" crossorigin src="./js/polyfills-2e400f59.js"></script>
			
 
				+  <script type="module" crossorigin src="./js/polyfills-fda21288.js"></script>
			
 
				 
			
 
				   <meta charset="UTF-8">
			
 
				   <link rel="icon" href="./favicon.ico" />
			
@@ -75,6 +75,7 @@
 
				       }
			
 
				     })
			
 
				   </script>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/gym-72457d93.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-88971aef.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-317fec7e.js">
			
@@ -82,6 +83,15 @@
 
				   <link rel="modulepreload" crossorigin href="./js/index-890e40da.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
			
 
				   <link rel="stylesheet" href="./css/index-f2089c1c.css">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/gym-9c38e62c.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-84588ddf.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-75b08da5.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-5a1d7ebf.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-a2b90afd.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
			
 
				+  <link rel="stylesheet" href="./css/index-3642c4ba.css">
			
 
				+>>>>>>> ad48312a4218b12b77f39afa7da0b336de34b76c
			
 
				   <link rel="stylesheet" href="./css/index-85f95688.css">
			
 
				   <link rel="stylesheet" href="./css/plyr-ad8ef5ae.css">
			
 
				   <link rel="stylesheet" href="./css/index-171cd132.css">
			
@@ -99,7 +109,11 @@
 
				   
			
 
				   <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>
			
 
				   <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-241ca397.js"></script>
			
 
				+<<<<<<< HEAD
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/gym-legacy-d54df81a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/gym-legacy-8d18cf10.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> ad48312a4218b12b77f39afa7da0b336de34b76c
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/dist/instrument.html
+++ b/dist/instrument.html
@@ -2,7 +2,7 @@
 
				 <html lang="en">
			
 
				 
			
 
				 <head>
			
 
				-  <script type="module" crossorigin src="./js/polyfills-2e400f59.js"></script>
			
 
				+  <script type="module" crossorigin src="./js/polyfills-fda21288.js"></script>
			
 
				 
			
 
				   <meta charset="UTF-8" />
			
 
				   <meta name="viewport"
			
@@ -41,9 +41,15 @@
 
				       })
			
 
				     }
			
 
				   </script>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/instrument-a993c374.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-88971aef.js">
			
 
				   <link rel="stylesheet" href="./css/index-f2089c1c.css">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/instrument-c9dd3e10.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-84588ddf.js">
			
 
				+  <link rel="stylesheet" href="./css/index-3642c4ba.css">
			
 
				+>>>>>>> ad48312a4218b12b77f39afa7da0b336de34b76c
			
 
				   <link rel="stylesheet" href="./css/instrument-118f68d3.css">
			
 
				   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
			
 
				   <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
			
@@ -68,7 +74,11 @@
 
				   </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>
			
 
				   <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-241ca397.js"></script>
			
 
				+<<<<<<< HEAD
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-c09ddd9f.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-5ae60624.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> ad48312a4218b12b77f39afa7da0b336de34b76c
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/dist/js/colexiu-73c4e7fb.js
+++ b/dist/js/colexiu-73c4e7fb.js
--- a/dist/js/colexiu-eef4bdcf.js
+++ b/dist/js/colexiu-eef4bdcf.js
--- a/dist/js/colexiu-legacy-1379b715.js
+++ b/dist/js/colexiu-legacy-1379b715.js
--- a/dist/js/colexiu-legacy-7a3eb6fe.js
+++ b/dist/js/colexiu-legacy-7a3eb6fe.js
--- a/dist/js/gym-72457d93.js
+++ b/dist/js/gym-72457d93.js
--- a/dist/js/gym-9c38e62c.js
+++ b/dist/js/gym-9c38e62c.js
--- a/dist/js/gym-legacy-8d18cf10.js
+++ b/dist/js/gym-legacy-8d18cf10.js
--- a/dist/js/gym-legacy-d54df81a.js
+++ b/dist/js/gym-legacy-d54df81a.js
--- a/dist/js/index-143f6670.js
+++ b/dist/js/index-143f6670.js
--- a/dist/js/index-317fec7e.js
+++ b/dist/js/index-317fec7e.js
--- a/dist/js/index-39ec12c3.js
+++ b/dist/js/index-39ec12c3.js
--- a/dist/js/index-3c8c1460.js
+++ b/dist/js/index-3c8c1460.js
--- a/dist/js/index-409814fd.js
+++ b/dist/js/index-409814fd.js
--- a/dist/js/index-4ef5fa4a.js
+++ b/dist/js/index-4ef5fa4a.js
--- a/dist/js/index-5320fd21.js
+++ b/dist/js/index-5320fd21.js
--- a/dist/js/index-570ca9d3.js
+++ b/dist/js/index-570ca9d3.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-570ca9d3.js
			
 
				 import{d as i,g as l,n as d,bP as e,c,m as r,h as s,at as u}from"./index-88971aef.js";const m="_skeleton_vtlsh_1",f="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:m,detail:f,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});c(()=>{window.appName="colexiu",r.xmlUrl=n.xmlUrl,t.isLoading=!1});const o=async()=>{console.log("渲染完成")};return()=>s("div",{class:a.detail},[s("div",{id:"scrollContainer",class:[a.container,"hideCursor"]},[!t.isLoading&&s(u,{onRendered:o},null)])])}});export{y as default};
			
 
				+========
			
 
				+import{d as i,g as l,n as d,bP as e,c,m as r,h as s,at as u}from"./index-84588ddf.js";const m="_skeleton_vtlsh_1",f="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:m,detail:f,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});c(()=>{window.appName="colexiu",r.xmlUrl=n.xmlUrl,t.isLoading=!1});const o=async()=>{console.log("渲染完成")};return()=>s("div",{class:a.detail},[s("div",{id:"scrollContainer",class:[a.container,"hideCursor"]},[!t.isLoading&&s(u,{onRendered:o},null)])])}});export{y as default};
			
 
				+>>>>>>>> ad48312a4218b12b77f39afa7da0b336de34b76c:dist/js/index-ca614e37.js
			
--- a/dist/js/index-5a1d7ebf.js
+++ b/dist/js/index-5a1d7ebf.js
--- a/dist/js/index-75b08da5.js
+++ b/dist/js/index-75b08da5.js
--- a/dist/js/index-84588ddf.js
+++ b/dist/js/index-84588ddf.js
--- a/dist/js/index-890e40da.js
+++ b/dist/js/index-890e40da.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-890e40da.js
			
 
				 import{b6 as l,d as i,h as e,bg as v,b9 as r,bb as d,bC as _,bc as m,bD as w,bf as u,bj as g,F as $}from"./index-88971aef.js";const[y,A]=l("skeleton-title"),P={round:Boolean,titleWidth:r};var p=i({name:y,props:P,setup(t){return()=>e("h3",{class:A([{round:t.round}]),style:{width:v(t.titleWidth)}},null)}});const T=d(p);var z=T;const[B,D]=l("skeleton-avatar"),F={avatarSize:r,avatarShape:m("round")};var N=i({name:B,props:F,setup(t){return()=>e("div",{class:D([t.avatarShape]),style:_(t.avatarSize)},null)}});const R=d(N);var C=R;const s="100%",I={round:Boolean,rowWidth:{type:r,default:s}},[L,U]=l("skeleton-paragraph");var E=i({name:L,props:I,setup(t){return()=>e("div",{class:U([{round:t.round}]),style:{width:t.rowWidth}},null)}});const H=d(E);var O=H;const[j,c]=l("skeleton"),V="60%",q={row:w(0),round:Boolean,title:Boolean,titleWidth:r,avatar:Boolean,avatarSize:r,avatarShape:m("round"),loading:u,animate:u,rowWidth:{type:[Number,String,Array],default:s}};var x=i({name:j,inheritAttrs:!1,props:q,setup(t,{slots:o,attrs:h}){const f=()=>{if(t.avatar)return e(C,{avatarShape:t.avatarShape,avatarSize:t.avatarSize},null)},S=()=>{if(t.title)return e(z,{round:t.round,titleWidth:t.titleWidth},null)},b=n=>{const{rowWidth:a}=t;return a===s&&n===+t.row-1?V:Array.isArray(a)?a[n]:a},k=()=>Array(+t.row).fill("").map((n,a)=>e(O,{key:a,round:t.round,rowWidth:v(b(a))},null)),W=()=>o.template?o.template():e($,null,[f(),e("div",{class:c("content")},[S(),k()])]);return()=>{var n;return t.loading?e("div",g({class:c({animate:t.animate,round:t.round})},h),[W()]):(n=o.default)==null?void 0:n.call(o)}}});const J=d(x);export{J as S};
			
 
				+========
			
 
				+import{b6 as l,d as i,h as e,bg as v,b9 as r,bb as d,bC as _,bc as m,bD as w,bf as u,bj as g,F as $}from"./index-84588ddf.js";const[y,A]=l("skeleton-title"),P={round:Boolean,titleWidth:r};var p=i({name:y,props:P,setup(t){return()=>e("h3",{class:A([{round:t.round}]),style:{width:v(t.titleWidth)}},null)}});const T=d(p);var z=T;const[B,D]=l("skeleton-avatar"),F={avatarSize:r,avatarShape:m("round")};var N=i({name:B,props:F,setup(t){return()=>e("div",{class:D([t.avatarShape]),style:_(t.avatarSize)},null)}});const R=d(N);var C=R;const s="100%",I={round:Boolean,rowWidth:{type:r,default:s}},[L,U]=l("skeleton-paragraph");var E=i({name:L,props:I,setup(t){return()=>e("div",{class:U([{round:t.round}]),style:{width:t.rowWidth}},null)}});const H=d(E);var O=H;const[j,c]=l("skeleton"),V="60%",q={row:w(0),round:Boolean,title:Boolean,titleWidth:r,avatar:Boolean,avatarSize:r,avatarShape:m("round"),loading:u,animate:u,rowWidth:{type:[Number,String,Array],default:s}};var x=i({name:j,inheritAttrs:!1,props:q,setup(t,{slots:o,attrs:h}){const f=()=>{if(t.avatar)return e(C,{avatarShape:t.avatarShape,avatarSize:t.avatarSize},null)},S=()=>{if(t.title)return e(z,{round:t.round,titleWidth:t.titleWidth},null)},b=n=>{const{rowWidth:a}=t;return a===s&&n===+t.row-1?V:Array.isArray(a)?a[n]:a},k=()=>Array(+t.row).fill("").map((n,a)=>e(O,{key:a,round:t.round,rowWidth:v(b(a))},null)),W=()=>o.template?o.template():e($,null,[f(),e("div",{class:c("content")},[S(),k()])]);return()=>{var n;return t.loading?e("div",g({class:c({animate:t.animate,round:t.round})},h),[W()]):(n=o.default)==null?void 0:n.call(o)}}});const J=d(x);export{J as S};
			
 
				+>>>>>>>> ad48312a4218b12b77f39afa7da0b336de34b76c:dist/js/index-a2b90afd.js
			
--- a/dist/js/index-a2b90afd.js
+++ b/dist/js/index-a2b90afd.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-890e40da.js
			
 
				+import{b6 as l,d as i,h as e,bg as v,b9 as r,bb as d,bC as _,bc as m,bD as w,bf as u,bj as g,F as $}from"./index-88971aef.js";const[y,A]=l("skeleton-title"),P={round:Boolean,titleWidth:r};var p=i({name:y,props:P,setup(t){return()=>e("h3",{class:A([{round:t.round}]),style:{width:v(t.titleWidth)}},null)}});const T=d(p);var z=T;const[B,D]=l("skeleton-avatar"),F={avatarSize:r,avatarShape:m("round")};var N=i({name:B,props:F,setup(t){return()=>e("div",{class:D([t.avatarShape]),style:_(t.avatarSize)},null)}});const R=d(N);var C=R;const s="100%",I={round:Boolean,rowWidth:{type:r,default:s}},[L,U]=l("skeleton-paragraph");var E=i({name:L,props:I,setup(t){return()=>e("div",{class:U([{round:t.round}]),style:{width:t.rowWidth}},null)}});const H=d(E);var O=H;const[j,c]=l("skeleton"),V="60%",q={row:w(0),round:Boolean,title:Boolean,titleWidth:r,avatar:Boolean,avatarSize:r,avatarShape:m("round"),loading:u,animate:u,rowWidth:{type:[Number,String,Array],default:s}};var x=i({name:j,inheritAttrs:!1,props:q,setup(t,{slots:o,attrs:h}){const f=()=>{if(t.avatar)return e(C,{avatarShape:t.avatarShape,avatarSize:t.avatarSize},null)},S=()=>{if(t.title)return e(z,{round:t.round,titleWidth:t.titleWidth},null)},b=n=>{const{rowWidth:a}=t;return a===s&&n===+t.row-1?V:Array.isArray(a)?a[n]:a},k=()=>Array(+t.row).fill("").map((n,a)=>e(O,{key:a,round:t.round,rowWidth:v(b(a))},null)),W=()=>o.template?o.template():e($,null,[f(),e("div",{class:c("content")},[S(),k()])]);return()=>{var n;return t.loading?e("div",g({class:c({animate:t.animate,round:t.round})},h),[W()]):(n=o.default)==null?void 0:n.call(o)}}});const J=d(x);export{J as S};
			
 
				+========
			
 
				+import{b6 as l,d as i,h as e,bg as v,b9 as r,bb as d,bC as _,bc as m,bD as w,bf as u,bj as g,F as $}from"./index-84588ddf.js";const[y,A]=l("skeleton-title"),P={round:Boolean,titleWidth:r};var p=i({name:y,props:P,setup(t){return()=>e("h3",{class:A([{round:t.round}]),style:{width:v(t.titleWidth)}},null)}});const T=d(p);var z=T;const[B,D]=l("skeleton-avatar"),F={avatarSize:r,avatarShape:m("round")};var N=i({name:B,props:F,setup(t){return()=>e("div",{class:D([t.avatarShape]),style:_(t.avatarSize)},null)}});const R=d(N);var C=R;const s="100%",I={round:Boolean,rowWidth:{type:r,default:s}},[L,U]=l("skeleton-paragraph");var E=i({name:L,props:I,setup(t){return()=>e("div",{class:U([{round:t.round}]),style:{width:t.rowWidth}},null)}});const H=d(E);var O=H;const[j,c]=l("skeleton"),V="60%",q={row:w(0),round:Boolean,title:Boolean,titleWidth:r,avatar:Boolean,avatarSize:r,avatarShape:m("round"),loading:u,animate:u,rowWidth:{type:[Number,String,Array],default:s}};var x=i({name:j,inheritAttrs:!1,props:q,setup(t,{slots:o,attrs:h}){const f=()=>{if(t.avatar)return e(C,{avatarShape:t.avatarShape,avatarSize:t.avatarSize},null)},S=()=>{if(t.title)return e(z,{round:t.round,titleWidth:t.titleWidth},null)},b=n=>{const{rowWidth:a}=t;return a===s&&n===+t.row-1?V:Array.isArray(a)?a[n]:a},k=()=>Array(+t.row).fill("").map((n,a)=>e(O,{key:a,round:t.round,rowWidth:v(b(a))},null)),W=()=>o.template?o.template():e($,null,[f(),e("div",{class:c("content")},[S(),k()])]);return()=>{var n;return t.loading?e("div",g({class:c({animate:t.animate,round:t.round})},h),[W()]):(n=o.default)==null?void 0:n.call(o)}}});const J=d(x);export{J as S};
			
 
				+>>>>>>>> ad48312a4218b12b77f39afa7da0b336de34b76c:dist/js/index-a2b90afd.js
			
--- a/dist/js/index-b883572e.js
+++ b/dist/js/index-b883572e.js
--- a/dist/js/index-bd7d1db0.js
+++ b/dist/js/index-bd7d1db0.js
--- a/dist/js/index-ca614e37.js
+++ b/dist/js/index-ca614e37.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-570ca9d3.js
			
 
				+import{d as i,g as l,n as d,bP as e,c,m as r,h as s,at as u}from"./index-88971aef.js";const m="_skeleton_vtlsh_1",f="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:m,detail:f,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});c(()=>{window.appName="colexiu",r.xmlUrl=n.xmlUrl,t.isLoading=!1});const o=async()=>{console.log("渲染完成")};return()=>s("div",{class:a.detail},[s("div",{id:"scrollContainer",class:[a.container,"hideCursor"]},[!t.isLoading&&s(u,{onRendered:o},null)])])}});export{y as default};
			
 
				+========
			
 
				+import{d as i,g as l,n as d,bP as e,c,m as r,h as s,at as u}from"./index-84588ddf.js";const m="_skeleton_vtlsh_1",f="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:m,detail:f,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});c(()=>{window.appName="colexiu",r.xmlUrl=n.xmlUrl,t.isLoading=!1});const o=async()=>{console.log("渲染完成")};return()=>s("div",{class:a.detail},[s("div",{id:"scrollContainer",class:[a.container,"hideCursor"]},[!t.isLoading&&s(u,{onRendered:o},null)])])}});export{y as default};
			
 
				+>>>>>>>> ad48312a4218b12b77f39afa7da0b336de34b76c:dist/js/index-ca614e37.js
			
--- a/dist/js/index-e766fb61.js
+++ b/dist/js/index-e766fb61.js
--- a/dist/js/index-legacy-099f655c.js
+++ b/dist/js/index-legacy-099f655c.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-266bc8f6.js
			
 
				+System.register(["./index-legacy-f3bc4cdc.js"],(function(t,a){"use strict";var r,e,n,l,o,i,s,u,d,p,v,h;return{setters:[t=>{r=t.b6,e=t.d,n=t.h,l=t.bg,o=t.b9,i=t.bb,s=t.bC,u=t.bc,d=t.bD,p=t.bf,v=t.bj,h=t.F}],execute:function(){const[a,c]=r("skeleton-title"),S={round:Boolean,titleWidth:o};var m=e({name:a,props:S,setup:t=>()=>n("h3",{class:c([{round:t.round}]),style:{width:l(t.titleWidth)}},null)}),y=i(m);const[b,w]=r("skeleton-avatar"),W={avatarSize:o,avatarShape:u("round")};var f=e({name:b,props:W,setup:t=>()=>n("div",{class:w([t.avatarShape]),style:s(t.avatarSize)},null)}),g=i(f);const k="100%",z={round:Boolean,rowWidth:{type:o,default:k}},[A,B]=r("skeleton-paragraph");var j=e({name:A,props:z,setup:t=>()=>n("div",{class:B([{round:t.round}]),style:{width:t.rowWidth}},null)}),x=i(j);const[C,D]=r("skeleton"),F={row:d(0),round:Boolean,title:Boolean,titleWidth:o,avatar:Boolean,avatarSize:o,avatarShape:u("round"),loading:p,animate:p,rowWidth:{type:[Number,String,Array],default:k}};var N=e({name:C,inheritAttrs:!1,props:F,setup(t,{slots:a,attrs:r}){const e=()=>{if(t.avatar)return n(g,{avatarShape:t.avatarShape,avatarSize:t.avatarSize},null)},o=()=>{if(t.title)return n(y,{round:t.round,titleWidth:t.titleWidth},null)},i=a=>{const{rowWidth:r}=t;return r===k&&a===+t.row-1?"60%":Array.isArray(r)?r[a]:r};return()=>{var s;return t.loading?n("div",v({class:D({animate:t.animate,round:t.round})},r),[a.template?a.template():n(h,null,[e(),n("div",{class:D("content")},[o(),Array(+t.row).fill("").map(((a,r)=>n(x,{key:r,round:t.round,rowWidth:l(i(r))},null)))])])]):null==(s=a.default)?void 0:s.call(a)}}});t("S",i(N))}}}));
			
 
				+========
			
 
				+System.register(["./index-legacy-89a009a0.js"],(function(t,a){"use strict";var r,e,n,l,o,i,s,u,d,p,v,h;return{setters:[t=>{r=t.b6,e=t.d,n=t.h,l=t.bg,o=t.b9,i=t.bb,s=t.bC,u=t.bc,d=t.bD,p=t.bf,v=t.bj,h=t.F}],execute:function(){const[a,c]=r("skeleton-title"),S={round:Boolean,titleWidth:o};var m=e({name:a,props:S,setup:t=>()=>n("h3",{class:c([{round:t.round}]),style:{width:l(t.titleWidth)}},null)}),y=i(m);const[b,w]=r("skeleton-avatar"),W={avatarSize:o,avatarShape:u("round")};var f=e({name:b,props:W,setup:t=>()=>n("div",{class:w([t.avatarShape]),style:s(t.avatarSize)},null)}),g=i(f);const k="100%",z={round:Boolean,rowWidth:{type:o,default:k}},[A,B]=r("skeleton-paragraph");var j=e({name:A,props:z,setup:t=>()=>n("div",{class:B([{round:t.round}]),style:{width:t.rowWidth}},null)}),x=i(j);const[C,D]=r("skeleton"),F={row:d(0),round:Boolean,title:Boolean,titleWidth:o,avatar:Boolean,avatarSize:o,avatarShape:u("round"),loading:p,animate:p,rowWidth:{type:[Number,String,Array],default:k}};var N=e({name:C,inheritAttrs:!1,props:F,setup(t,{slots:a,attrs:r}){const e=()=>{if(t.avatar)return n(g,{avatarShape:t.avatarShape,avatarSize:t.avatarSize},null)},o=()=>{if(t.title)return n(y,{round:t.round,titleWidth:t.titleWidth},null)},i=a=>{const{rowWidth:r}=t;return r===k&&a===+t.row-1?"60%":Array.isArray(r)?r[a]:r};return()=>{var s;return t.loading?n("div",v({class:D({animate:t.animate,round:t.round})},r),[a.template?a.template():n(h,null,[e(),n("div",{class:D("content")},[o(),Array(+t.row).fill("").map(((a,r)=>n(x,{key:r,round:t.round,rowWidth:l(i(r))},null)))])])]):null==(s=a.default)?void 0:s.call(a)}}});t("S",i(N))}}}));
			
 
				+>>>>>>>> ad48312a4218b12b77f39afa7da0b336de34b76c:dist/js/index-legacy-099f655c.js
			
--- a/dist/js/index-legacy-0de56cf5.js
+++ b/dist/js/index-legacy-0de56cf5.js
--- a/dist/js/index-legacy-1d656b57.js
+++ b/dist/js/index-legacy-1d656b57.js
--- a/dist/js/index-legacy-21320314.js
+++ b/dist/js/index-legacy-21320314.js
--- a/dist/js/index-legacy-266bc8f6.js
+++ b/dist/js/index-legacy-266bc8f6.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-266bc8f6.js
			
 
				 System.register(["./index-legacy-f3bc4cdc.js"],(function(t,a){"use strict";var r,e,n,l,o,i,s,u,d,p,v,h;return{setters:[t=>{r=t.b6,e=t.d,n=t.h,l=t.bg,o=t.b9,i=t.bb,s=t.bC,u=t.bc,d=t.bD,p=t.bf,v=t.bj,h=t.F}],execute:function(){const[a,c]=r("skeleton-title"),S={round:Boolean,titleWidth:o};var m=e({name:a,props:S,setup:t=>()=>n("h3",{class:c([{round:t.round}]),style:{width:l(t.titleWidth)}},null)}),y=i(m);const[b,w]=r("skeleton-avatar"),W={avatarSize:o,avatarShape:u("round")};var f=e({name:b,props:W,setup:t=>()=>n("div",{class:w([t.avatarShape]),style:s(t.avatarSize)},null)}),g=i(f);const k="100%",z={round:Boolean,rowWidth:{type:o,default:k}},[A,B]=r("skeleton-paragraph");var j=e({name:A,props:z,setup:t=>()=>n("div",{class:B([{round:t.round}]),style:{width:t.rowWidth}},null)}),x=i(j);const[C,D]=r("skeleton"),F={row:d(0),round:Boolean,title:Boolean,titleWidth:o,avatar:Boolean,avatarSize:o,avatarShape:u("round"),loading:p,animate:p,rowWidth:{type:[Number,String,Array],default:k}};var N=e({name:C,inheritAttrs:!1,props:F,setup(t,{slots:a,attrs:r}){const e=()=>{if(t.avatar)return n(g,{avatarShape:t.avatarShape,avatarSize:t.avatarSize},null)},o=()=>{if(t.title)return n(y,{round:t.round,titleWidth:t.titleWidth},null)},i=a=>{const{rowWidth:r}=t;return r===k&&a===+t.row-1?"60%":Array.isArray(r)?r[a]:r};return()=>{var s;return t.loading?n("div",v({class:D({animate:t.animate,round:t.round})},r),[a.template?a.template():n(h,null,[e(),n("div",{class:D("content")},[o(),Array(+t.row).fill("").map(((a,r)=>n(x,{key:r,round:t.round,rowWidth:l(i(r))},null)))])])]):null==(s=a.default)?void 0:s.call(a)}}});t("S",i(N))}}}));
			
 
				+========
			
 
				+System.register(["./index-legacy-89a009a0.js"],(function(t,a){"use strict";var r,e,n,l,o,i,s,u,d,p,v,h;return{setters:[t=>{r=t.b6,e=t.d,n=t.h,l=t.bg,o=t.b9,i=t.bb,s=t.bC,u=t.bc,d=t.bD,p=t.bf,v=t.bj,h=t.F}],execute:function(){const[a,c]=r("skeleton-title"),S={round:Boolean,titleWidth:o};var m=e({name:a,props:S,setup:t=>()=>n("h3",{class:c([{round:t.round}]),style:{width:l(t.titleWidth)}},null)}),y=i(m);const[b,w]=r("skeleton-avatar"),W={avatarSize:o,avatarShape:u("round")};var f=e({name:b,props:W,setup:t=>()=>n("div",{class:w([t.avatarShape]),style:s(t.avatarSize)},null)}),g=i(f);const k="100%",z={round:Boolean,rowWidth:{type:o,default:k}},[A,B]=r("skeleton-paragraph");var j=e({name:A,props:z,setup:t=>()=>n("div",{class:B([{round:t.round}]),style:{width:t.rowWidth}},null)}),x=i(j);const[C,D]=r("skeleton"),F={row:d(0),round:Boolean,title:Boolean,titleWidth:o,avatar:Boolean,avatarSize:o,avatarShape:u("round"),loading:p,animate:p,rowWidth:{type:[Number,String,Array],default:k}};var N=e({name:C,inheritAttrs:!1,props:F,setup(t,{slots:a,attrs:r}){const e=()=>{if(t.avatar)return n(g,{avatarShape:t.avatarShape,avatarSize:t.avatarSize},null)},o=()=>{if(t.title)return n(y,{round:t.round,titleWidth:t.titleWidth},null)},i=a=>{const{rowWidth:r}=t;return r===k&&a===+t.row-1?"60%":Array.isArray(r)?r[a]:r};return()=>{var s;return t.loading?n("div",v({class:D({animate:t.animate,round:t.round})},r),[a.template?a.template():n(h,null,[e(),n("div",{class:D("content")},[o(),Array(+t.row).fill("").map(((a,r)=>n(x,{key:r,round:t.round,rowWidth:l(i(r))},null)))])])]):null==(s=a.default)?void 0:s.call(a)}}});t("S",i(N))}}}));
			
 
				+>>>>>>>> ad48312a4218b12b77f39afa7da0b336de34b76c:dist/js/index-legacy-099f655c.js
			
--- a/dist/js/index-legacy-281577ba.js
+++ b/dist/js/index-legacy-281577ba.js
--- a/dist/js/index-legacy-3dbcdd89.js
+++ b/dist/js/index-legacy-3dbcdd89.js
--- a/dist/js/index-legacy-659280be.js
+++ b/dist/js/index-legacy-659280be.js
@@ -1 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-659280be.js
			
 
				 System.register(["./index-legacy-f3bc4cdc.js"],(function(e,t){"use strict";var i,n,a,o,r,s,d,l,c=document.createElement("style");return c.textContent="._skeleton_vtlsh_1{position:fixed;left:0;top:0;width:100vw;height:100vh;padding:.53333rem .8rem;background-color:#fff;z-index:1000;--van-skeleton-paragraph-height: .8rem}._detail_vtlsh_12{width:100vw;height:100vh;overflow:hidden;overflow-y:auto;--header-height: 1.65333rem;background:var(--container-background)}._detail_vtlsh_12 ._container_vtlsh_20{margin:0 .26667rem;border-radius:.26667rem}._detail_vtlsh_12 #musicAndSelection{overflow:initial!important;height:initial!important;max-height:initial!important}\n",document.head.appendChild(c),{setters:[e=>{i=e.d,n=e.g,a=e.n,o=e.bP,r=e.c,s=e.m,d=e.h,l=e.at}],execute:function(){const t="_detail_vtlsh_12",c="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),i=a({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:o.staff,base64:""},{state:!1,name:"首调",type:o.firstTone,base64:""},{state:!1,name:"固定调",type:o.fixedTone,base64:""}]});r((()=>{window.appName="colexiu",s.xmlUrl=e.xmlUrl,i.isLoading=!1}));const h=async()=>{console.log("渲染完成")};return()=>d("div",{class:t},[d("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&d(l,{onRendered:h},null)])])}}))}}}));
			
 
				+========
			
 
				+System.register(["./index-legacy-89a009a0.js"],(function(e,t){"use strict";var i,n,a,o,r,s,d,l,c=document.createElement("style");return c.textContent="._skeleton_vtlsh_1{position:fixed;left:0;top:0;width:100vw;height:100vh;padding:.53333rem .8rem;background-color:#fff;z-index:1000;--van-skeleton-paragraph-height: .8rem}._detail_vtlsh_12{width:100vw;height:100vh;overflow:hidden;overflow-y:auto;--header-height: 1.65333rem;background:var(--container-background)}._detail_vtlsh_12 ._container_vtlsh_20{margin:0 .26667rem;border-radius:.26667rem}._detail_vtlsh_12 #musicAndSelection{overflow:initial!important;height:initial!important;max-height:initial!important}\n",document.head.appendChild(c),{setters:[e=>{i=e.d,n=e.g,a=e.n,o=e.bP,r=e.c,s=e.m,d=e.h,l=e.at}],execute:function(){const t="_detail_vtlsh_12",c="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),i=a({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:o.staff,base64:""},{state:!1,name:"首调",type:o.firstTone,base64:""},{state:!1,name:"固定调",type:o.fixedTone,base64:""}]});r((()=>{window.appName="colexiu",s.xmlUrl=e.xmlUrl,i.isLoading=!1}));const h=async()=>{console.log("渲染完成")};return()=>d("div",{class:t},[d("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&d(l,{onRendered:h},null)])])}}))}}}));
			
 
				+>>>>>>>> ad48312a4218b12b77f39afa7da0b336de34b76c:dist/js/index-legacy-cfa001ed.js
			
--- a/dist/js/index-legacy-7f311ce7.js
+++ b/dist/js/index-legacy-7f311ce7.js
--- a/dist/js/index-legacy-89a009a0.js
+++ b/dist/js/index-legacy-89a009a0.js
--- a/dist/js/index-legacy-9efc3160.js
+++ b/dist/js/index-legacy-9efc3160.js
--- a/dist/js/index-legacy-ae8fb885.js
+++ b/dist/js/index-legacy-ae8fb885.js
--- a/dist/js/index-legacy-aef467f9.js
+++ b/dist/js/index-legacy-aef467f9.js
--- a/dist/js/index-legacy-b0b4ec74.js
+++ b/dist/js/index-legacy-b0b4ec74.js
--- a/dist/js/index-legacy-b689f5f4.js
+++ b/dist/js/index-legacy-b689f5f4.js
--- a/dist/js/index-legacy-b955800c.js
+++ b/dist/js/index-legacy-b955800c.js
--- a/dist/js/index-legacy-cfa001ed.js
+++ b/dist/js/index-legacy-cfa001ed.js
@@ -0,0 +1,5 @@
 
				+<<<<<<<< HEAD:dist/js/index-legacy-659280be.js
			
 
				+System.register(["./index-legacy-f3bc4cdc.js"],(function(e,t){"use strict";var i,n,a,o,r,s,d,l,c=document.createElement("style");return c.textContent="._skeleton_vtlsh_1{position:fixed;left:0;top:0;width:100vw;height:100vh;padding:.53333rem .8rem;background-color:#fff;z-index:1000;--van-skeleton-paragraph-height: .8rem}._detail_vtlsh_12{width:100vw;height:100vh;overflow:hidden;overflow-y:auto;--header-height: 1.65333rem;background:var(--container-background)}._detail_vtlsh_12 ._container_vtlsh_20{margin:0 .26667rem;border-radius:.26667rem}._detail_vtlsh_12 #musicAndSelection{overflow:initial!important;height:initial!important;max-height:initial!important}\n",document.head.appendChild(c),{setters:[e=>{i=e.d,n=e.g,a=e.n,o=e.bP,r=e.c,s=e.m,d=e.h,l=e.at}],execute:function(){const t="_detail_vtlsh_12",c="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),i=a({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:o.staff,base64:""},{state:!1,name:"首调",type:o.firstTone,base64:""},{state:!1,name:"固定调",type:o.fixedTone,base64:""}]});r((()=>{window.appName="colexiu",s.xmlUrl=e.xmlUrl,i.isLoading=!1}));const h=async()=>{console.log("渲染完成")};return()=>d("div",{class:t},[d("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&d(l,{onRendered:h},null)])])}}))}}}));
			
 
				+========
			
 
				+System.register(["./index-legacy-89a009a0.js"],(function(e,t){"use strict";var i,n,a,o,r,s,d,l,c=document.createElement("style");return c.textContent="._skeleton_vtlsh_1{position:fixed;left:0;top:0;width:100vw;height:100vh;padding:.53333rem .8rem;background-color:#fff;z-index:1000;--van-skeleton-paragraph-height: .8rem}._detail_vtlsh_12{width:100vw;height:100vh;overflow:hidden;overflow-y:auto;--header-height: 1.65333rem;background:var(--container-background)}._detail_vtlsh_12 ._container_vtlsh_20{margin:0 .26667rem;border-radius:.26667rem}._detail_vtlsh_12 #musicAndSelection{overflow:initial!important;height:initial!important;max-height:initial!important}\n",document.head.appendChild(c),{setters:[e=>{i=e.d,n=e.g,a=e.n,o=e.bP,r=e.c,s=e.m,d=e.h,l=e.at}],execute:function(){const t="_detail_vtlsh_12",c="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),i=a({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:o.staff,base64:""},{state:!1,name:"首调",type:o.firstTone,base64:""},{state:!1,name:"固定调",type:o.fixedTone,base64:""}]});r((()=>{window.appName="colexiu",s.xmlUrl=e.xmlUrl,i.isLoading=!1}));const h=async()=>{console.log("渲染完成")};return()=>d("div",{class:t},[d("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&d(l,{onRendered:h},null)])])}}))}}}));
			
 
				+>>>>>>>> ad48312a4218b12b77f39afa7da0b336de34b76c:dist/js/index-legacy-cfa001ed.js
			
--- a/dist/js/instrument-a993c374.js
+++ b/dist/js/instrument-a993c374.js
--- a/dist/js/instrument-c9dd3e10.js
+++ b/dist/js/instrument-c9dd3e10.js
--- a/dist/js/instrument-legacy-5ae60624.js
+++ b/dist/js/instrument-legacy-5ae60624.js
--- a/dist/js/instrument-legacy-c09ddd9f.js
+++ b/dist/js/instrument-legacy-c09ddd9f.js
--- a/dist/js/modeView-16c7d7e0.js
+++ b/dist/js/modeView-16c7d7e0.js
--- a/dist/js/modeView-3192cfe6.js
+++ b/dist/js/modeView-3192cfe6.js
--- a/dist/js/modeView-legacy-54057af4.js
+++ b/dist/js/modeView-legacy-54057af4.js
--- a/dist/js/modeView-legacy-e1299989.js
+++ b/dist/js/modeView-legacy-e1299989.js
--- a/dist/js/orchestra-80468720.js
+++ b/dist/js/orchestra-80468720.js
--- a/dist/js/orchestra-c0edceb2.js
+++ b/dist/js/orchestra-c0edceb2.js
--- a/dist/js/orchestra-legacy-4b41b154.js
+++ b/dist/js/orchestra-legacy-4b41b154.js
--- a/dist/js/orchestra-legacy-95d50d5d.js
+++ b/dist/js/orchestra-legacy-95d50d5d.js
--- a/dist/js/polyfills-fda21288.js
+++ b/dist/js/polyfills-fda21288.js
--- a/dist/js/report-share-04161b62.js
+++ b/dist/js/report-share-04161b62.js
--- a/dist/js/report-share-b0b4a610.js
+++ b/dist/js/report-share-b0b4a610.js
--- a/dist/js/report-share-legacy-276fb9cd.js
+++ b/dist/js/report-share-legacy-276fb9cd.js
--- a/dist/js/report-share-legacy-38fc6a11.js
+++ b/dist/js/report-share-legacy-38fc6a11.js
--- a/dist/orchestra.html
+++ b/dist/orchestra.html
@@ -2,7 +2,7 @@
 
				 <html lang="en">
			
 
				 
			
 
				 <head>
			
 
				-  <script type="module" crossorigin src="./js/polyfills-2e400f59.js"></script>
			
 
				+  <script type="module" crossorigin src="./js/polyfills-fda21288.js"></script>
			
 
				 
			
 
				   <meta charset="UTF-8" />
			
 
				   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
			
@@ -41,6 +41,7 @@
 
				       transition: opacity .3s;
			
 
				     }
			
 
				   </style>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/orchestra-c0edceb2.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-88971aef.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-317fec7e.js">
			
@@ -48,6 +49,15 @@
 
				   <link rel="modulepreload" crossorigin href="./js/index-39ec12c3.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-890e40da.js">
			
 
				   <link rel="stylesheet" href="./css/index-f2089c1c.css">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/orchestra-80468720.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-84588ddf.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-75b08da5.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-5320fd21.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-5a1d7ebf.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-a2b90afd.js">
			
 
				+  <link rel="stylesheet" href="./css/index-3642c4ba.css">
			
 
				+>>>>>>> ad48312a4218b12b77f39afa7da0b336de34b76c
			
 
				   <link rel="stylesheet" href="./css/index-85f95688.css">
			
 
				   <link rel="stylesheet" href="./css/orchestra-8bc1a9c0.css">
			
 
				   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
			
@@ -71,7 +81,11 @@
 
				   
			
 
				   <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>
			
 
				   <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-241ca397.js"></script>
			
 
				+<<<<<<< HEAD
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/orchestra-legacy-4b41b154.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/orchestra-legacy-95d50d5d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> ad48312a4218b12b77f39afa7da0b336de34b76c
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/dist/report-share.html
+++ b/dist/report-share.html
@@ -2,7 +2,7 @@
 
				 <html lang="en">
			
 
				 
			
 
				 <head>
			
 
				-  <script type="module" crossorigin src="./js/polyfills-2e400f59.js"></script>
			
 
				+  <script type="module" crossorigin src="./js/polyfills-fda21288.js"></script>
			
 
				 
			
 
				   <meta charset="UTF-8" />
			
 
				   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
			
@@ -25,11 +25,19 @@
 
				       transition: opacity .3s;
			
 
				     }
			
 
				   </style>
			
 
				+<<<<<<< HEAD
			
 
				   <script type="module" crossorigin src="./js/report-share-b0b4a610.js"></script>
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-88971aef.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
			
 
				   <link rel="modulepreload" crossorigin href="./js/index-890e40da.js">
			
 
				   <link rel="stylesheet" href="./css/index-f2089c1c.css">
			
 
				+=======
			
 
				+  <script type="module" crossorigin src="./js/report-share-04161b62.js"></script>
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-84588ddf.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
			
 
				+  <link rel="modulepreload" crossorigin href="./js/index-a2b90afd.js">
			
 
				+  <link rel="stylesheet" href="./css/index-3642c4ba.css">
			
 
				+>>>>>>> ad48312a4218b12b77f39afa7da0b336de34b76c
			
 
				   <link rel="stylesheet" href="./css/plyr-ad8ef5ae.css">
			
 
				   <link rel="stylesheet" href="./css/report-share-0f4c3151.css">
			
 
				   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
			
@@ -53,7 +61,11 @@
 
				   
			
 
				   <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>
			
 
				   <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-241ca397.js"></script>
			
 
				+<<<<<<< HEAD
			
 
				   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/report-share-legacy-38fc6a11.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+=======
			
 
				+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/report-share-legacy-276fb9cd.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
			
 
				+>>>>>>> ad48312a4218b12b77f39afa7da0b336de34b76c
			
 
				 </body>
			
 
				 
			
 
				 </html>
			
--- a/src/page-instrument/api.ts
+++ b/src/page-instrument/api.ts
@@ -64,6 +64,15 @@ export const api_musicSheetPage = (data: any) => {
 
				   });
			
 
				 };
			
 
				 
			
 
				+/** 获取教程和年级  */
			
 
				+export const api_musicTagTree = () => {
			
 
				+  return request.get("/musicTag/tree");
			
 
				+};
			
 
				+/** 获取标签  */
			
 
				+export const api_musicSheetTag = () => {
			
 
				+  return request.get("/musicSheetTag/queryList");
			
 
				+};
			
 
				+
			
 
				 /**
			
 
				  * 获取声部列表
			
 
				  */
			
--- a/src/page-instrument/component/the-music-list/filterList.tsx
+++ b/src/page-instrument/component/the-music-list/filterList.tsx
@@ -0,0 +1,282 @@
 
				+import { defineComponent, PropType, computed, ref, nextTick, reactive } from "vue";
			
 
				+import { api_musicTagTree, api_musicSheetTag, api_subjectList } from "../../api";
			
 
				+import { Popover } from "vant"
			
 
				+import styles from "./index.module.less";
			
 
				+import headImg from "./imgs/headImg.png"
			
 
				+import quedingImg from "./imgs/queding.png"
			
 
				+import quxiaoImg from "./imgs/quxiao.png"
			
 
				+import zhankaiImg from "./imgs/zhankai.png"
			
 
				+import shouqiImg from "./imgs/shouqi.png"
			
 
				+import sjImg from "./imgs/sj.png"
			
 
				+import closeImg from "../../header-top/image/closeImg.png"
			
 
				+import state, { IPlatform } from "/src/state";
			
 
				+import { getQuery } from "/src/utils/queryString";
			
 
				+
			
 
				+export default defineComponent({
			
 
				+	name: "filterList",
			
 
				+    emits: ["close", "handleConfirm"],
			
 
				+	setup(props, { emit }) {
			
 
				+        const query: any = getQuery();
			
 
				+        const queryObj = reactive({
			
 
				+            audioPlayTypes:"",
			
 
				+            sheetTag:"",
			
 
				+            course:"",
			
 
				+            grade:"",
			
 
				+            subject: {
			
 
				+                name: "",
			
 
				+                id: ""
			
 
				+            }
			
 
				+        })
			
 
				+        function handleRefresh(){
			
 
				+            queryObj.audioPlayTypes = ""
			
 
				+            queryObj.sheetTag = ""
			
 
				+            queryObj.course = ""
			
 
				+            queryObj.grade = ""
			
 
				+            queryObj.subject = {
			
 
				+                name: "",
			
 
				+                id: ""
			
 
				+            }
			
 
				+            handleSubjectOne()
			
 
				+        }
			
 
				+        function handleConfirm() {
			
 
				+            emit("handleConfirm",{
			
 
				+                audioPlayTypes:  queryObj.audioPlayTypes ? queryObj.audioPlayTypes.split(",") : [],
			
 
				+                musicTutorialIds: queryObj.grade ? queryObj.grade : queryObj.course,
			
 
				+                musicTagIds: queryObj.sheetTag,
			
 
				+                musicalInstrumentId: queryObj.subject.id
			
 
				+            })
			
 
				+        }
			
 
				+        // 场景
			
 
				+        const audioPlayTypesOption = [
			
 
				+            { text: '全部', value: "" },
			
 
				+            { text: '演奏', value: "PLAY" },
			
 
				+            { text: '演唱', value: "SING" },
			
 
				+            { text: '演奏+演唱', value: "PLAY,SING" },
			
 
				+        ]
			
 
				+        function handleSelAudioPlayTypes(item:any){
			
 
				+            queryObj.audioPlayTypes = item.value
			
 
				+        }
			
 
				+        // 获取标签
			
 
				+        getMusicSheetTag()
			
 
				+        const sheetTagObj = ref<any[]>([])
			
 
				+        function getMusicSheetTag(){
			
 
				+            api_musicSheetTag().then(res=>{
			
 
				+                if(res.code === 200){
			
 
				+                    sheetTagObj.value = [{ name:"全部",id:""},...res.data]
			
 
				+                }
			
 
				+            })
			
 
				+        }
			
 
				+        function handleSelSheetTag(item:any){
			
 
				+            queryObj.sheetTag = item.id
			
 
				+        }
			
 
				+        // 获取教程和年级
			
 
				+        getMusicTagTree()
			
 
				+        const courseObj = ref<any[]>([])
			
 
				+        const gradeObj = ref<any[]>([])
			
 
				+        function getMusicTagTree(){
			
 
				+            api_musicTagTree().then(res=>{
			
 
				+                if(res.code === 200){
			
 
				+                    courseObj.value = [{ name:"全部",id:""},...res.data]
			
 
				+                }
			
 
				+            })
			
 
				+        }
			
 
				+        const isExpand = ref(false)
			
 
				+        const computedCourseObj = computed(()=>{
			
 
				+            return isExpand.value ? courseObj.value : courseObj.value.slice(0,5)
			
 
				+        })
			
 
				+        const courseDom = ref<HTMLDivElement>()
			
 
				+        const borderBoxConDom = ref<HTMLDivElement>()
			
 
				+        function handleExpand(){
			
 
				+            isExpand.value = true
			
 
				+            nextTick(()=>{
			
 
				+                const childRect = courseDom.value!.getBoundingClientRect();
			
 
				+                const parentRect = borderBoxConDom.value!.getBoundingClientRect();
			
 
				+                const offsetTop = borderBoxConDom.value!.scrollTop + childRect.top - parentRect.top
			
 
				+                borderBoxConDom.value!.scrollTo({
			
 
				+                    top: offsetTop,
			
 
				+                    behavior: 'smooth'
			
 
				+                });
			
 
				+            })
			
 
				+        }
			
 
				+        function handleSelCourse(item:any){
			
 
				+            queryObj.course = item.id
			
 
				+            queryObj.grade = ""
			
 
				+            gradeObj.value = [{ name:"全部", id:""}, ...(item.children || [])]
			
 
				+        }
			
 
				+        function handleSelGrade(item:any){
			
 
				+            queryObj.grade = item.id
			
 
				+        }
			
 
				+        // 获取乐器 
			
 
				+        state.platform === IPlatform.PC && getSubjectList() // 老师端才加载乐器
			
 
				+        const subjectList = ref<any[]>([])
			
 
				+        function getSubjectList(){
			
 
				+            api_subjectList({}).then(res => {
			
 
				+                if(res.code === 200){
			
 
				+                    subjectList.value = [...res.data.map((item:any)=>{
			
 
				+                        return item.instruments.length > 1 ? Object.assign(item,{ isExpand: ref(false) }) : item
			
 
				+                    })]
			
 
				+                    // 赋默认值
			
 
				+                    handleSubjectOne()
			
 
				+                }
			
 
				+            })
			
 
				+        }
			
 
				+        function handleSubjectOne(){
			
 
				+            if(subjectList.value.length > 0){
			
 
				+                const instruments = subjectList.value.reduce((arr, item) => {
			
 
				+                    arr.push(...item.instruments)
			
 
				+                    return arr
			
 
				+                }, [])
			
 
				+                const instrumentId = query.instrumentId
			
 
				+                // 有id 就用id，没有就默认第一个
			
 
				+                const instrumentObj = instrumentId ? instruments.find((i: any) => {
			
 
				+                    return i.id === instrumentId
			
 
				+                }) : instruments[0]
			
 
				+                if(instrumentObj){
			
 
				+                    queryObj.subject.id = instrumentObj.id
			
 
				+                    queryObj.subject.name = instrumentObj.name
			
 
				+                }
			
 
				+            }
			
 
				+        }
			
 
				+        function isActiveSubjectPop(item:any) {
			
 
				+            return item.instruments.some((i:any) => {
			
 
				+                return i.id === queryObj.subject.id
			
 
				+            })
			
 
				+        }
			
 
				+        function handleSelectPop(item: any) {
			
 
				+            queryObj.subject.id = item.id
			
 
				+            queryObj.subject.name = item.name
			
 
				+        }
			
 
				+		return () => (
			
 
				+			<div class={[styles.filterList, styles[state.modeType], state.platform === IPlatform.PC && styles.isPc]}>
			
 
				+                <div class={[styles.head, "top_draging"]}>
			
 
				+                    <img class={styles.headTit} src={headImg} />
			
 
				+				</div>
			
 
				+                <img class={styles.closeImg} src={closeImg} onClick={()=>{ emit("close") }} />
			
 
				+				<div class={styles.borderCon}>
			
 
				+                    <div class={styles.borderBox}>
			
 
				+                        <div ref={borderBoxConDom} class={styles.borderBoxCon}>
			
 
				+                            {
			
 
				+                                sheetTagObj.value.length > 1 &&
			
 
				+                                    <>
			
 
				+                                        <div class={styles.titCon}>
			
 
				+                                            标签
			
 
				+                                        </div>
			
 
				+                                        <div class={styles.filterCon}>
			
 
				+                                            {
			
 
				+                                                sheetTagObj.value.map(item => {
			
 
				+                                                    return <div class={[styles.tabBox, queryObj.sheetTag === item.id && styles.tabActive]} onClick={() => { handleSelSheetTag(item) }}>{item.name}</div>
			
 
				+                                                })
			
 
				+                                            }
			
 
				+                                        </div>  
			
 
				+                                    </>
			
 
				+                            }                      
			
 
				+                            <div class={styles.titCon}>
			
 
				+                                场景
			
 
				+                            </div>
			
 
				+                            <div class={styles.filterCon}>
			
 
				+                                {
			
 
				+                                    audioPlayTypesOption.map(item => {
			
 
				+                                        return <div class={[styles.tabBox, queryObj.audioPlayTypes === item.value && styles.tabActive]} onClick={() => { handleSelAudioPlayTypes(item) }}>{item.text}</div>
			
 
				+                                    })
			
 
				+                                }
			
 
				+                            </div>
			
 
				+                            {
			
 
				+                                courseObj.value.length>1 &&
			
 
				+                                    <>
			
 
				+                                        <div ref={courseDom} class={styles.titCon}>
			
 
				+                                            教程
			
 
				+                                            {
			
 
				+                                                isExpand.value &&                          
			
 
				+                                                    <div class={styles.shouqiImg} onClick={() => {isExpand.value = false}}>
			
 
				+                                                        收起
			
 
				+                                                        <img src={shouqiImg} />
			
 
				+                                                    </div>
			
 
				+                                            }
			
 
				+                                        </div>
			
 
				+                                        <div class={[styles.filterCon, styles.courseType]}>
			
 
				+                                            {
			
 
				+                                                computedCourseObj.value.map(item => {
			
 
				+                                                    return <div class={[styles.tabBox, queryObj.course === item.id && styles.tabActive]} onClick={() => { handleSelCourse(item) }}>{item.name}</div>
			
 
				+                                                })
			
 
				+                                            }
			
 
				+                                            {
			
 
				+                                                !isExpand.value && 
			
 
				+                                                    <div class={[styles.tabBox, styles.zhankaiImg]} onClick={handleExpand}>
			
 
				+                                                        查看更多
			
 
				+                                                        <img src={zhankaiImg} />
			
 
				+                                                    </div>
			
 
				+                                            }
			
 
				+                                        </div> 
			
 
				+                                    </>
			
 
				+                            }
			
 
				+                            {
			
 
				+                                gradeObj.value.length > 1 &&
			
 
				+                                    <>
			
 
				+                                        <div class={styles.titCon}>
			
 
				+                                            年级
			
 
				+                                        </div>
			
 
				+                                        <div class={styles.filterCon}>
			
 
				+                                            {
			
 
				+                                                gradeObj.value.map(item => {
			
 
				+                                                    return <div class={[styles.tabBox, queryObj.grade === item.id && styles.tabActive]} onClick={() => { handleSelGrade(item) }}>{item.name}</div>
			
 
				+                                                })
			
 
				+                                            }
			
 
				+                                        </div>  
			
 
				+                                    </>
			
 
				+                            }   
			
 
				+                            {
			
 
				+                                subjectList.value.length>1 && queryObj.audioPlayTypes!=='SING' &&
			
 
				+                                    <>
			
 
				+                                        <div class={styles.titCon}>
			
 
				+                                            乐器
			
 
				+                                        </div>
			
 
				+                                        <div class={styles.filterCon}>
			
 
				+                                            {
			
 
				+                                                subjectList.value.map(item => {
			
 
				+                                                    return item.instruments.length > 1 ? 
			
 
				+                                                        <Popover
			
 
				+                                                            v-model:show={item.isExpand}
			
 
				+                                                            trigger="click"
			
 
				+                                                            class={styles.subjectPopover}
			
 
				+                                                        >
			
 
				+                                                            {{
			
 
				+                                                                default: () => (
			
 
				+                                                                    <div class={styles.tabPopoverBox}>
			
 
				+                                                                        {
			
 
				+                                                                            item.instruments.map((row: any) => {
			
 
				+                                                                                return <div class={[styles.tabPopover, queryObj.subject.id === row.id && styles.active]} onClick={() => { 
			
 
				+                                                                                    item.isExpand = false
			
 
				+                                                                                    handleSelectPop(row) 
			
 
				+                                                                                }}>{row.name}</div>
			
 
				+                                                                            })
			
 
				+                                                                        }
			
 
				+                                                                    </div>
			
 
				+                                                                ),                                                                
			
 
				+                                                                reference: () => (
			
 
				+                                                                    <div class={[styles.tabBox, styles.tabBoxPopCon, isActiveSubjectPop(item) && styles.tabActive]}>
			
 
				+                                                                        <div class={[styles.tabBoxPop, item.isExpand && styles.actTabBoxPop]}>
			
 
				+                                                                            <div>{isActiveSubjectPop(item)?queryObj.subject.name:item.name}</div>
			
 
				+                                                                            <img class={styles.sjImg} src={sjImg} />
			
 
				+                                                                        </div>
			
 
				+                                                                    </div>
			
 
				+                                                                )
			
 
				+                                                            }}
			
 
				+                                                        </Popover> 
			
 
				+                                                        : 
			
 
				+                                                        <div class={[styles.tabBox, queryObj.subject.id === item.instruments[0].id && styles.tabActive]} onClick={() => { handleSelectPop(item.instruments[0]) }}>{item.name}</div>
			
 
				+                                                })
			
 
				+                                            }
			
 
				+                                        </div>   
			
 
				+                                    </>
			
 
				+                            }
			
 
				+                        </div>
			
 
				+                    </div>
			
 
				+				</div>
			
 
				+                <div class={styles.btnCon}>
			
 
				+                    <img src={quxiaoImg} onClick={handleRefresh} />
			
 
				+                    <img src={quedingImg} onClick={handleConfirm} />
			
 
				+                </div>
			
 
				+			</div>
			
 
				+		);
			
 
				+	},
			
 
				+});
			
--- a/src/page-instrument/component/the-music-list/imgs/headImg.png
+++ b/src/page-instrument/component/the-music-list/imgs/headImg.png
--- a/src/page-instrument/component/the-music-list/imgs/queding.png
+++ b/src/page-instrument/component/the-music-list/imgs/queding.png
--- a/src/page-instrument/component/the-music-list/imgs/quxiao.png
+++ b/src/page-instrument/component/the-music-list/imgs/quxiao.png
--- a/src/page-instrument/component/the-music-list/imgs/shouqi.png
+++ b/src/page-instrument/component/the-music-list/imgs/shouqi.png
--- a/src/page-instrument/component/the-music-list/imgs/sj.png
+++ b/src/page-instrument/component/the-music-list/imgs/sj.png
--- a/src/page-instrument/component/the-music-list/imgs/xiang.png
+++ b/src/page-instrument/component/the-music-list/imgs/xiang.png
--- a/src/page-instrument/component/the-music-list/imgs/zhankai.png
+++ b/src/page-instrument/component/the-music-list/imgs/zhankai.png
--- a/src/page-instrument/component/the-music-list/index.module.less
+++ b/src/page-instrument/component/the-music-list/index.module.less
@@ -78,6 +78,17 @@
 
				             }
			
 
				         }
			
 
				     }
			
 
				+    &.isPc{
			
 
				+        padding: 20px 0;
			
 
				+        :global{
			
 
				+            .van-tabs__wrap{
			
 
				+                display: none !important;
			
 
				+            }
			
 
				+            .van-tabs__content{
			
 
				+                height: 100% !important;
			
 
				+            }
			
 
				+        }
			
 
				+    }
			
 
				 }
			
 
				 
			
 
				 .wrap {
			
@@ -139,70 +150,23 @@
 
				         .dropdownMenu{
			
 
				             border-right: 1px solid #DADCE5;
			
 
				             margin-right: 8px;
			
 
				-            :global{
			
 
				-                .van-dropdown-menu__bar{
			
 
				-                    height: 20px;
			
 
				-                    background: transparent;
			
 
				-                    box-shadow: initial;
			
 
				-                    .van-dropdown-menu__item{
			
 
				-                        padding: 0 8px 0 0;
			
 
				-                    }
			
 
				-                    .van-dropdown-menu__title{
			
 
				-                        --van-gray-4: #0CA2EA;
			
 
				-                        font-weight: 400;
			
 
				-                        font-size: 14px;
			
 
				-                        color: #0CA2EA;
			
 
				-                        padding: 0 12px 0 0;
			
 
				-                        &::after{
			
 
				-                            right: 0;
			
 
				-                            opacity: initial;
			
 
				-                        }
			
 
				-                    }
			
 
				-                }
			
 
				-                .van-dropdown-item.van-dropdown-item--down{
			
 
				-                    left: 36px;
			
 
				-                    width: 148px;
			
 
				-                    margin-top: 7px;
			
 
				-                    .van-dropdown-item__content{
			
 
				-                        margin-left: 10px;
			
 
				-                        padding: 0 10px;
			
 
				-                        width: 128px;
			
 
				-                        box-shadow: 0px 2px 14px 0px rgba(0,0,0,0.12);
			
 
				-                        border-radius: 8px;
			
 
				-                        .van-cell{
			
 
				-                            margin-top: 6px;
			
 
				-                            padding: 0;
			
 
				-                            font-weight: 400;
			
 
				-                            font-size: 14px;
			
 
				-                            color: #323233;
			
 
				-                            line-height: 32px;
			
 
				-                            text-align: center;
			
 
				-                            &::after{
			
 
				-                                border: none;
			
 
				-                            }
			
 
				-                            &:last-child{
			
 
				-                                margin-bottom: 6px;
			
 
				-                            }
			
 
				-                            &.van-dropdown-item__option--active{
			
 
				-                                background: #EEF8FF;
			
 
				-                                border-radius: 4px;
			
 
				-                                color: #1CACF1;
			
 
				-                                font-weight: 500;
			
 
				-                            }
			
 
				-                            .van-cell__value{
			
 
				-                                display: none;
			
 
				-                            }
			
 
				-                        }
			
 
				-                    }
			
 
				-                }
			
 
				+            flex-shrink: 0;
			
 
				+            display: flex;
			
 
				+            align-items: center;
			
 
				+            cursor: pointer;
			
 
				+            &:active{
			
 
				+                opacity: 0.8;
			
 
				             }
			
 
				-            &.currItem{
			
 
				-                :global{
			
 
				-                    .van-dropdown-menu__bar  .van-dropdown-menu__title{
			
 
				-                        color: #1CACF1;
			
 
				-                        --van-gray-4:#1CACF1;
			
 
				-                    }
			
 
				-                }
			
 
				+            &>div{
			
 
				+                font-weight: 400;
			
 
				+                font-size: 14px;
			
 
				+                color: #0CA2EA;
			
 
				+                line-height: 20px;
			
 
				+            }
			
 
				+            &>img{
			
 
				+                margin: 0 6px 0 4px;
			
 
				+                width: 9px;
			
 
				+                height: 5px;
			
 
				             }
			
 
				         }
			
 
				     }
			
@@ -211,6 +175,10 @@
 
				             margin-top: 10px;
			
 
				             height: calc(100% - 44px);
			
 
				             overflow-y: auto;
			
 
				+            &::-webkit-scrollbar {
			
 
				+                width: 0;
			
 
				+                display: none;
			
 
				+            }
			
 
				             .van-loading__circular{
			
 
				                 color: rgba(0,0,0,0.3);
			
 
				             }
			
@@ -326,4 +294,273 @@
 
				         color: rgba(0,0,0,0.46);
			
 
				         margin-top: 10px;
			
 
				     }
			
 
				+}
			
 
				+
			
 
				+
			
 
				+.filterList{
			
 
				+    width: 408px;
			
 
				+    height: 316px;
			
 
				+    background: #B0D8FF;
			
 
				+    box-shadow: inset 0px -2px 3px 0px #6BA5DD;
			
 
				+    border-radius: 20px;
			
 
				+    padding: 10px;
			
 
				+    position: relative;
			
 
				+    &.follow{
			
 
				+        background: #BCE6F1;
			
 
				+        box-shadow: inset 0px -2px 3px 0px #6397A4;
			
 
				+        .borderCon{
			
 
				+            background: #DAEFF5;
			
 
				+            box-shadow: 0px 0px 3px 0px #98C4D0;
			
 
				+            .borderBox{
			
 
				+                border-color: #7CC2E0;
			
 
				+            }
			
 
				+        }
			
 
				+        .btnCon{
			
 
				+            background: linear-gradient( 180deg, rgba(213,232,255,0) 0%, rgba(218,239,245,0.73) 48%, #DAEFF5 100%);
			
 
				+        }
			
 
				+    }
			
 
				+    &.evaluating{
			
 
				+        background: #C4DAFF;
			
 
				+        box-shadow: inset 0px -2px 3px 0px #6F86AD;
			
 
				+        .borderCon{
			
 
				+            background: #D5E2FF;
			
 
				+            box-shadow: 0px 0px 3px 0px #889CBE;
			
 
				+            .borderBox{
			
 
				+                border-color: #91AAF9;
			
 
				+            }
			
 
				+        }
			
 
				+        .btnCon{
			
 
				+            background: linear-gradient( 180deg, rgba(213,232,255,0) 0%, rgba(213,226,255,0.73) 48%, #D5E2FF 100%);
			
 
				+        }
			
 
				+    }
			
 
				+    &.isPc{
			
 
				+        height:initial !important;
			
 
				+        .borderBoxCon{
			
 
				+            height: initial !important;
			
 
				+            max-height: 70vh;
			
 
				+        }
			
 
				+    }
			
 
				+    .head{
			
 
				+        position: absolute;
			
 
				+        top: -11px;
			
 
				+        left: 50%;
			
 
				+        transform: translateX(-50%);
			
 
				+        width: 100%;
			
 
				+        height: 45px;
			
 
				+        display: flex;
			
 
				+        justify-content: center;
			
 
				+        .headTit{
			
 
				+            width: 164px;
			
 
				+            height: 100%;
			
 
				+        }
			
 
				+    }      
			
 
				+    .closeImg{
			
 
				+        position: absolute;
			
 
				+        top: -9px;
			
 
				+        right: -40px;
			
 
				+        width: 32px;
			
 
				+        height: 32px;
			
 
				+        cursor: pointer;
			
 
				+    }
			
 
				+    .borderCon{
			
 
				+        width: 100%;
			
 
				+        height: 100%;
			
 
				+        background: #D5E8FF;
			
 
				+        box-shadow: 0px 0px 3px 0px #639ACF;
			
 
				+        border-radius: 14px;
			
 
				+        padding: 10px;
			
 
				+        .borderBox{
			
 
				+            padding-top: 10px;
			
 
				+            padding-bottom: 1px;
			
 
				+            width: 100%;
			
 
				+            height: 100%;
			
 
				+            border-radius: 10px 14px 14px 10px;
			
 
				+            border: 1px dashed rgb(155,201,246);
			
 
				+            .borderBoxCon{
			
 
				+                padding: 0 10px 50px 10px;
			
 
				+                width: 100%;
			
 
				+                height: 100%;
			
 
				+                overflow-y: auto;
			
 
				+                &::-webkit-scrollbar {
			
 
				+                    width: 0;
			
 
				+                    display: none;
			
 
				+                }
			
 
				+            }
			
 
				+            .titCon{
			
 
				+                position: relative;
			
 
				+                font-weight: 500;
			
 
				+                font-size: 16px;
			
 
				+                color: #333333;
			
 
				+                line-height: 22px;
			
 
				+                padding-left: 12px;
			
 
				+                margin-top: 10px;
			
 
				+                &::before{
			
 
				+                    content: "";
			
 
				+                    position: absolute;
			
 
				+                    top: 50%;
			
 
				+                    transform: translateY(-50%);
			
 
				+                    left: 2px;
			
 
				+                    width: 4px;
			
 
				+                    height: 11px;
			
 
				+                    background: #1CACF1;
			
 
				+                    border-radius: 3px;
			
 
				+                }
			
 
				+                .shouqiImg{
			
 
				+                    position: absolute;
			
 
				+                    display: flex;
			
 
				+                    justify-content: center;
			
 
				+                    align-items: center;
			
 
				+                    font-weight: 400;
			
 
				+                    font-size: 12px;
			
 
				+                    color: #333333;
			
 
				+                    right: 0;
			
 
				+                    top: 50%;
			
 
				+                    transform: translateY(-50%);
			
 
				+                    cursor: pointer;
			
 
				+                    &:active{
			
 
				+                        opacity: 0.8;
			
 
				+                    }
			
 
				+                    >img{
			
 
				+                        margin-left: 2px;
			
 
				+                        width: 11px;
			
 
				+                        height: 10px;
			
 
				+                    }
			
 
				+                }
			
 
				+            }
			
 
				+            .filterCon{
			
 
				+                display: flex;
			
 
				+                flex-wrap: wrap;
			
 
				+                margin-top: 8px;
			
 
				+                margin-left: -10px;
			
 
				+                width: calc(100% + 10px);
			
 
				+                &.courseType{
			
 
				+                    .tabBox{
			
 
				+                        width: calc(50% - 10px);
			
 
				+                        padding: 0 10px;
			
 
				+                    }
			
 
				+                }
			
 
				+                .tabBox{
			
 
				+                    cursor: pointer;
			
 
				+                    width: calc(25% - 10px);
			
 
				+                    height: 32px;
			
 
				+                    margin-bottom: 8px;
			
 
				+                    flex-shrink: 0;
			
 
				+                    margin-left: 10px;
			
 
				+                    background: #F6F6F6;
			
 
				+                    border-radius: 6px;
			
 
				+                    font-weight: 400;
			
 
				+                    font-size: 12px;
			
 
				+                    text-align: center;
			
 
				+                    line-height: 32px;
			
 
				+                    color: #333333;
			
 
				+                    padding: 0 5px;
			
 
				+                    white-space: nowrap;
			
 
				+                    overflow: hidden;
			
 
				+                    text-overflow: ellipsis;
			
 
				+                    &:active{
			
 
				+                        opacity: 0.8;
			
 
				+                    }
			
 
				+                    &.tabActive{
			
 
				+                        background: #EBF8FF;
			
 
				+                        border: 1px solid rgba(28,172,241,0.5);
			
 
				+                        font-weight: 600;
			
 
				+                        color: #1CACF1;
			
 
				+                    }
			
 
				+                    &.zhankaiImg{
			
 
				+                        display: flex;
			
 
				+                        justify-content: center;
			
 
				+                        align-items: center;
			
 
				+                        >img{
			
 
				+                            margin-left: 2px;
			
 
				+                            width: 11px;
			
 
				+                            height: 10px;
			
 
				+                        }
			
 
				+                    }
			
 
				+                    &.tabBoxPopCon{
			
 
				+                        width: 100%;
			
 
				+                        margin-left: 0;
			
 
				+                        margin-bottom: 0;
			
 
				+                        .tabBoxPop{
			
 
				+                            width: 100%;
			
 
				+                            height: 100%;
			
 
				+                            display: flex;
			
 
				+                            justify-content: center;
			
 
				+                            align-items: center;
			
 
				+                            &.actTabBoxPop{
			
 
				+                                .sjImg{
			
 
				+                                    transform: rotate(180deg);
			
 
				+                                }
			
 
				+                            }
			
 
				+                            &>div{
			
 
				+                                white-space: nowrap;
			
 
				+                                overflow: hidden;
			
 
				+                                text-overflow: ellipsis;  
			
 
				+                            }
			
 
				+                            .sjImg{
			
 
				+                                width: 9px;
			
 
				+                                height: 5px;
			
 
				+                                margin-left: 4px;
			
 
				+                            }
			
 
				+                        }
			
 
				+                    }
			
 
				+                }
			
 
				+                :global{
			
 
				+                    .van-popover__wrapper{
			
 
				+                        width: calc(25% - 10px);
			
 
				+                        height: 32px;
			
 
				+                        margin-bottom: 8px;
			
 
				+                        flex-shrink: 0;
			
 
				+                        margin-left: 10px;
			
 
				+                    }
			
 
				+                }
			
 
				+            }
			
 
				+        }
			
 
				+    }
			
 
				+    .btnCon{
			
 
				+        position: absolute;
			
 
				+        left: 24px;
			
 
				+        bottom: 21px;
			
 
				+        padding: 10px 0;
			
 
				+        width: calc(100% - 48px);
			
 
				+        display: flex;
			
 
				+        justify-content: center;
			
 
				+        background: linear-gradient( 180deg, rgba(213,232,255,0) 0%, rgba(213,232,255,0.73) 48%, #D5E8FF 100%);
			
 
				+        border-radius: 0px 0px 10px 10px;
			
 
				+        &>img{
			
 
				+            width: 139px;
			
 
				+            height: 39px;
			
 
				+            cursor: pointer;
			
 
				+            &:active{
			
 
				+                opacity: 0.8;
			
 
				+            }
			
 
				+            &:first-child{
			
 
				+                margin-right: 10px;
			
 
				+            }
			
 
				+        }
			
 
				+    }
			
 
				+}
			
 
				+.tabPopoverBox{
			
 
				+    width: 120px;
			
 
				+    background: #FFFFFF;
			
 
				+    box-shadow: 0px 0px 18px 0px rgba(0,0,0,0.15);
			
 
				+    border-radius: 8px;
			
 
				+    padding: 8px;
			
 
				+    .tabPopover{
			
 
				+        cursor: pointer;
			
 
				+        height: 32px;
			
 
				+        border-radius: 4px;
			
 
				+        font-weight: 400;
			
 
				+        font-size: 14px;
			
 
				+        color: #323233;
			
 
				+        line-height: 32px;
			
 
				+        text-align: center;
			
 
				+        white-space: nowrap;
			
 
				+        overflow: hidden;
			
 
				+        text-overflow: ellipsis;
			
 
				+        &.active{
			
 
				+            background: #EEF8FF;
			
 
				+            color: #1CACF1;
			
 
				+            font-weight: 500;
			
 
				+        }
			
 
				+    }
			
 
				 }
			
--- a/src/page-instrument/component/the-music-list/index.tsx
+++ b/src/page-instrument/component/the-music-list/index.tsx
@@ -9,7 +9,7 @@ import { getQuery } from "/src/utils/queryString";
 
				 
			
 
				 const query: any = getQuery();
			
 
				 export const isMusicList = computed(()=>{
			
 
				-	return !(query.workRecord || query.modelType || state.platform === IPlatform.PC || query.isCbs)
			
 
				+	return !(query.workRecord || query.isCbs)
			
 
				 })
			
 
				 export const musicListShow = ref(false)
			
 
				 export default defineComponent({
			
@@ -18,7 +18,7 @@ export default defineComponent({
 
				 		return () => (
			
 
				 			<>
			
 
				 				<Popup class={styles.popup} position="left" v-model:show={musicListShow.value} round overlay-style={{background:'rgba(0, 0, 0, 0.3)'}}>
			
 
				-					<div class={[styles.tabs, styles[state.modeType]]}>
			
 
				+					<div class={[styles.tabs, styles[state.modeType], state.platform === IPlatform.PC && styles.isPc]}>
			
 
				 						<Tabs>
			
 
				 							<Tab title="其他曲谱">
			
 
				 								<List />
			
--- a/src/page-instrument/component/the-music-list/list.tsx
+++ b/src/page-instrument/component/the-music-list/list.tsx
@@ -1,13 +1,19 @@
 
				-import { defineComponent, onMounted, reactive, watch } from "vue";
			
 
				+import { defineComponent, onMounted, reactive, watch, ref} from "vue";
			
 
				 import styles from "./index.module.less";
			
 
				 import { api_musicSheetPage } from "../../api";
			
 
				-import state, { togglePlay } from "/src/state";
			
 
				-import { List, Image, Field, DropdownMenu, DropdownItem } from "vant";
			
 
				+import state, { togglePlay, IPlatform } from "/src/state";
			
 
				+import { List, Image, Field, DropdownMenu, DropdownItem, Popup } from "vant";
			
 
				 import { postMessage } from "/src/utils/native-message";
			
 
				 import qs from "query-string";
			
 
				 import searImg from "./imgs/searImg.png"
			
 
				 import huoimg from "./imgs/huo.png"
			
 
				 import emptyImg from "./imgs/empty.png"
			
 
				+import xiangImg from "./imgs/xiang.png"
			
 
				+import FilterList from "./filterList"
			
 
				+import { getQuery } from "/src/utils/queryString";
			
 
				+import Dragbom from "/src/view/plugins/useDrag/dragbom";
			
 
				+import { storeData } from "/src/store";
			
 
				+import useDrag from "/src/view/plugins/useDrag/index";
			
 
				 
			
 
				 export default defineComponent({
			
 
				   name: "TheMusicList-list",
			
@@ -18,6 +24,7 @@ export default defineComponent({
 
				     },
			
 
				   },
			
 
				   setup(props) {
			
 
				+    const query: any = getQuery();
			
 
				     const forms = reactive({
			
 
				       name: "",
			
 
				       page: 1,
			
@@ -25,7 +32,10 @@ export default defineComponent({
 
				       musicSheetCategoriesId: state.bizMusicCategoryId,
			
 
				       recentFlag: props.recentFlag ? true : null,
			
 
				       excludeMusicId: props.recentFlag ? null : state.examSongId,
			
 
				-      audioPlayTypes:""
			
 
				+      audioPlayTypes: [],
			
 
				+      musicTutorialIds: "",
			
 
				+      musicTagIds: "",
			
 
				+      musicalInstrumentId: query.instrumentId || ""
			
 
				     });
			
 
				     const data = reactive({
			
 
				       isFocus: false,
			
@@ -34,22 +44,12 @@ export default defineComponent({
 
				       loading: false,
			
 
				       hasNext: true,
			
 
				     });
			
 
				-    const audioPlayTypesOption = [
			
 
				-      { text: '全部场景', value: "" },
			
 
				-      { text: '演奏', value: "PLAY" },
			
 
				-      { text: '演唱', value: "SING" },
			
 
				-      { text: '演奏+演唱', value: "PLAY,SING" },
			
 
				-    ]
			
 
				+    const filterShow = ref(false)
			
 
				     const getList = async () => {
			
 
				       if (!data.hasNext) return;
			
 
				       data.loading = true;
			
 
				       try {
			
 
				-        const res = await api_musicSheetPage({
			
 
				-          ...forms,
			
 
				-          ...{
			
 
				-            audioPlayTypes: forms.audioPlayTypes ? forms.audioPlayTypes.split(",") : []
			
 
				-          }
			
 
				-        });
			
 
				+        const res = await api_musicSheetPage(forms);
			
 
				         if (res?.code === 200 && Array.isArray(res.data?.rows)) {
			
 
				           data.list = [...data.list, ...res.data.rows];
			
 
				         }
			
@@ -91,26 +91,32 @@ export default defineComponent({
 
				           type: "fullscreen",
			
 
				         },
			
 
				       });
			
 
				-      location.href =
			
 
				-        location.origin +
			
 
				-        location.pathname +
			
 
				-        "?" +
			
 
				-        qs.stringify({
			
 
				-          id: item.id,
			
 
				-          _t: Date.now(),
			
 
				-        });
			
 
				+      let href = location.href.replace(/id=\d+/, `id=${item.id}`); // 替换id
			
 
				+      href = href.replace(/instrumentId=\d+/, `instrumentId=${forms.musicalInstrumentId}`); // 替换乐器
			
 
				+      location.href = href
			
 
				+      location.reload()
			
 
				     };
			
 
				     function formatNumber(num:number) {
			
 
				       return num >= 10000 
			
 
				           ? (num / 10000).toFixed(1).replace(/\.0$/, '') + "万" 
			
 
				           : num.toString();
			
 
				     }
			
 
				+    // 拖动
			
 
				+    const parentClassName = "musicListClass_drag";
			
 
				+		const userId = storeData.user?.id ? String(storeData.user?.id) : "";
			
 
				+		const positionInfo =
			
 
				+        state.platform !== IPlatform.PC
			
 
				+        ? {
			
 
				+            styleDrag: { value: null },
			
 
				+          }
			
 
				+        : useDrag([`${parentClassName} .top_draging`, `${parentClassName} .bom_drag`], parentClassName, filterShow, userId);
			
 
				     return () => (
			
 
				       <div class={styles.wrap}>
			
 
				         <div class={[styles.searchBox,data.isFocus && styles.isFocus]}>
			
 
				-          <DropdownMenu class={[styles.dropdownMenu]} overlay={false}>
			
 
				-							<DropdownItem onChange={handleQuery} v-model={forms.audioPlayTypes} options={audioPlayTypesOption}/>
			
 
				-					</DropdownMenu>
			
 
				+          <div class={styles.dropdownMenu} onClick={() => { filterShow.value = true }}>
			
 
				+            <div>筛选</div>
			
 
				+            <img src={xiangImg} />
			
 
				+          </div>
			
 
				           <img src={searImg} />
			
 
				           <Field placeholder="请输入曲目名称" v-model={forms.name} autocomplete="off" onFocus={()=>{ data.isFocus = true }} onBlur={()=>{ data.isFocus = false }} />
			
 
				           <div class={styles.searchBtn} onClick={handleQuery}>搜索</div>
			
@@ -152,6 +158,17 @@ export default defineComponent({
 
				                   <span>暂无内容</span>
			
 
				                 </div>}
			
 
				         </List>
			
 
				+        <Popup  style={positionInfo.styleDrag.value} v-model:show={filterShow.value} class="popup-custom van-scale center-closeBtn musicListClass_drag" transition="van-scale" teleport="body" overlay-style={{ background: "rgba(0, 0, 0, 0.3)" }}>
			
 
				+          <FilterList onClose={() => { filterShow.value = false }} onHandleConfirm={(queryObj) => {
			
 
				+            filterShow.value = false
			
 
				+            forms.audioPlayTypes = queryObj.audioPlayTypes
			
 
				+            forms.musicTutorialIds = queryObj.musicTutorialIds
			
 
				+            forms.musicTagIds = queryObj.musicTagIds
			
 
				+            forms.musicalInstrumentId = queryObj.musicalInstrumentId
			
 
				+            handleQuery()
			
 
				+          }}></FilterList>
			
 
				+          {state.platform === IPlatform.PC && <Dragbom />}
			
 
				+        </Popup>
			
 
				       </div>
			
 
				     );
			
 
				   },
			
--- a/stats.html
+++ b/stats.html