修改显示

dist/assets/index-4dca1554.js

@@ -1 +1,5 @@
+<<<<<<<< Updated upstream:dist/assets/index-4dca1554.js
 import{d,l as i,n as p,m as e,w as o,J as a,f as r}from"./index-f4093bd0.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,f as r,L as a}from"./index-9c2dec4a.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};
+>>>>>>>> Stashed changes:dist/assets/index-f32feeb9.js

dist/assets/index-597ab9af.js

@@ -1 +1,5 @@
+<<<<<<<< Updated upstream:dist/assets/index-597ab9af.js
 import{d as i,g as l,n as d,d3 as e,c,m as r,f as s,aj as u}from"./index-f4093bd0.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,cW as e,c,m as r,f as s,ai as u}from"./index-9c2dec4a.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};
+>>>>>>>> Stashed changes:dist/assets/index-d98e8643.js

dist/assets/index-d98e8643.js

@@ -0,0 +1,5 @@
+<<<<<<<< Updated upstream:dist/assets/index-597ab9af.js
+import{d as i,g as l,n as d,d3 as e,c,m as r,f as s,aj as u}from"./index-f4093bd0.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,cW as e,c,m as r,f as s,ai as u}from"./index-9c2dec4a.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};
+>>>>>>>> Stashed changes:dist/assets/index-d98e8643.js

dist/assets/index-f32feeb9.js

@@ -0,0 +1,5 @@
+<<<<<<<< Updated upstream:dist/assets/index-4dca1554.js
+import{d,l as i,n as p,m as e,w as o,J as a,f as r}from"./index-f4093bd0.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,f as r,L as a}from"./index-9c2dec4a.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};
+>>>>>>>> Stashed changes:dist/assets/index-f32feeb9.js

dist/assets/index-legacy-2da68f61.js

@@ -0,0 +1 @@
+System.register(["./index-legacy-79957d6d.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.cW,r=e.c,s=e.m,d=e.f,l=e.ai}],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)])])}}))}}}));

dist/assets/index-legacy-65eafa7b.js

@@ -1 +1,5 @@
+<<<<<<<< Updated upstream:dist/assets/index-legacy-65eafa7b.js
 System.register(["./index-legacy-3547a062.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-79957d6d.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.f,o=e.L}],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,o(i)}e.value&&0===d.section.length&&(e.value=!1,d.originSpeed=n.originSpeed,o(n.speed))}})),()=>p("div",null,null)}}))}}}));
+>>>>>>>> Stashed changes:dist/assets/index-legacy-b1c8dd01.js

dist/assets/index-legacy-b1c8dd01.js

@@ -0,0 +1,5 @@
+<<<<<<<< Updated upstream:dist/assets/index-legacy-65eafa7b.js
+System.register(["./index-legacy-3547a062.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-79957d6d.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.f,o=e.L}],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,o(i)}e.value&&0===d.section.length&&(e.value=!1,d.originSpeed=n.originSpeed,o(n.speed))}})),()=>p("div",null,null)}}))}}}));
+>>>>>>>> Stashed changes:dist/assets/index-legacy-b1c8dd01.js

dist/colexiu.html

@@ -2,7 +2,11 @@
 <html lang="en">
 
 <head>
+<<<<<<< Updated upstream
   <script type="module" crossorigin src="./assets/polyfills-fcfc54de.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/polyfills-dfffcbde.js"></script>
+>>>>>>> Stashed changes
 
   <meta charset="UTF-8" />
   <link rel="icon" type="image/svg+xml" href="./vite.svg" />
@@ -40,15 +44,24 @@
       },
     })
   </script>
+<<<<<<< Updated upstream
   <script type="module" crossorigin src="./assets/colexiu-2c7566b0.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-f4093bd0.js">
   <link rel="modulepreload" crossorigin href="./assets/index-fd42720f.js">
   <link rel="modulepreload" crossorigin href="./assets/index-8a2b1113.js">
   <link rel="modulepreload" crossorigin href="./assets/index-4dca1554.js">
   <link rel="stylesheet" href="./assets/index-d78d4470.css">
+=======
+  <script type="module" crossorigin src="./assets/colexiu-cea3158e.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-9c2dec4a.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-a15e8e76.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-733b2065.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-f32feeb9.js">
+  <link rel="stylesheet" href="./assets/index-5cdcded6.css">
+>>>>>>> Stashed changes
   <link rel="stylesheet" href="./assets/index-d42b0794.css">
   <link rel="stylesheet" href="./assets/colexiu-4a62fa3a.css">
-  <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">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>
 
@@ -57,8 +70,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>
+<<<<<<< Updated upstream
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-614ecd92.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-d3e0e0a5.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-4b1318e1.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-9233703f.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> Stashed changes
 </body>
 
 </html>

dist/index.html

@@ -2,7 +2,11 @@
 <html lang="ZH-cn">
 
 <head>
+<<<<<<< Updated upstream
   <script type="module" crossorigin src="./assets/polyfills-fcfc54de.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/polyfills-dfffcbde.js"></script>
+>>>>>>> Stashed changes
 
   <meta charset="UTF-8">
   <link rel="icon" href="./favicon.ico" />
@@ -75,6 +79,7 @@
       }
     })
   </script>
+<<<<<<< Updated upstream
   <script type="module" crossorigin src="./assets/gym-8ba2231e.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-f4093bd0.js">
   <link rel="modulepreload" crossorigin href="./assets/index-fd42720f.js">
@@ -83,11 +88,21 @@
   <link rel="modulepreload" crossorigin href="./assets/index-4dca1554.js">
   <link rel="modulepreload" crossorigin href="./assets/plyr.min-ade72a33.js">
   <link rel="stylesheet" href="./assets/index-d78d4470.css">
+=======
+  <script type="module" crossorigin src="./assets/gym-586ca7fe.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-9c2dec4a.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-a15e8e76.js">
+  <link rel="modulepreload" crossorigin href="./assets/instruments-0ad8f320.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-86cc2383.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-f32feeb9.js">
+  <link rel="modulepreload" crossorigin href="./assets/plyr.min-424cfb91.js">
+  <link rel="stylesheet" href="./assets/index-5cdcded6.css">
+>>>>>>> Stashed changes
   <link rel="stylesheet" href="./assets/index-d42b0794.css">
   <link rel="stylesheet" href="./assets/index-85f95688.css">
-  <link rel="stylesheet" href="./assets/plyr-aeb30ba4.css">
+  <link rel="stylesheet" href="./assets/plyr-ad8ef5ae.css">
   <link rel="stylesheet" href="./assets/index-6503f7bd.css">
-  <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">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>
 
@@ -100,8 +115,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>
+<<<<<<< Updated upstream
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-614ecd92.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/gym-legacy-a69cb5c7.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-4b1318e1.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/gym-legacy-1242a47a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> Stashed changes
 </body>
 
 </html>

dist/instrument.html

@@ -2,7 +2,11 @@
 <html lang="en">
 
 <head>
+<<<<<<< Updated upstream
   <script type="module" crossorigin src="./assets/polyfills-fcfc54de.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/polyfills-dfffcbde.js"></script>
+>>>>>>> Stashed changes
 
   <meta charset="UTF-8" />
   <meta name="viewport"
@@ -40,6 +44,7 @@
       })
     }
   </script>
+<<<<<<< Updated upstream
   <script type="module" crossorigin src="./assets/instrument-c3c744de.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-f4093bd0.js">
   <link rel="modulepreload" crossorigin href="./assets/index-fd42720f.js">
@@ -50,6 +55,18 @@
   <link rel="stylesheet" href="./assets/index-d42b0794.css">
   <link rel="stylesheet" href="./assets/instrument-e97f0164.css">
   <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" crossorigin src="./assets/instrument-5d634382.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-9c2dec4a.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-a15e8e76.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-733b2065.js">
+  <link rel="modulepreload" crossorigin href="./assets/instruments-0ad8f320.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-21891187.js">
+  <link rel="stylesheet" href="./assets/index-5cdcded6.css">
+  <link rel="stylesheet" href="./assets/index-d42b0794.css">
+  <link rel="stylesheet" href="./assets/instrument-a3206505.css">
+  <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};window.__vite_is_modern_browser=true;</script>
+>>>>>>> Stashed changes
   <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>
 
@@ -66,8 +83,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>
+<<<<<<< Updated upstream
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-614ecd92.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/instrument-legacy-077aadd4.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-4b1318e1.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/instrument-legacy-8a426f30.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> Stashed changes
 </body>
 
 </html>

dist/orchestra.html

@@ -2,7 +2,11 @@
 <html lang="en">
 
 <head>
+<<<<<<< Updated upstream
   <script type="module" crossorigin src="./assets/polyfills-fcfc54de.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/polyfills-dfffcbde.js"></script>
+>>>>>>> Stashed changes
 
   <meta charset="UTF-8" />
   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
@@ -41,6 +45,7 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< Updated upstream
   <script type="module" crossorigin src="./assets/orchestra-8c35e42b.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-f4093bd0.js">
   <link rel="modulepreload" crossorigin href="./assets/index-fd42720f.js">
@@ -49,10 +54,20 @@
   <link rel="modulepreload" crossorigin href="./assets/index-4dca1554.js">
   <link rel="modulepreload" crossorigin href="./assets/index-5aea7414.js">
   <link rel="stylesheet" href="./assets/index-d78d4470.css">
+=======
+  <script type="module" crossorigin src="./assets/orchestra-4e800fd9.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-9c2dec4a.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-a15e8e76.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-733b2065.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-86cc2383.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-f32feeb9.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-21891187.js">
+  <link rel="stylesheet" href="./assets/index-5cdcded6.css">
+>>>>>>> Stashed changes
   <link rel="stylesheet" href="./assets/index-d42b0794.css">
   <link rel="stylesheet" href="./assets/index-85f95688.css">
   <link rel="stylesheet" href="./assets/orchestra-a4d083a1.css">
-  <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">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>
 
@@ -72,8 +87,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>
+<<<<<<< Updated upstream
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-614ecd92.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-b174fb20.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-4b1318e1.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-2fd643e3.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> Stashed changes
 </body>
 
 </html>

dist/report-share.html

@@ -2,7 +2,11 @@
 <html lang="en">
 
 <head>
+<<<<<<< Updated upstream
   <script type="module" crossorigin src="./assets/polyfills-fcfc54de.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/polyfills-dfffcbde.js"></script>
+>>>>>>> Stashed changes
 
   <meta charset="UTF-8" />
   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
@@ -25,13 +29,21 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< Updated upstream
   <script type="module" crossorigin src="./assets/report-share-9381c75d.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-f4093bd0.js">
   <link rel="modulepreload" crossorigin href="./assets/plyr.min-ade72a33.js">
   <link rel="stylesheet" href="./assets/index-d78d4470.css">
   <link rel="stylesheet" href="./assets/plyr-aeb30ba4.css">
+=======
+  <script type="module" crossorigin src="./assets/report-share-a1580f5c.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-9c2dec4a.js">
+  <link rel="modulepreload" crossorigin href="./assets/plyr.min-424cfb91.js">
+  <link rel="stylesheet" href="./assets/index-5cdcded6.css">
+  <link rel="stylesheet" href="./assets/plyr-ad8ef5ae.css">
+>>>>>>> Stashed changes
   <link rel="stylesheet" href="./assets/report-share-0f4c3151.css">
-  <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">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>
 
@@ -51,8 +63,13 @@
   </script>
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
+<<<<<<< Updated upstream
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-614ecd92.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-d3fbbabc.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-4b1318e1.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-5d45283a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> Stashed changes
 </body>
 
 </html>

instrument.html

@@ -45,7 +45,7 @@
   <img id="loading" class="show" src="/loading.svg" alt="loading" />
   <script>
     // 处理课堂乐器老师端打开听音练习时去掉加载动画
-    if (location.href.indexOf('view-figner') >= 0 && location.href.indexOf('platform=pc') >= 0 && location.href.indexOf('linkSource=class') >= 0) {
+    if (location.href.indexOf('view-figner') >= 0 && location.href.indexOf('platform=pc') >= 0 || (location.href.indexOf('view-figner') >= 0 && location.href.indexOf('linkSource=class') >= 0)) {
       var _loading = document.getElementById("loading");
       _loading && document.body.removeChild(_loading);
     }

src/page-instrument/view-figner/index.tsx

@@ -216,7 +216,8 @@ export default defineComponent({
     // };
 
     // 切换当前模式
-    const onChangeFingeringModel = () => {
+    const onChangeFingeringModel = (e: any) => {
+      e.stopPropagation();
       //
       if (playAction.listenLock) return;
       if (playAction.showAnswerLoading) return;
@@ -479,7 +480,12 @@ export default defineComponent({
     // 判断乐器是否移动
     const instrumentTranstion = computed(() => {
       const transform = data.transform;
-      if (transform.scale !== 1 || transform.x !== 0 || transform.y !== 0 || transform.startScale !== 1 || transform.startX !== 0 || transform.startY !== 0) {
+
+      let scale = 1;
+      if (data.subject === "pan-flute") {
+        scale = 0.9;
+      }
+      if (transform.scale !== scale || transform.x !== 0 || transform.y !== 0 || transform.startScale !== scale || transform.startX !== 0 || transform.startY !== 0) {
         return true;
       } else {
         return false;
@@ -511,6 +517,21 @@ export default defineComponent({
         resetMode(true, 0);
         handleStop();
         gaumntPause();
+
+        // 重置乐器
+        if (res?.data?.data.code) {
+          data.subject = code;
+          data.viewIndex = 0;
+          data.tipShow = false;
+          data.loadingDom = true;
+          fingerData.fingeringInfo = subjectFingering(data.subject);
+          data.activeTone = {} as any;
+          resetElement();
+          // 设置屏幕方向
+          setTimeout(() => {
+            __init();
+          }, 100);
+        }
       }
     };
 
@@ -937,7 +958,19 @@ export default defineComponent({
       const rs: number[] = Array.isArray(relationship[1]) ? relationship[fingerData.relationshipIndex] : relationship;
       const canTizhi = Array.isArray(relationship[1]);
       return (
-        <div class={[styles.fingerBox, state.platform !== IPlatform.PC && !query.modelType && fingerData.fingeringInfo.orientation === 1 ? styles.fingerBottom : styles.fingerRight, data.linkSource === "class" ? styles.linkSourceClass : ""]}>
+        <div
+          class={[styles.fingerBox, state.platform !== IPlatform.PC && !query.modelType && fingerData.fingeringInfo.orientation === 1 ? styles.fingerBottom : styles.fingerRight, data.linkSource === "class" ? styles.linkSourceClass : ""]}
+          onClick={() => {
+            if (data.linkSource === "class") {
+              window.parent.postMessage(
+                {
+                  api: "clickViewFigner",
+                },
+                "*"
+              );
+            }
+          }}
+        >
           <div
             class={styles.head}
             style={{
@@ -953,6 +986,7 @@ export default defineComponent({
               <div
                 class={[styles.baseBtn, styles.changeInstrumentBtn]}
                 onClick={(e) => {
+                  e.stopPropagation();
                   //
                   // 播放音阶时不能切换
                   if (playStatus.gamut) {
@@ -1024,11 +1058,22 @@ export default defineComponent({
                 {playAction.userAnswerStatus === 2 && <div class={[styles.tipsT, styles.playError]}></div>}
                 {playAction.resetAction && <div class={[styles.tipsT, styles.playTips5]}></div>}
                 {((data.noteType !== "#c" && (orientationDirection.value === 0 || (orientationDirection.value === 1 && state.platform === IPlatform.PC))) || (orientationDirection.value === 1 && state.platform === IPlatform.APP)) && (
-                  <Button class={styles.noteBtn} onClick={() => scrollNoteBox("left")}>
+                  <Button
+                    class={styles.noteBtn}
+                    onClick={(e: any) => {
+                      e.stopPropagation();
+                      scrollNoteBox("left");
+                    }}
+                  >
                     <Icon name="arrow-left" />
                   </Button>
                 )}
-                <div class={[styles.noteContent, data.fingeringMode !== "scaleMode" && orientationDirection.value === 0 && styles.noteContentOther, browsInfo.ios ? "" : styles.noteContentWrap, data.huaweiPad && styles.huaweiPad]}>
+                <div
+                  class={[styles.noteContent, data.fingeringMode !== "scaleMode" && orientationDirection.value === 0 && styles.noteContentOther, browsInfo.ios ? "" : styles.noteContentWrap, data.huaweiPad && styles.huaweiPad]}
+                  onClick={(e: any) => {
+                    e.stopPropagation();
+                  }}
+                >
                   {/* 判断是否为音阶模式 */}
                   {data.fingeringMode !== "scaleMode" && (
                     <div draggable={false} class={styles.note} onClick={noteChangeShow}>
@@ -1107,13 +1152,24 @@ export default defineComponent({
                   </div>
                 </div>
                 {((data.noteType !== "#c" && (orientationDirection.value === 0 || (orientationDirection.value === 1 && state.platform === IPlatform.PC))) || (orientationDirection.value === 1 && state.platform === IPlatform.APP)) && (
-                  <Button class={styles.noteBtn} onClick={() => scrollNoteBox("right")}>
+                  <Button
+                    class={styles.noteBtn}
+                    onClick={(e: any) => {
+                      e.stopPropagation();
+                      scrollNoteBox("right");
+                    }}
+                  >
                     <Icon name="arrow" />
                   </Button>
                 )}
               </div>
               {data.fingeringMode !== "scaleMode" && (
-                <div class={styles.optionBtns}>
+                <div
+                  class={styles.optionBtns}
+                  onClick={(e: any) => {
+                    e.stopPropagation();
+                  }}
+                >
                   <Button class={[styles.oBtn, styles.gamut, playStatus.action && styles.disabled]} round onClick={onGamutPlayOrPause}>
                     {playStatus.gamut ? "暂停" : "播放音阶"}
                   </Button>
@@ -1126,7 +1182,12 @@ export default defineComponent({
                 </div>
               )}
             </div>
-            <div class={[styles.tips, data.loadingDom ? styles.hiddens : "", data.tipShow ? "" : styles.tipHidden]}>
+            <div
+              class={[styles.tips, data.loadingDom ? styles.hiddens : "", data.tipShow ? "" : styles.tipHidden]}
+              onClick={(e: any) => {
+                e.stopPropagation();
+              }}
+            >
               <div class={styles.tipTitle}>
                 <div class={styles.tipTitleName}>{fingerData.fingeringInfo.code}使用说明</div>
                 <Button class={styles.tipClose} onClick={() => (data.tipShow = false)}>
@@ -1165,6 +1226,9 @@ export default defineComponent({
               paddingTop: data.paddingTop ? data.paddingTop : "",
               paddingLeft: data.paddingLeft ? data.paddingLeft : "",
             }}
+            onClick={(e: any) => {
+              e.stopPropagation();
+            }}
           >
             <div class={styles.rightBtn}>
               {data.subject !== "melodica" && data.fingeringMode === "scaleMode" && (
@@ -1240,7 +1304,14 @@ export default defineComponent({
             </div>
           </div>
 
-          <Popup class="tonePopup" v-model:show={data.tnoteShow} position={state.platform !== IPlatform.PC && !query.modelType && fingerData.fingeringInfo.orientation === 1 ? "bottom" : "right"}>
+          <Popup
+            class="tonePopup"
+            v-model:show={data.tnoteShow}
+            position={state.platform !== IPlatform.PC && !query.modelType && fingerData.fingeringInfo.orientation === 1 ? "bottom" : "right"}
+            onClick={(e: any) => {
+              e.stopPropagation();
+            }}
+          >
             <div class={styles.tones}>
               <div class={styles.toneTitle}>
                 <div class={styles.tipTitleName}>移调</div>
@@ -1304,7 +1375,13 @@ export default defineComponent({
             </div>
           </Popup>
 
-          <Popup v-model:show={data.changeSubjectShow} class={styles.changeSubjectPopup}>
+          <Popup
+            v-model:show={data.changeSubjectShow}
+            class={styles.changeSubjectPopup}
+            onClick={(e: any) => {
+              e.stopPropagation();
+            }}
+          >
             <ChangeSubject
               subjectList={data.subjects}
               subject={data.subject}
@@ -1328,7 +1405,7 @@ export default defineComponent({
                 data.changeSubjectShow = false;
                 // 设置屏幕方向
                 setTimeout(() => {
-                  const before = ["hulusi-flute", "piccolo", "baroque-recorder"].includes(originalSubject) ? 1 : 0;
+                  const before = ["hulusi-flute", "piccolo", "baroque-recorder"].includes(originalSubject) ? 0 : 0;
                   if (orientationDirection.value !== before) {
                     data.paddingTop = "";
                     data.paddingLeft = "";

src/view/fingering/fingering-config.ts

@@ -313,18 +313,18 @@ export const matchVoicePart = (id: number | string, type: "SINGLE" | "CONCERT"):
       panpipes: "pan-flute",
       ocarina: "ocarina",
       nai: "melodica",
-	    BaroqueRecorder: 'baroque-recorder',
-      'Drum Set': 24,
-      'Marimba': 26,
-      'Vibraphone': 27,
-      'Tubular Bells': 30,
-      'Mallets': 32,
+      BaroqueRecorder: "baroque-recorder",
+      "Drum Set": 24,
+      Marimba: 26,
+      Vibraphone: 27,
+      "Tubular Bells": 30,
+      Mallets: 32,
     };
     let _track;
     if (typeof code === "string") {
       code = code.toLocaleLowerCase().replace(/ /g, "");
       for (let sKey in subject) {
-        let pitchKey = sKey
+        let pitchKey = sKey;
         if (typeof sKey === "string") pitchKey = pitchKey.toLocaleLowerCase().replace(/ /g, "");
         if (pitchKey === code) {
           _track = subject[sKey];
@@ -337,7 +337,7 @@ export const matchVoicePart = (id: number | string, type: "SINGLE" | "CONCERT"):
     return _track;
   }
   return 0;
-}
+};
 
 /** 声部的指法配置信息 */
 export const subjectFingering = (subjectId: number | string): IFingering => {
@@ -412,7 +412,7 @@ export const subjectFingering = (subjectId: number | string): IFingering => {
         name: "piccolo",
         direction: "vertical",
         width: "3rem",
-        orientation: 1,
+        orientation: 0,
         hasTizhi: true,
         id: 2,
       };
@@ -421,7 +421,7 @@ export const subjectFingering = (subjectId: number | string): IFingering => {
         name: "piccolo",
         direction: "vertical",
         width: "3rem",
-        orientation: 1,
+        orientation: 0,
         code: "竖笛",
         hasTizhi: true,
         id: 37,
@@ -431,7 +431,7 @@ export const subjectFingering = (subjectId: number | string): IFingering => {
         name: "hulusi-flute",
         direction: "vertical",
         width: "3rem",
-        orientation: 1,
+        orientation: 0,
         code: "葫芦丝",
         hasTizhi: false,
         id: 35,
@@ -473,13 +473,13 @@ export const subjectFingering = (subjectId: number | string): IFingering => {
         name: "baroque-recorder",
         direction: "vertical",
         width: "3rem",
-        orientation: 1,
+        orientation: 0,
         code: "竖笛",
         hasTizhi: true,
         id: 38,
-      };	  
+      };
     default:
-      return typeof subjectId === 'number' ? { id: subjectId } : {};
+      return typeof subjectId === "number" ? { id: subjectId } : {};
   }
 };