黄琪勇 1 year ago
parent
commit
db374c5216
53 changed files with 10 additions and 147 deletions
  1. 2 20
      dist/colexiu.html
  2. 0 1
      dist/css/index-bf8f1009.css
  3. 0 1
      dist/css/index-c274c34c.css
  4. 2 20
      dist/index.html
  5. 2 17
      dist/instrument.html
  6. 0 0
      dist/js/colexiu-1a8fe7f5.js
  7. 0 0
      dist/js/colexiu-legacy-9147147e.js
  8. 0 0
      dist/js/gym-26ca23e9.js
  9. 0 0
      dist/js/gym-legacy-1efb17de.js
  10. 0 1
      dist/js/index-0ea5b1ea.js
  11. 0 1
      dist/js/index-1ee4a36e.js
  12. 0 4
      dist/js/index-33433c30.js
  13. 0 1
      dist/js/index-3c9a2adb.js
  14. 0 1
      dist/js/index-5c370b7b.js
  15. 0 1
      dist/js/index-620f28e6.js
  16. 0 1
      dist/js/index-71340210.js
  17. 0 1
      dist/js/index-71af34fa.js
  18. 0 5
      dist/js/index-88763056.js
  19. 0 1
      dist/js/index-9bdbac24.js
  20. 0 1
      dist/js/index-aa2a2215.js
  21. 0 1
      dist/js/index-ca59c7a6.js
  22. 0 0
      dist/js/index-cc245ff8.js
  23. 0 1
      dist/js/index-d6d2b2dc.js
  24. 0 1
      dist/js/index-e64133a4.js
  25. 0 1
      dist/js/index-legacy-01e9117a.js
  26. 0 0
      dist/js/index-legacy-10329f39.js
  27. 0 1
      dist/js/index-legacy-21269901.js
  28. 0 1
      dist/js/index-legacy-2e760f66.js
  29. 0 1
      dist/js/index-legacy-33d5a0ed.js
  30. 0 1
      dist/js/index-legacy-391bcfef.js
  31. 0 1
      dist/js/index-legacy-4f4f1db0.js
  32. 0 4
      dist/js/index-legacy-69f4e4d3.js
  33. 0 5
      dist/js/index-legacy-9b6aa453.js
  34. 0 1
      dist/js/index-legacy-9e953edb.js
  35. 0 1
      dist/js/index-legacy-a020931e.js
  36. 0 1
      dist/js/index-legacy-aadd2aa9.js
  37. 0 1
      dist/js/index-legacy-c98b1be2.js
  38. 0 1
      dist/js/index-legacy-d85b361a.js
  39. 0 1
      dist/js/index-legacy-fddf41c5.js
  40. 0 0
      dist/js/instrument-667a4add.js
  41. 0 0
      dist/js/instrument-legacy-f70ed606.js
  42. 0 0
      dist/js/orchestra-5ad9539c.js
  43. 0 0
      dist/js/orchestra-legacy-22f01413.js
  44. 0 0
      dist/js/polyfills-5e39241c.js
  45. 0 0
      dist/js/polyfills-fb37776d.js
  46. 0 1
      dist/js/polyfills-legacy-e15ed8e9.js
  47. 0 1
      dist/js/polyfills-legacy-eae3f768.js
  48. 0 1
      dist/js/report-share-a2ffd0f0.js
  49. 0 1
      dist/js/report-share-d7955bb9.js
  50. 0 1
      dist/js/report-share-legacy-22ec7394.js
  51. 0 1
      dist/js/report-share-legacy-9e404744.js
  52. 2 22
      dist/orchestra.html
  53. 2 18
      dist/report-share.html

+ 2 - 20
dist/colexiu.html

@@ -2,11 +2,7 @@
 <html lang="en">
 
 <head>
-<<<<<<< HEAD
-  <script type="module" crossorigin src="./js/polyfills-6b7fcc78.js"></script>
-=======
-  <script type="module" crossorigin src="./js/polyfills-fb37776d.js"></script>
->>>>>>> b52bcee07432bd66f8338679aaaabc179bb0c34f
+  <script type="module" crossorigin src="./js/polyfills-5e39241c.js"></script>
 
   <meta charset="UTF-8" />
   <link rel="icon" type="image/svg+xml" href="./vite.svg" />
@@ -44,21 +40,12 @@
       },
     })
   </script>
-<<<<<<< HEAD
   <script type="module" crossorigin src="./js/colexiu-f2c0ef9c.js"></script>
   <link rel="modulepreload" crossorigin href="./js/index-c7c47f9a.js">
   <link rel="modulepreload" crossorigin href="./js/index-ca59c7a6.js">
   <link rel="modulepreload" crossorigin href="./js/index-71340210.js">
   <link rel="stylesheet" href="./css/index-bf8f1009.css">
   <link rel="stylesheet" href="./css/colexiu-e8b419b5.css">
-=======
-  <script type="module" crossorigin src="./js/colexiu-1a8fe7f5.js"></script>
-  <link rel="modulepreload" crossorigin href="./js/index-cc245ff8.js">
-  <link rel="modulepreload" crossorigin href="./js/index-71af34fa.js">
-  <link rel="modulepreload" crossorigin href="./js/index-d6d2b2dc.js">
-  <link rel="stylesheet" href="./css/index-c274c34c.css">
-  <link rel="stylesheet" href="./css/colexiu-62f31c4f.css">
->>>>>>> b52bcee07432bd66f8338679aaaabc179bb0c34f
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
   <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
 </head>
@@ -68,13 +55,8 @@
   <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-e15ed8e9.js"></script>
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-eae3f768.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/colexiu-legacy-fe442c2d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-e5b4eec2.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/colexiu-legacy-9147147e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
->>>>>>> b52bcee07432bd66f8338679aaaabc179bb0c34f
 </body>
 
 </html>

File diff suppressed because it is too large
+ 0 - 1
dist/css/index-bf8f1009.css


File diff suppressed because it is too large
+ 0 - 1
dist/css/index-c274c34c.css


+ 2 - 20
dist/index.html

@@ -2,11 +2,7 @@
 <html lang="ZH-cn">
 
 <head>
-<<<<<<< HEAD
-  <script type="module" crossorigin src="./js/polyfills-6b7fcc78.js"></script>
-=======
-  <script type="module" crossorigin src="./js/polyfills-fb37776d.js"></script>
->>>>>>> b52bcee07432bd66f8338679aaaabc179bb0c34f
+  <script type="module" crossorigin src="./js/polyfills-5e39241c.js"></script>
 
   <meta charset="UTF-8">
   <link rel="icon" href="./favicon.ico" />
@@ -79,21 +75,12 @@
       }
     })
   </script>
-<<<<<<< HEAD
   <script type="module" crossorigin src="./js/gym-00d6f90a.js"></script>
   <link rel="modulepreload" crossorigin href="./js/index-c7c47f9a.js">
   <link rel="modulepreload" crossorigin href="./js/index-ca59c7a6.js">
   <link rel="modulepreload" crossorigin href="./js/index-0ea5b1ea.js">
   <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
   <link rel="stylesheet" href="./css/index-bf8f1009.css">
-=======
-  <script type="module" crossorigin src="./js/gym-26ca23e9.js"></script>
-  <link rel="modulepreload" crossorigin href="./js/index-cc245ff8.js">
-  <link rel="modulepreload" crossorigin href="./js/index-71af34fa.js">
-  <link rel="modulepreload" crossorigin href="./js/index-620f28e6.js">
-  <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
-  <link rel="stylesheet" href="./css/index-c274c34c.css">
->>>>>>> b52bcee07432bd66f8338679aaaabc179bb0c34f
   <link rel="stylesheet" href="./css/index-85f95688.css">
   <link rel="stylesheet" href="./css/plyr-ad8ef5ae.css">
   <link rel="stylesheet" href="./css/index-171cd132.css">
@@ -110,13 +97,8 @@
   <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-e15ed8e9.js"></script>
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-eae3f768.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/gym-legacy-9d4e3d93.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-e5b4eec2.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/gym-legacy-1efb17de.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
->>>>>>> b52bcee07432bd66f8338679aaaabc179bb0c34f
 </body>
 
 </html>

+ 2 - 17
dist/instrument.html

@@ -2,11 +2,7 @@
 <html lang="en">
 
 <head>
-<<<<<<< HEAD
-  <script type="module" crossorigin src="./js/polyfills-6b7fcc78.js"></script>
-=======
-  <script type="module" crossorigin src="./js/polyfills-fb37776d.js"></script>
->>>>>>> b52bcee07432bd66f8338679aaaabc179bb0c34f
+  <script type="module" crossorigin src="./js/polyfills-5e39241c.js"></script>
 
   <meta charset="UTF-8" />
   <meta name="viewport"
@@ -44,15 +40,9 @@
       })
     }
   </script>
-<<<<<<< HEAD
   <script type="module" crossorigin src="./js/instrument-1aa23bd6.js"></script>
   <link rel="modulepreload" crossorigin href="./js/index-c7c47f9a.js">
   <link rel="stylesheet" href="./css/index-bf8f1009.css">
-=======
-  <script type="module" crossorigin src="./js/instrument-667a4add.js"></script>
-  <link rel="modulepreload" crossorigin href="./js/index-cc245ff8.js">
-  <link rel="stylesheet" href="./css/index-c274c34c.css">
->>>>>>> b52bcee07432bd66f8338679aaaabc179bb0c34f
   <link rel="stylesheet" href="./css/instrument-6f0402ec.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>
@@ -71,13 +61,8 @@
 
   
   <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-e15ed8e9.js"></script>
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-eae3f768.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-5cf902d5.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-e5b4eec2.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/instrument-legacy-f70ed606.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
->>>>>>> b52bcee07432bd66f8338679aaaabc179bb0c34f
 </body>
 
 </html>

File diff suppressed because it is too large
+ 0 - 0
dist/js/colexiu-1a8fe7f5.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/colexiu-legacy-9147147e.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/gym-26ca23e9.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/gym-legacy-1efb17de.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/index-0ea5b1ea.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/index-1ee4a36e.js


+ 0 - 4
dist/js/index-33433c30.js

@@ -1,5 +1 @@
-<<<<<<<< HEAD:dist/js/index-33433c30.js
 import{d as i,g as l,n as d,bL as e,c,m as r,h as s,au as u}from"./index-c7c47f9a.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,bL as e,c,m as r,h as s,au as u}from"./index-cc245ff8.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};
->>>>>>>> b52bcee07432bd66f8338679aaaabc179bb0c34f:dist/js/index-88763056.js

File diff suppressed because it is too large
+ 0 - 1
dist/js/index-3c9a2adb.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/index-5c370b7b.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/index-620f28e6.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/index-71340210.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/index-71af34fa.js


+ 0 - 5
dist/js/index-88763056.js

@@ -1,5 +0,0 @@
-<<<<<<<< HEAD:dist/js/index-33433c30.js
-import{d as i,g as l,n as d,bL as e,c,m as r,h as s,au as u}from"./index-c7c47f9a.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,bL as e,c,m as r,h as s,au as u}from"./index-cc245ff8.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};
->>>>>>>> b52bcee07432bd66f8338679aaaabc179bb0c34f:dist/js/index-88763056.js

File diff suppressed because it is too large
+ 0 - 1
dist/js/index-9bdbac24.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/index-aa2a2215.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/index-ca59c7a6.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/index-cc245ff8.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/index-d6d2b2dc.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/index-e64133a4.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/index-legacy-01e9117a.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/index-legacy-10329f39.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/index-legacy-21269901.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/index-legacy-2e760f66.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/index-legacy-33d5a0ed.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/index-legacy-391bcfef.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/index-legacy-4f4f1db0.js


+ 0 - 4
dist/js/index-legacy-69f4e4d3.js

@@ -1,5 +1 @@
-<<<<<<<< HEAD:dist/js/index-legacy-69f4e4d3.js
 System.register(["./index-legacy-b2710daf.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.bL,r=e.c,s=e.m,d=e.h,l=e.au}],execute:function(){const t="_detail_vtlsh_12",c="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),i=a({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:o.staff,base64:""},{state:!1,name:"首调",type:o.firstTone,base64:""},{state:!1,name:"固定调",type:o.fixedTone,base64:""}]});r((()=>{window.appName="colexiu",s.xmlUrl=e.xmlUrl,i.isLoading=!1}));const h=async()=>{console.log("渲染完成")};return()=>d("div",{class:t},[d("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&d(l,{onRendered:h},null)])])}}))}}}));
-========
-System.register(["./index-legacy-10329f39.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.bL,r=e.c,s=e.m,d=e.h,l=e.au}],execute:function(){const t="_detail_vtlsh_12",c="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),i=a({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:o.staff,base64:""},{state:!1,name:"首调",type:o.firstTone,base64:""},{state:!1,name:"固定调",type:o.fixedTone,base64:""}]});r((()=>{window.appName="colexiu",s.xmlUrl=e.xmlUrl,i.isLoading=!1}));const h=async()=>{console.log("渲染完成")};return()=>d("div",{class:t},[d("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&d(l,{onRendered:h},null)])])}}))}}}));
->>>>>>>> b52bcee07432bd66f8338679aaaabc179bb0c34f:dist/js/index-legacy-9b6aa453.js

+ 0 - 5
dist/js/index-legacy-9b6aa453.js

@@ -1,5 +0,0 @@
-<<<<<<<< HEAD:dist/js/index-legacy-69f4e4d3.js
-System.register(["./index-legacy-b2710daf.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.bL,r=e.c,s=e.m,d=e.h,l=e.au}],execute:function(){const t="_detail_vtlsh_12",c="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),i=a({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:o.staff,base64:""},{state:!1,name:"首调",type:o.firstTone,base64:""},{state:!1,name:"固定调",type:o.fixedTone,base64:""}]});r((()=>{window.appName="colexiu",s.xmlUrl=e.xmlUrl,i.isLoading=!1}));const h=async()=>{console.log("渲染完成")};return()=>d("div",{class:t},[d("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&d(l,{onRendered:h},null)])])}}))}}}));
-========
-System.register(["./index-legacy-10329f39.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.bL,r=e.c,s=e.m,d=e.h,l=e.au}],execute:function(){const t="_detail_vtlsh_12",c="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),i=a({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:o.staff,base64:""},{state:!1,name:"首调",type:o.firstTone,base64:""},{state:!1,name:"固定调",type:o.fixedTone,base64:""}]});r((()=>{window.appName="colexiu",s.xmlUrl=e.xmlUrl,i.isLoading=!1}));const h=async()=>{console.log("渲染完成")};return()=>d("div",{class:t},[d("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&d(l,{onRendered:h},null)])])}}))}}}));
->>>>>>>> b52bcee07432bd66f8338679aaaabc179bb0c34f:dist/js/index-legacy-9b6aa453.js

File diff suppressed because it is too large
+ 0 - 1
dist/js/index-legacy-9e953edb.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/index-legacy-a020931e.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/index-legacy-aadd2aa9.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/index-legacy-c98b1be2.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/index-legacy-d85b361a.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/index-legacy-fddf41c5.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/instrument-667a4add.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/instrument-legacy-f70ed606.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/orchestra-5ad9539c.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/orchestra-legacy-22f01413.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/polyfills-5e39241c.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/polyfills-fb37776d.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/polyfills-legacy-e15ed8e9.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/polyfills-legacy-eae3f768.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/report-share-a2ffd0f0.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/report-share-d7955bb9.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/report-share-legacy-22ec7394.js


File diff suppressed because it is too large
+ 0 - 1
dist/js/report-share-legacy-9e404744.js


+ 2 - 22
dist/orchestra.html

@@ -2,11 +2,7 @@
 <html lang="en">
 
 <head>
-<<<<<<< HEAD
-  <script type="module" crossorigin src="./js/polyfills-6b7fcc78.js"></script>
-=======
-  <script type="module" crossorigin src="./js/polyfills-fb37776d.js"></script>
->>>>>>> b52bcee07432bd66f8338679aaaabc179bb0c34f
+  <script type="module" crossorigin src="./js/polyfills-5e39241c.js"></script>
 
   <meta charset="UTF-8" />
   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
@@ -45,7 +41,6 @@
       transition: opacity .3s;
     }
   </style>
-<<<<<<< HEAD
   <script type="module" crossorigin src="./js/orchestra-6b8de4de.js"></script>
   <link rel="modulepreload" crossorigin href="./js/index-c7c47f9a.js">
   <link rel="modulepreload" crossorigin href="./js/index-ca59c7a6.js">
@@ -54,16 +49,6 @@
   <link rel="stylesheet" href="./css/index-bf8f1009.css">
   <link rel="stylesheet" href="./css/index-85f95688.css">
   <link rel="stylesheet" href="./css/orchestra-8e05e751.css">
-=======
-  <script type="module" crossorigin src="./js/orchestra-5ad9539c.js"></script>
-  <link rel="modulepreload" crossorigin href="./js/index-cc245ff8.js">
-  <link rel="modulepreload" crossorigin href="./js/index-71af34fa.js">
-  <link rel="modulepreload" crossorigin href="./js/index-d6d2b2dc.js">
-  <link rel="modulepreload" crossorigin href="./js/index-620f28e6.js">
-  <link rel="stylesheet" href="./css/index-c274c34c.css">
-  <link rel="stylesheet" href="./css/index-85f95688.css">
-  <link rel="stylesheet" href="./css/orchestra-8bc1a9c0.css">
->>>>>>> b52bcee07432bd66f8338679aaaabc179bb0c34f
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
   <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
 </head>
@@ -84,13 +69,8 @@
   </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-e15ed8e9.js"></script>
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-eae3f768.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/orchestra-legacy-bd86e8c6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-e5b4eec2.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/orchestra-legacy-22f01413.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
->>>>>>> b52bcee07432bd66f8338679aaaabc179bb0c34f
 </body>
 
 </html>

+ 2 - 18
dist/report-share.html

@@ -2,11 +2,7 @@
 <html lang="en">
 
 <head>
-<<<<<<< HEAD
-  <script type="module" crossorigin src="./js/polyfills-6b7fcc78.js"></script>
-=======
-  <script type="module" crossorigin src="./js/polyfills-fb37776d.js"></script>
->>>>>>> b52bcee07432bd66f8338679aaaabc179bb0c34f
+  <script type="module" crossorigin src="./js/polyfills-5e39241c.js"></script>
 
   <meta charset="UTF-8" />
   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
@@ -29,17 +25,10 @@
       transition: opacity .3s;
     }
   </style>
-<<<<<<< HEAD
   <script type="module" crossorigin src="./js/report-share-a2ffd0f0.js"></script>
   <link rel="modulepreload" crossorigin href="./js/index-c7c47f9a.js">
   <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
   <link rel="stylesheet" href="./css/index-bf8f1009.css">
-=======
-  <script type="module" crossorigin src="./js/report-share-d7955bb9.js"></script>
-  <link rel="modulepreload" crossorigin href="./js/index-cc245ff8.js">
-  <link rel="modulepreload" crossorigin href="./js/plyr.min-c8c2777b.js">
-  <link rel="stylesheet" href="./css/index-c274c34c.css">
->>>>>>> b52bcee07432bd66f8338679aaaabc179bb0c34f
   <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>
@@ -62,13 +51,8 @@
   </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-e15ed8e9.js"></script>
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-eae3f768.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/report-share-legacy-9e404744.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
-=======
-  <script nomodule crossorigin id="vite-legacy-polyfill" src="./js/polyfills-legacy-e5b4eec2.js"></script>
-  <script nomodule crossorigin id="vite-legacy-entry" data-src="./js/report-share-legacy-22ec7394.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
->>>>>>> b52bcee07432bd66f8338679aaaabc179bb0c34f
 </body>
 
 </html>

Some files were not shown because too many files changed in this diff