合并

dist/assets/index-7f57ab50.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-bf1400ac.js
+import{d as i,g as l,n as d,bc as e,c,m as r,f as s,aj as u}from"./index-d5f1a874.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,bc as e,c,m as r,f as s,aj as u}from"./index-3174c0b1.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};
+>>>>>>>> online:dist/assets/index-7f57ab50.js

dist/assets/index-8143a278.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-a33c9821.js
+import{d,l as i,n as p,m as e,w as o,J as a,f as r}from"./index-d5f1a874.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-3174c0b1.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};
+>>>>>>>> online:dist/assets/index-8143a278.js

dist/assets/index-a33c9821.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-a33c9821.js
 import{d,l as i,n as p,m as e,w as o,J as a,f as r}from"./index-d5f1a874.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-3174c0b1.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};
+>>>>>>>> online:dist/assets/index-8143a278.js

dist/assets/index-bf1400ac.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-bf1400ac.js
 import{d as i,g as l,n as d,bc as e,c,m as r,f as s,aj as u}from"./index-d5f1a874.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,bc as e,c,m as r,f as s,aj as u}from"./index-3174c0b1.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};
+>>>>>>>> online:dist/assets/index-7f57ab50.js

dist/assets/index-legacy-3942f6de.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-6aa7beab.js
+System.register(["./index-legacy-2c8dce10.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-21c02e4d.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)}}))}}}));
+>>>>>>>> online:dist/assets/index-legacy-3942f6de.js

dist/assets/index-legacy-6aa7beab.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-6aa7beab.js
 System.register(["./index-legacy-2c8dce10.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-21c02e4d.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)}}))}}}));
+>>>>>>>> online:dist/assets/index-legacy-3942f6de.js

dist/assets/index-legacy-ab7b84db.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-db1bc175.js
+System.register(["./index-legacy-2c8dce10.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.bc,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)])])}}))}}}));
+========
+System.register(["./index-legacy-21c02e4d.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.bc,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)])])}}))}}}));
+>>>>>>>> online:dist/assets/index-legacy-ab7b84db.js

dist/assets/index-legacy-db1bc175.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-db1bc175.js
 System.register(["./index-legacy-2c8dce10.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.bc,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)])])}}))}}}));
+========
+System.register(["./index-legacy-21c02e4d.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.bc,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)])])}}))}}}));
+>>>>>>>> online:dist/assets/index-legacy-ab7b84db.js

dist/colexiu.html

@@ -40,11 +40,19 @@
       },
     })
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/colexiu-c4cd7c84.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-d5f1a874.js">
   <link rel="modulepreload" crossorigin href="./assets/index-0f41b671.js">
   <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-b5e77b9f.js">
   <link rel="modulepreload" crossorigin href="./assets/index-a33c9821.js">
+=======
+  <script type="module" crossorigin src="./assets/colexiu-f1326721.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-3174c0b1.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-ae8574cc.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-3f52183c.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-8143a278.js">
+>>>>>>> online
   <link rel="stylesheet" href="./assets/index-50691166.css">
   <link rel="stylesheet" href="./assets/index-d42b0794.css">
   <link rel="stylesheet" href="./assets/colexiu-4a62fa3a.css">
@@ -58,7 +66,11 @@
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-23f2ea46.js"></script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-e3b300da.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-c8acaaf5.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> online
 </body>
 
 </html>

dist/index.html

@@ -75,12 +75,21 @@
       }
     })
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index-f77d72fd.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-d5f1a874.js">
   <link rel="modulepreload" crossorigin href="./assets/index-0f41b671.js">
   <link rel="modulepreload" crossorigin href="./assets/instruments-a1c6b3a3.js">
   <link rel="modulepreload" crossorigin href="./assets/index-a20a2f31.js">
   <link rel="modulepreload" crossorigin href="./assets/index-a33c9821.js">
+=======
+  <script type="module" crossorigin src="./assets/index-03d83425.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-3174c0b1.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-ae8574cc.js">
+  <link rel="modulepreload" crossorigin href="./assets/instruments-8e1d5759.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-f6c75a22.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-8143a278.js">
+>>>>>>> online
   <link rel="modulepreload" crossorigin href="./assets/plyr.min-ade72a33.js">
   <link rel="stylesheet" href="./assets/index-50691166.css">
   <link rel="stylesheet" href="./assets/index-d42b0794.css">
@@ -101,7 +110,11 @@
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-23f2ea46.js"></script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-4741a0ae.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-0da514eb.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> online
 </body>
 
 </html>

dist/instrument.html

@@ -42,12 +42,21 @@
     }
 
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/instrument-f948ae33.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-d5f1a874.js">
   <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-b5e77b9f.js">
   <link rel="modulepreload" crossorigin href="./assets/index-0f41b671.js">
   <link rel="modulepreload" crossorigin href="./assets/instruments-a1c6b3a3.js">
   <link rel="modulepreload" crossorigin href="./assets/index-d0e99593.js">
+=======
+  <script type="module" crossorigin src="./assets/instrument-4c52bd2d.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-3174c0b1.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-3f52183c.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-ae8574cc.js">
+  <link rel="modulepreload" crossorigin href="./assets/instruments-8e1d5759.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-d21a14b5.js">
+>>>>>>> online
   <link rel="stylesheet" href="./assets/index-50691166.css">
   <link rel="stylesheet" href="./assets/index-d42b0794.css">
   <link rel="stylesheet" href="./assets/instrument-1df403a6.css">
@@ -61,7 +70,11 @@
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-23f2ea46.js"></script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/instrument-legacy-a1fe6ec6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/instrument-legacy-79fbedd8.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> online
 </body>
 
 </html>

dist/orchestra.html

@@ -41,6 +41,7 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/orchestra-0741387f.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-d5f1a874.js">
   <link rel="modulepreload" crossorigin href="./assets/index-0f41b671.js">
@@ -48,6 +49,15 @@
   <link rel="modulepreload" crossorigin href="./assets/index-a20a2f31.js">
   <link rel="modulepreload" crossorigin href="./assets/index-a33c9821.js">
   <link rel="modulepreload" crossorigin href="./assets/index-d0e99593.js">
+=======
+  <script type="module" crossorigin src="./assets/orchestra-e1160cac.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-3174c0b1.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-ae8574cc.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-3f52183c.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-f6c75a22.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-8143a278.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-d21a14b5.js">
+>>>>>>> online
   <link rel="stylesheet" href="./assets/index-50691166.css">
   <link rel="stylesheet" href="./assets/index-d42b0794.css">
   <link rel="stylesheet" href="./assets/index-85f95688.css">
@@ -73,7 +83,11 @@
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-23f2ea46.js"></script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-b9170529.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-f06062c0.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> online
 </body>
 
 </html>

dist/report-share.html

@@ -25,8 +25,13 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/report-share-677250d5.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-d5f1a874.js">
+=======
+  <script type="module" crossorigin src="./assets/report-share-4f06c3ab.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-3174c0b1.js">
+>>>>>>> online
   <link rel="modulepreload" crossorigin href="./assets/plyr.min-ade72a33.js">
   <link rel="stylesheet" href="./assets/index-50691166.css">
   <link rel="stylesheet" href="./assets/plyr-aeb30ba4.css">
@@ -52,7 +57,11 @@
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-23f2ea46.js"></script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-c7f2d9a6.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-47e92310.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> online
 </body>
 
 </html>

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

@@ -380,6 +380,9 @@ export default defineComponent({
         window.close();
         return;
       }
+
+      // 返回的时候默认横屏
+      api_setRequestedOrientation(0);
       api_back();
     };