合并

dist/assets/index-0db0c9a4.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-0db0c9a4.js
 import{d as i,g as l,n as d,bd as e,c,m as r,f as s,aj as u}from"./index-4217a2d0.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});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,bd as e,c,m as r,f as s,aj as u}from"./index-275636b8.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});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};
+>>>>>>>> iteration-scroll-style:dist/assets/index-c46cf7f4.js

dist/assets/index-b2c40393.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-b2c40393.js
 import{d,l as i,n as p,m as e,w as o,J as a,f as r}from"./index-4217a2d0.js";const c=d({name:"measureSpeed",setup(){const s=i(!1),t=p({speed:e.speed,originSpeed:e.originSpeed});return o(()=>e.section.length,()=>{if(e.modeType==="practise"){if(!s.value&&e.section.length===2){s.value=!0,t.speed=e.speed;const n=e.section[0].beatSpeed;e.originSpeed=n,a(n)}s.value&&e.section.length===0&&(s.value=!1,e.originSpeed=t.originSpeed,a(t.speed))}}),()=>r("div",null,null)}});export{c as M};
+========
+import{d,l as i,n as p,m as e,w as o,J as a,f as r}from"./index-275636b8.js";const c=d({name:"measureSpeed",setup(){const s=i(!1),t=p({speed:e.speed,originSpeed:e.originSpeed});return o(()=>e.section.length,()=>{if(e.modeType==="practise"){if(!s.value&&e.section.length===2){s.value=!0,t.speed=e.speed;const n=e.section[0].beatSpeed;e.originSpeed=n,a(n)}s.value&&e.section.length===0&&(s.value=!1,e.originSpeed=t.originSpeed,a(t.speed))}}),()=>r("div",null,null)}});export{c as M};
+>>>>>>>> iteration-scroll-style:dist/assets/index-dbe62430.js

dist/assets/index-c46cf7f4.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-0db0c9a4.js
+import{d as i,g as l,n as d,bd as e,c,m as r,f as s,aj as u}from"./index-4217a2d0.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});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,bd as e,c,m as r,f as s,aj as u}from"./index-275636b8.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,container:p},y=i({name:"music-list",setup(){const n=l(),t=d({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:e.staff,base64:""},{state:!1,name:"首调",type:e.firstTone,base64:""},{state:!1,name:"固定调",type:e.fixedTone,base64:""}]});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};
+>>>>>>>> iteration-scroll-style:dist/assets/index-c46cf7f4.js

dist/assets/index-dbe62430.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-b2c40393.js
+import{d,l as i,n as p,m as e,w as o,J as a,f as r}from"./index-4217a2d0.js";const c=d({name:"measureSpeed",setup(){const s=i(!1),t=p({speed:e.speed,originSpeed:e.originSpeed});return o(()=>e.section.length,()=>{if(e.modeType==="practise"){if(!s.value&&e.section.length===2){s.value=!0,t.speed=e.speed;const n=e.section[0].beatSpeed;e.originSpeed=n,a(n)}s.value&&e.section.length===0&&(s.value=!1,e.originSpeed=t.originSpeed,a(t.speed))}}),()=>r("div",null,null)}});export{c as M};
+========
+import{d,l as i,n as p,m as e,w as o,J as a,f as r}from"./index-275636b8.js";const c=d({name:"measureSpeed",setup(){const s=i(!1),t=p({speed:e.speed,originSpeed:e.originSpeed});return o(()=>e.section.length,()=>{if(e.modeType==="practise"){if(!s.value&&e.section.length===2){s.value=!0,t.speed=e.speed;const n=e.section[0].beatSpeed;e.originSpeed=n,a(n)}s.value&&e.section.length===0&&(s.value=!1,e.originSpeed=t.originSpeed,a(t.speed))}}),()=>r("div",null,null)}});export{c as M};
+>>>>>>>> iteration-scroll-style:dist/assets/index-dbe62430.js

dist/assets/index-legacy-1aaf6ed2.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-ef69d9d6.js
+System.register(["./index-legacy-626a41e0.js"],(function(e,n){"use strict";var i,t,s,d,r,p,o;return{setters:[e=>{i=e.d,t=e.l,s=e.n,d=e.m,r=e.w,p=e.J,o=e.f}],execute:function(){e("M",i({name:"measureSpeed",setup(){const e=t(!1),n=s({speed:d.speed,originSpeed:d.originSpeed});return r((()=>d.section.length),(()=>{if("practise"===d.modeType){if(!e.value&&2===d.section.length){e.value=!0,n.speed=d.speed;const i=d.section[0].beatSpeed;d.originSpeed=i,p(i)}e.value&&0===d.section.length&&(e.value=!1,d.originSpeed=n.originSpeed,p(n.speed))}})),()=>o("div",null,null)}}))}}}));
+========
+System.register(["./index-legacy-e5fdf239.js"],(function(e,n){"use strict";var i,t,s,d,r,p,o;return{setters:[e=>{i=e.d,t=e.l,s=e.n,d=e.m,r=e.w,p=e.J,o=e.f}],execute:function(){e("M",i({name:"measureSpeed",setup(){const e=t(!1),n=s({speed:d.speed,originSpeed:d.originSpeed});return r((()=>d.section.length),(()=>{if("practise"===d.modeType){if(!e.value&&2===d.section.length){e.value=!0,n.speed=d.speed;const i=d.section[0].beatSpeed;d.originSpeed=i,p(i)}e.value&&0===d.section.length&&(e.value=!1,d.originSpeed=n.originSpeed,p(n.speed))}})),()=>o("div",null,null)}}))}}}));
+>>>>>>>> iteration-scroll-style:dist/assets/index-legacy-1aaf6ed2.js

dist/assets/index-legacy-ef69d9d6.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-ef69d9d6.js
 System.register(["./index-legacy-626a41e0.js"],(function(e,n){"use strict";var i,t,s,d,r,p,o;return{setters:[e=>{i=e.d,t=e.l,s=e.n,d=e.m,r=e.w,p=e.J,o=e.f}],execute:function(){e("M",i({name:"measureSpeed",setup(){const e=t(!1),n=s({speed:d.speed,originSpeed:d.originSpeed});return r((()=>d.section.length),(()=>{if("practise"===d.modeType){if(!e.value&&2===d.section.length){e.value=!0,n.speed=d.speed;const i=d.section[0].beatSpeed;d.originSpeed=i,p(i)}e.value&&0===d.section.length&&(e.value=!1,d.originSpeed=n.originSpeed,p(n.speed))}})),()=>o("div",null,null)}}))}}}));
+========
+System.register(["./index-legacy-e5fdf239.js"],(function(e,n){"use strict";var i,t,s,d,r,p,o;return{setters:[e=>{i=e.d,t=e.l,s=e.n,d=e.m,r=e.w,p=e.J,o=e.f}],execute:function(){e("M",i({name:"measureSpeed",setup(){const e=t(!1),n=s({speed:d.speed,originSpeed:d.originSpeed});return r((()=>d.section.length),(()=>{if("practise"===d.modeType){if(!e.value&&2===d.section.length){e.value=!0,n.speed=d.speed;const i=d.section[0].beatSpeed;d.originSpeed=i,p(i)}e.value&&0===d.section.length&&(e.value=!1,d.originSpeed=n.originSpeed,p(n.speed))}})),()=>o("div",null,null)}}))}}}));
+>>>>>>>> iteration-scroll-style:dist/assets/index-legacy-1aaf6ed2.js

dist/assets/index-legacy-ff90a381.js

@@ -0,0 +1 @@
+System.register(["./index-legacy-e5fdf239.js"],(function(e,t){"use strict";var i,n,a,o,r,s,d,l;return{setters:[e=>{i=e.d,n=e.g,a=e.n,o=e.bd,r=e.c,s=e.m,d=e.f,l=e.aj}],execute:function(){var t=document.createElement("style");t.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(t);const c="_detail_vtlsh_12",h="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),t=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,t.isLoading=!1}));const i=async()=>{console.log("渲染完成")};return()=>d("div",{class:c},[d("div",{id:"scrollContainer",class:[h,"hideCursor"]},[!t.isLoading&&d(l,{onRendered:i},null)])])}}))}}}));

dist/colexiu.html

@@ -40,11 +40,19 @@
       },
     })
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/colexiu-1b3d4127.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-4217a2d0.js">
   <link rel="modulepreload" crossorigin href="./assets/index-0ee269bd.js">
   <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-3002df53.js">
   <link rel="modulepreload" crossorigin href="./assets/index-b2c40393.js">
+=======
+  <script type="module" crossorigin src="./assets/colexiu-86285618.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-275636b8.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-b28855d3.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-4a857d6c.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-dbe62430.js">
+>>>>>>> iteration-scroll-style
   <link rel="stylesheet" href="./assets/index-cf2bcb04.css">
   <link rel="stylesheet" href="./assets/index-d42b0794.css">
   <link rel="stylesheet" href="./assets/colexiu-4a62fa3a.css">
@@ -57,8 +65,13 @@
   <img id="loading" class="show" src="./loading.svg" alt="loading" />
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-23f2ea46.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-01ba85a5.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-a244034a.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-7ad3aad8.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-scroll-style
 </body>
 
 </html>

dist/index.html

@@ -75,12 +75,21 @@
       }
     })
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index-aa129aec.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-4217a2d0.js">
   <link rel="modulepreload" crossorigin href="./assets/index-0ee269bd.js">
   <link rel="modulepreload" crossorigin href="./assets/instruments-c6d17fe7.js">
   <link rel="modulepreload" crossorigin href="./assets/index-dcd995d4.js">
   <link rel="modulepreload" crossorigin href="./assets/index-b2c40393.js">
+=======
+  <script type="module" crossorigin src="./assets/index-61208e24.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-275636b8.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-b28855d3.js">
+  <link rel="modulepreload" crossorigin href="./assets/instruments-2a4d07df.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-4ac027ec.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-dbe62430.js">
+>>>>>>> iteration-scroll-style
   <link rel="modulepreload" crossorigin href="./assets/plyr.min-ade72a33.js">
   <link rel="stylesheet" href="./assets/index-cf2bcb04.css">
   <link rel="stylesheet" href="./assets/index-d42b0794.css">
@@ -100,8 +109,13 @@
   <img id="loading" class="show" src="./loading.svg" alt="loading" />
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-23f2ea46.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-f957b3ad.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-a244034a.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-5bf6c147.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-scroll-style
 </body>
 
 </html>

dist/instrument.html

@@ -41,6 +41,7 @@
       })
     }
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/instrument-a1f8a9ea.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-4217a2d0.js">
   <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-3002df53.js">
@@ -50,6 +51,17 @@
   <link rel="stylesheet" href="./assets/index-cf2bcb04.css">
   <link rel="stylesheet" href="./assets/index-d42b0794.css">
   <link rel="stylesheet" href="./assets/instrument-4394d308.css">
+=======
+  <script type="module" crossorigin src="./assets/instrument-59d0245d.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-275636b8.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-4a857d6c.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-b28855d3.js">
+  <link rel="modulepreload" crossorigin href="./assets/instruments-2a4d07df.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-2fb5428d.js">
+  <link rel="stylesheet" href="./assets/index-cf2bcb04.css">
+  <link rel="stylesheet" href="./assets/index-d42b0794.css">
+  <link rel="stylesheet" href="./assets/instrument-9dc10c12.css">
+>>>>>>> iteration-scroll-style
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};if(location.protocol!="file:"){window.__vite_is_modern_browser=true}</script>
   <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
 </head>
@@ -67,8 +79,13 @@
 
   
   <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="./assets/polyfills-legacy-23f2ea46.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/instrument-legacy-0205e8ee.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-a244034a.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/instrument-legacy-015668c5.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-scroll-style
 </body>
 
 </html>

dist/orchestra.html

@@ -41,6 +41,7 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/orchestra-696fc5d7.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-4217a2d0.js">
   <link rel="modulepreload" crossorigin href="./assets/index-0ee269bd.js">
@@ -48,6 +49,15 @@
   <link rel="modulepreload" crossorigin href="./assets/index-dcd995d4.js">
   <link rel="modulepreload" crossorigin href="./assets/index-b2c40393.js">
   <link rel="modulepreload" crossorigin href="./assets/index-2165713e.js">
+=======
+  <script type="module" crossorigin src="./assets/orchestra-5ad4c6cd.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-275636b8.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-b28855d3.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-4a857d6c.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-4ac027ec.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-dbe62430.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-2fb5428d.js">
+>>>>>>> iteration-scroll-style
   <link rel="stylesheet" href="./assets/index-cf2bcb04.css">
   <link rel="stylesheet" href="./assets/index-d42b0794.css">
   <link rel="stylesheet" href="./assets/index-85f95688.css">
@@ -72,8 +82,13 @@
   </script>
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-23f2ea46.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-52884644.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-a244034a.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-e065246b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-scroll-style
 </body>
 
 </html>

dist/report-share.html

@@ -25,8 +25,13 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/report-share-e33a627a.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-4217a2d0.js">
+=======
+  <script type="module" crossorigin src="./assets/report-share-d5608453.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-275636b8.js">
+>>>>>>> iteration-scroll-style
   <link rel="modulepreload" crossorigin href="./assets/plyr.min-ade72a33.js">
   <link rel="stylesheet" href="./assets/index-cf2bcb04.css">
   <link rel="stylesheet" href="./assets/plyr-aeb30ba4.css">
@@ -51,8 +56,13 @@
   </script>
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-23f2ea46.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-71eea931.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-a244034a.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-9d3bcde6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-scroll-style
 </body>
 
 </html>

src/page-instrument/view-evaluat-report/index.module.less

@@ -1,3 +1,10 @@
+.detail {
+  overflow: auto;
+  margin-right: -17px;
+  /*和滚动条宽度相等*/
+  height: 100vh;
+}
+
 .skeleton {
   position: fixed;
   left: 0;
@@ -52,7 +59,8 @@
         overflow: initial;
         height: initial;
         max-height: initial;
-        & > #osmdCanvasPage1 {
+
+        &>#osmdCanvasPage1 {
           position: relative !important;
         }
       }

src/page-instrument/view-evaluat-report/index.tsx

@@ -5,11 +5,7 @@ import state, { isRhythmicExercises } from "../../state";
 import { setGlobalData } from "../../utils";
 import MusicScore, { resetMusicScore } from "../../view/music-score";
 import styles from "./index.module.less";
-import {
-	api_cloudLoading,
-	api_setStatusBarVisibility,
-	isSpecialShapedScreen,
-} from "/src/helpers/communication";
+import { api_cloudLoading, api_setStatusBarVisibility, isSpecialShapedScreen } from "/src/helpers/communication";
 import { getQuery } from "/src/utils/queryString";
 import { mappingVoicePart, subjectFingering } from "/src/view/fingering/fingering-config";
 import { api_musicPracticeRecordDetail, sysMusicScoreAccompanimentQueryPage } from "../api";
@@ -17,202 +13,185 @@ import ShareTop from "./component/share-top";
 import { addMeasureScore } from "/src/view/evaluating";
 
 const colorsClass: any = {
-	RIGHT: styles.right,
-	WRONG: styles.wrong,
-	NOT_PLAY: styles.notPlay,
-	CADENCE_WRONG: styles.cadence_wrong,
-	INTONATION_WRONG: styles.intonation_wrong,
-	INTEGRITY_WRONG: styles.integrity_wrong,
+  RIGHT: styles.right,
+  WRONG: styles.wrong,
+  NOT_PLAY: styles.notPlay,
+  CADENCE_WRONG: styles.cadence_wrong,
+  INTONATION_WRONG: styles.intonation_wrong,
+  INTEGRITY_WRONG: styles.integrity_wrong,
 };
 
 export default defineComponent({
-	name: "music-list",
-	setup() {
-		const query: any = getQuery();
-		const scoreData = reactive({
-			videoFilePath: "", // 回放视频路径
-			cadence: 0,
-			integrity: 0,
-			intonation: 0,
-			score: 0,
-			heardLevel: "",
-		});
+  name: "music-list",
+  setup() {
+    const query: any = getQuery();
+    const scoreData = reactive({
+      videoFilePath: "", // 回放视频路径
+      cadence: 0,
+      integrity: 0,
+      intonation: 0,
+      score: 0,
+      heardLevel: "",
+    });
 
-		const detailData = reactive({
-			isLoading: true,
-			paddingLeft: "",
-			headerHide: false,
-			musicalNotesPlayStats: [] as any[],
-			userMeasureScore: {} as any,
-		});
-		const getAPPData = async () => {
-			const screenData = await isSpecialShapedScreen();
-			if (screenData?.content) {
-				const { isSpecialShapedScreen, notchHeight } = screenData.content;
-				if (isSpecialShapedScreen) {
-					detailData.paddingLeft = 25 + "px";
-				}
-			}
-			// 普通webview 没有获取异性屏的方法
-			detailData.paddingLeft = 20 + "px";
-		};
-		onBeforeMount(() => {
-			getAPPData();
-			api_setStatusBarVisibility();
-		});
-		// console.log(route.params, query)
-		/** 获取曲谱数据 */
-		const getMusicInfo = (res: any) => {
-			const index = state.partIndex;
-			const musicInfo = {
-				...res.data,
-				...res.data.background[index],
-			};
-			// console.log("🚀 ~ musicInfo:", musicInfo);
-			setState(musicInfo, index);
-			setCustom();
-			detailData.isLoading = false;
-		};
+    const detailData = reactive({
+      isLoading: true,
+      paddingLeft: "",
+      headerHide: false,
+      musicalNotesPlayStats: [] as any[],
+      userMeasureScore: {} as any,
+    });
+    const getAPPData = async () => {
+      const screenData = await isSpecialShapedScreen();
+      if (screenData?.content) {
+        const { isSpecialShapedScreen, notchHeight } = screenData.content;
+        if (isSpecialShapedScreen) {
+          detailData.paddingLeft = 25 + "px";
+        }
+      }
+      // 普通webview 没有获取异性屏的方法
+      detailData.paddingLeft = 20 + "px";
+    };
+    onBeforeMount(() => {
+      getAPPData();
+      api_setStatusBarVisibility();
+    });
+    // console.log(route.params, query)
+    /** 获取曲谱数据 */
+    const getMusicInfo = (res: any) => {
+      const index = state.partIndex;
+      const musicInfo = {
+        ...res.data,
+        ...res.data.background[index],
+      };
+      // console.log("🚀 ~ musicInfo:", musicInfo);
+      setState(musicInfo, index);
+      setCustom();
+      detailData.isLoading = false;
+    };
 
-		const setState = (data: any, index: number) => {
-			// console.log("🚀 ~ data:", data)
-			state.scrollContainer = "scrollContainer";
-			state.detailId = data.id;
-			state.xmlUrl = data.xmlFileUrl;
-			state.partIndex = index;
-			state.subjectId = data.musicSubject;
-			state.categoriesId = data.categoriesId;
-			state.categoriesName = data.musicTagNames;
-			state.enableEvaluation = data.canEvaluate ? true : false;
-			state.examSongId = data.id + "";
-			state.examSongName = data.musicSheetName;
-			// 解析扩展字段
-			if (data.extConfigJson) {
-				try {
-					state.extConfigJson = JSON.parse(data.extConfigJson as string);
-				} catch (error) {
-					console.error("解析扩展字段错误:", error);
-				}
-			}
-			state.isOpenMetronome = data.mp3Type === "MP3_METRONOME" ? true : false;
-			state.needTick = data.isOpenMetronome;
-			state.isShowFingering = data.showFingering ? true : false;
-			state.music = data.audioFileUrl;
-			state.accompany = data.metronomeUrl || data.metronomeUrl;
-			state.midiUrl = data.midiUrl;
-			state.parentCategoriesId = data.musicTag;
-			state.playMode = data.audioType === "MP3" ? "MP3" : "MIDI";
-			state.originSpeed = state.speed = data.speed;
-			state.track = data.track;
-			state.enableNotation = data.notation ? true : false;
+    const setState = (data: any, index: number) => {
+      // console.log("🚀 ~ data:", data)
+      state.scrollContainer = "scrollContainer";
+      state.detailId = data.id;
+      state.xmlUrl = data.xmlFileUrl;
+      state.partIndex = index;
+      state.subjectId = data.musicSubject;
+      state.categoriesId = data.categoriesId;
+      state.categoriesName = data.musicTagNames;
+      state.enableEvaluation = data.canEvaluate ? true : false;
+      state.examSongId = data.id + "";
+      state.examSongName = data.musicSheetName;
+      // 解析扩展字段
+      if (data.extConfigJson) {
+        try {
+          state.extConfigJson = JSON.parse(data.extConfigJson as string);
+        } catch (error) {
+          console.error("解析扩展字段错误:", error);
+        }
+      }
+      state.isOpenMetronome = data.mp3Type === "MP3_METRONOME" ? true : false;
+      state.needTick = data.isOpenMetronome;
+      state.isShowFingering = data.showFingering ? true : false;
+      state.music = data.audioFileUrl;
+      state.accompany = data.metronomeUrl || data.metronomeUrl;
+      state.midiUrl = data.midiUrl;
+      state.parentCategoriesId = data.musicTag;
+      state.playMode = data.audioType === "MP3" ? "MP3" : "MIDI";
+      state.originSpeed = state.speed = data.speed;
+      state.track = data.track;
+      state.enableNotation = data.notation ? true : false;
 
-			// 映射声部ID
-			state.subjectId = mappingVoicePart(state.subjectId as any, "ORCHESTRA");
-			// console.log("🚀 ~ state.subjectId:", state.subjectId);
-			// 是否打击乐
-			state.isPercussion =
-				state.subjectId == 23 ||
-				state.subjectId == 113 ||
-				state.subjectId == 121 ||
-				isRhythmicExercises();
+      // 映射声部ID
+      state.subjectId = mappingVoicePart(state.subjectId as any, "ORCHESTRA");
+      // console.log("🚀 ~ state.subjectId:", state.subjectId);
+      // 是否打击乐
+      state.isPercussion = state.subjectId == 23 || state.subjectId == 113 || state.subjectId == 121 || isRhythmicExercises();
 
-			// 设置指法
-			state.fingeringInfo = subjectFingering(state.subjectId);
-			// console.log("🚀 ~ state.fingeringInfo:", state.fingeringInfo, state.subjectId, state.track)
-			// state.isOpenPrepare = true
-		};
+      // 设置指法
+      state.fingeringInfo = subjectFingering(state.subjectId);
+      // console.log("🚀 ~ state.fingeringInfo:", state.fingeringInfo, state.subjectId, state.track)
+      // state.isOpenPrepare = true
+    };
 
-		const setCustom = () => {
-			if (state.extConfigJson.multitrack) {
-				setGlobalData("multitrack", state.extConfigJson.multitrack);
-			}
-		};
+    const setCustom = () => {
+      if (state.extConfigJson.multitrack) {
+        setGlobalData("multitrack", state.extConfigJson.multitrack);
+      }
+    };
 
-		onMounted(async () => {
-			const res = await api_musicPracticeRecordDetail(query.id);
-			state.partIndex = Number(res?.data?.partIndex);
-			let resultData = {} as any;
-			try {
-				resultData = JSON.parse(res?.data?.scoreData);
-			} catch (error) {
-				console.error("解析评测结果:", error);
-			}
-			// console.log("🚀 ~ resultData:", resultData);
-			detailData.musicalNotesPlayStats = resultData.musicalNotesPlayStats?.notesData || [];
-			detailData.userMeasureScore = resultData.userMeasureScore || {};
+    onMounted(async () => {
+      const res = await api_musicPracticeRecordDetail(query.id);
+      state.partIndex = Number(res?.data?.partIndex);
+      let resultData = {} as any;
+      try {
+        resultData = JSON.parse(res?.data?.scoreData);
+      } catch (error) {
+        console.error("解析评测结果:", error);
+      }
+      // console.log("🚀 ~ resultData:", resultData);
+      detailData.musicalNotesPlayStats = resultData.musicalNotesPlayStats?.notesData || [];
+      detailData.userMeasureScore = resultData.userMeasureScore || {};
 
-			scoreData.heardLevel = res.data?.heardLevel;
-			scoreData.cadence = res.data?.cadence;
-			scoreData.integrity = res.data?.integrity;
-			scoreData.intonation = res.data?.intonation;
-			scoreData.score = res.data?.score;
-			scoreData.videoFilePath = res.data?.videoFilePath || res.data?.recordFilePath;
-			Promise.all([
-				sysMusicScoreAccompanimentQueryPage(resultData.musicalNotesPlayStats?.examSongId),
-			]).then((values) => {
-				getMusicInfo(values[0]);
-			});
-		});
+      scoreData.heardLevel = res.data?.heardLevel;
+      scoreData.cadence = res.data?.cadence;
+      scoreData.integrity = res.data?.integrity;
+      scoreData.intonation = res.data?.intonation;
+      scoreData.score = res.data?.score;
+      scoreData.videoFilePath = res.data?.videoFilePath || res.data?.recordFilePath;
+      Promise.all([sysMusicScoreAccompanimentQueryPage(resultData.musicalNotesPlayStats?.examSongId)]).then((values) => {
+        getMusicInfo(values[0]);
+      });
+    });
 
-		const setPathColor = () => {
-			for (const note of detailData.musicalNotesPlayStats) {
-				const active = state.times[note.musicalNotesIndex];
-				const svgEl = active?.id ? document.getElementById("vf-" + active?.id) : null;
-				svgEl?.classList.add(colorsClass[note.musicalErrorType]);
-			}
-		};
-		const setMearureColor = () => {
-			for (let key in detailData.userMeasureScore) {
-				addMeasureScore(detailData.userMeasureScore[key], false);
-			}
-		};
+    const setPathColor = () => {
+      for (const note of detailData.musicalNotesPlayStats) {
+        const active = state.times[note.musicalNotesIndex];
+        const svgEl = active?.id ? document.getElementById("vf-" + active?.id) : null;
+        svgEl?.classList.add(colorsClass[note.musicalErrorType]);
+      }
+    };
+    const setMearureColor = () => {
+      for (let key in detailData.userMeasureScore) {
+        addMeasureScore(detailData.userMeasureScore[key], false);
+      }
+    };
 
-		/** 渲染完成 */
-		const handleRendered = (osmd: any) => {
-			state.musicRendered = true;
-			state.osmd = osmd;
-			state.times = formateTimes(osmd);
-			console.log("🚀 ~ state.times:", state.times);
-			setPathColor();
-			setMearureColor();
-			api_cloudLoading();
-		};
-		onMounted(() => {
-			window.addEventListener("resize", resetMusicScore);
-		});
-		onBeforeUnmount(() => {
-			window.removeEventListener("resize", resetMusicScore);
-		});
+    /** 渲染完成 */
+    const handleRendered = (osmd: any) => {
+      state.musicRendered = true;
+      state.osmd = osmd;
+      state.times = formateTimes(osmd);
+      console.log("🚀 ~ state.times:", state.times);
+      setPathColor();
+      setMearureColor();
+      api_cloudLoading();
+    };
+    onMounted(() => {
+      window.addEventListener("resize", resetMusicScore);
+    });
+    onBeforeUnmount(() => {
+      window.removeEventListener("resize", resetMusicScore);
+    });
 
-		return () => (
-			<div
-				class={[styles.detail, state.setting.eyeProtection && "eyeProtection", styles.shareBox]}
-				style={{ paddingLeft: detailData.paddingLeft }}
-			>
-				<Transition name="van-fade">
-					{!state.musicRendered && (
-						<div class={styles.skeleton}>
-							<Skeleton class={styles.skeleton} row={8} />
-						</div>
-					)}
-				</Transition>
-				<div
-					class={[styles.headHeight, detailData.headerHide && styles.headHide]}
-					onClick={(e: Event) => e.stopPropagation()}
-				>
-					<Transition name="van-slide-down">
-						{state.musicRendered && <ShareTop scoreData={scoreData} />}
-					</Transition>
-				</div>
-				<div
-					id="scrollContainer"
-					class={[styles.container, !state.setting.displayCursor && "hideCursor"]}
-				>
-					<div class={styles.musicName}>{state.examSongName}</div>
-					{/* 曲谱渲染 */}
-					{!detailData.isLoading && <MusicScore onRendered={handleRendered} />}
-				</div>
-			</div>
-		);
-	},
+    return () => (
+      <div class={[styles.detail, state.setting.eyeProtection && "eyeProtection", styles.shareBox]} style={{ paddingLeft: detailData.paddingLeft }}>
+        <Transition name="van-fade">
+          {!state.musicRendered && (
+            <div class={styles.skeleton}>
+              <Skeleton class={styles.skeleton} row={8} />
+            </div>
+          )}
+        </Transition>
+        <div class={[styles.headHeight, detailData.headerHide && styles.headHide]} onClick={(e: Event) => e.stopPropagation()}>
+          <Transition name="van-slide-down">{state.musicRendered && <ShareTop scoreData={scoreData} />}</Transition>
+        </div>
+        <div id="scrollContainer" class={[styles.container, !state.setting.displayCursor && "hideCursor"]}>
+          <div class={styles.musicName}>{state.examSongName}</div>
+          {/* 曲谱渲染 */}
+          {!detailData.isLoading && <MusicScore onRendered={handleRendered} />}
+        </div>
+      </div>
+    );
+  },
 });

src/page-instrument/view-figner/index.module.less

@@ -195,17 +195,15 @@
 
         .baseBtn {
             margin: 0 6px;
-
             background: linear-gradient(180deg, #F4EFED 0%, #E5DCD7 100%) !important;
             box-shadow: 0px 1px 2px 0px #9F9690, inset 0px -2px 0px 0px rgba(205, 192, 181, 0.47), inset 0px 2px 1px 0px #FFFFFF;
             border-radius: 5px !important;
-
             width: 98px;
             height: 34px;
             background: rgba(255, 255, 255, .48);
             border-radius: 10px;
             font-size: 12px;
-            font-weight: 400;
+            font-weight: 600;
             color: #616161;
             line-height: 17px;
             text-align: center;
@@ -855,7 +853,7 @@
         width: 45px;
         background: rgba(255, 255, 255, .27);
         border-radius: 8px;
-        overflow: hidden;
+        // overflow: hidden;
 
         .baseBtn {
             // margin: 0 4px;
@@ -933,6 +931,7 @@
     min-height: 53px;
     height: auto;
     padding: 0 5px;
+    font-weight: 600;
     // padding: 14px 0 15px 12px;
     // background-image: url('./image/icon_trans_bg_hu.png');
     // background-size: 100% 100%;
@@ -970,6 +969,7 @@
         flex-direction: column;
         justify-content: center;
         align-items: center;
+        font-weight: 600;
 
         &>div {
             display: flex;