从新提价

1

dist/assets/index-0890fbb0.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-0890fbb0.js
 import{d as f,F as y,V as h,by as r,M as w,U as v,ao as T,j as i,aJ as b,A as _,aq as S}from"./index-0c30d8f3.js";import{s as L}from"./instrument-cdb8431b.js";import"./vue3-lottie.es-a82c1ad0.js";import"./index-abf541bd.js";import"./index-28526a4c.js";import"./index-f63bd93e.js";const x="_skeleton_vtlsh_1",A="_detail_vtlsh_12",N="_container_vtlsh_20",c={skeleton:x,detail:A,container:N},C=f({name:"music-list",setup(){const d=y(),a="productRenderType",e=h({isLoading:!0,isProductLoading:!1,step:0,product:[{state:!1,name:"五线谱",type:r.staff,base64:""},{state:!1,name:"首调",type:r.firstTone,base64:""},{state:!1,name:"固定调",type:r.fixedTone,base64:""}]});w(()=>{window.appName="colexiu",v.xmlUrl=d.xmlUrl,sessionStorage.setItem(a,e.product[e.step].type),T({message:"生成中",duration:0}),setTimeout(()=>{e.isLoading=!1},500)});const p=async()=>{var t;e.product[e.step].state=!0,e.product[e.step].base64=await l();try{console.log(JSON.parse(JSON.stringify(e.product)),e.step)}catch(n){}if(e.step+=1,e.step!==e.product.length){sessionStorage.setItem(a,e.product[e.step].type),_(()=>{e.isLoading=!0,setTimeout(()=>{e.isLoading=!1},500)});return}S(),console.log(e.product),(t=window.parent)==null||t.postMessage({api:"webApi_renderSvg",product:JSON.stringify(e.product)},"*")},l=()=>new Promise(t=>{setTimeout(async()=>{var n;try{const s=(n=document.getElementById("osmdSvgPage1"))==null?void 0:n.cloneNode(!0);if(!s){t("");return}const u=s.width.animVal.value,m=s.height.animVal.value,o=document.createElementNS("http://www.w3.org/2000/svg","rect");o.setAttribute("x","0"),o.setAttribute("y","0"),o.setAttribute("width",`${u*2}`),o.setAttribute("height",`${m*2}`),o.setAttribute("fill","#fff"),s.prepend(o);const g=L(s.outerHTML).toDataURL("image/png",1);t(g)}catch(s){t("")}},500)});return()=>i("div",{class:c.detail},[i("div",{id:"scrollContainer",class:[c.container,"hideCursor"]},[!e.isLoading&&i(b,{renderTypeKey:a,showSelection:!1,onRendered:p},null)])])}});export{C as default};
+========
+import{d as f,F as y,V as h,bx as r,M as w,U as v,ao as T,j as i,aJ as b,A as _,aq as S}from"./index-a3304b3b.js";import{s as x}from"./instrument-19bd8ae8.js";import"./vue3-lottie.es-d9098ac0.js";import"./index-aeda5d76.js";import"./index-d54d9301.js";import"./index-863cb74d.js";const L="_skeleton_vtlsh_1",A="_detail_vtlsh_12",N="_container_vtlsh_20",c={skeleton:L,detail:A,container:N},C=f({name:"music-list",setup(){const d=y(),a="productRenderType",e=h({isLoading:!0,isProductLoading:!1,step:0,product:[{state:!1,name:"五线谱",type:r.staff,base64:""},{state:!1,name:"首调",type:r.firstTone,base64:""},{state:!1,name:"固定调",type:r.fixedTone,base64:""}]});w(()=>{window.appName="colexiu",v.xmlUrl=d.xmlUrl,sessionStorage.setItem(a,e.product[e.step].type),T({message:"生成中",duration:0}),setTimeout(()=>{e.isLoading=!1},500)});const p=async()=>{var t;e.product[e.step].state=!0,e.product[e.step].base64=await l();try{console.log(JSON.parse(JSON.stringify(e.product)),e.step)}catch(n){}if(e.step+=1,e.step!==e.product.length){sessionStorage.setItem(a,e.product[e.step].type),_(()=>{e.isLoading=!0,setTimeout(()=>{e.isLoading=!1},500)});return}S(),console.log(e.product),(t=window.parent)==null||t.postMessage({api:"webApi_renderSvg",product:JSON.stringify(e.product)},"*")},l=()=>new Promise(t=>{setTimeout(async()=>{var n;try{const s=(n=document.getElementById("osmdSvgPage1"))==null?void 0:n.cloneNode(!0);if(!s){t("");return}const u=s.width.animVal.value,m=s.height.animVal.value,o=document.createElementNS("http://www.w3.org/2000/svg","rect");o.setAttribute("x","0"),o.setAttribute("y","0"),o.setAttribute("width",`${u*2}`),o.setAttribute("height",`${m*2}`),o.setAttribute("fill","#fff"),s.prepend(o);const g=x(s.outerHTML).toDataURL("image/png",1);t(g)}catch(s){t("")}},500)});return()=>i("div",{class:c.detail},[i("div",{id:"scrollContainer",class:[c.container,"hideCursor"]},[!e.isLoading&&i(b,{renderTypeKey:a,showSelection:!1,onRendered:p},null)])])}});export{C as default};
+>>>>>>>> guide:dist/assets/index-4e43b61d.js

dist/assets/index-17768769.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-17768769.js
 import{d as i,F as l,V as d,by as e,M as r,U as c,j as s,aJ as u}from"./index-0c30d8f3.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,container:p},_=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:""}]});r(()=>{window.appName="colexiu",c.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{_ as default};
+========
+import{d as i,F as l,V as d,bx as e,M as r,U as c,j as s,aJ as u}from"./index-a3304b3b.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:""}]});r(()=>{window.appName="colexiu",c.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};
+>>>>>>>> guide:dist/assets/index-491b7947.js

dist/assets/index-1e57f80a.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-3e6ffe0e.js
+import{d,r as i,V as p,U as e,x as r,j as o,af as n}from"./index-0c30d8f3.js";const c=d({name:"measureSpeed",setup(){const s=i(!1),t=p({speed:e.speed,originSpeed:e.originSpeed});return r(()=>e.section.length,()=>{if(e.modeType==="practise"){if(!s.value&&e.section.length===2){s.value=!0,t.speed=e.speed;const a=e.section[0].beatSpeed;e.originSpeed=a,n(a)}s.value&&e.section.length===0&&(s.value=!1,e.originSpeed=t.originSpeed,n(t.speed))}}),()=>o("div",null,null)}});export{c as M};
+========
+import{d,r as i,V as p,U as e,x as r,j as o,af as n}from"./index-a3304b3b.js";const c=d({name:"measureSpeed",setup(){const s=i(!1),t=p({speed:e.speed,originSpeed:e.originSpeed});return r(()=>e.section.length,()=>{if(e.modeType==="practise"){if(!s.value&&e.section.length===2){s.value=!0,t.speed=e.speed;const a=e.section[0].beatSpeed;e.originSpeed=a,n(a)}s.value&&e.section.length===0&&(s.value=!1,e.originSpeed=t.originSpeed,n(t.speed))}}),()=>o("div",null,null)}});export{c as M};
+>>>>>>>> guide:dist/assets/index-1e57f80a.js

dist/assets/index-3e6ffe0e.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-3e6ffe0e.js
 import{d,r as i,V as p,U as e,x as r,j as o,af as n}from"./index-0c30d8f3.js";const c=d({name:"measureSpeed",setup(){const s=i(!1),t=p({speed:e.speed,originSpeed:e.originSpeed});return r(()=>e.section.length,()=>{if(e.modeType==="practise"){if(!s.value&&e.section.length===2){s.value=!0,t.speed=e.speed;const a=e.section[0].beatSpeed;e.originSpeed=a,n(a)}s.value&&e.section.length===0&&(s.value=!1,e.originSpeed=t.originSpeed,n(t.speed))}}),()=>o("div",null,null)}});export{c as M};
+========
+import{d,r as i,V as p,U as e,x as r,j as o,af as n}from"./index-a3304b3b.js";const c=d({name:"measureSpeed",setup(){const s=i(!1),t=p({speed:e.speed,originSpeed:e.originSpeed});return r(()=>e.section.length,()=>{if(e.modeType==="practise"){if(!s.value&&e.section.length===2){s.value=!0,t.speed=e.speed;const a=e.section[0].beatSpeed;e.originSpeed=a,n(a)}s.value&&e.section.length===0&&(s.value=!1,e.originSpeed=t.originSpeed,n(t.speed))}}),()=>o("div",null,null)}});export{c as M};
+>>>>>>>> guide:dist/assets/index-1e57f80a.js

dist/assets/index-491b7947.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-17768769.js
+import{d as i,F as l,V as d,by as e,M as r,U as c,j as s,aJ as u}from"./index-0c30d8f3.js";const f="_skeleton_vtlsh_1",m="_detail_vtlsh_12",p="_container_vtlsh_20",a={skeleton:f,detail:m,container:p},_=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:""}]});r(()=>{window.appName="colexiu",c.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{_ as default};
+========
+import{d as i,F as l,V as d,bx as e,M as r,U as c,j as s,aJ as u}from"./index-a3304b3b.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:""}]});r(()=>{window.appName="colexiu",c.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};
+>>>>>>>> guide:dist/assets/index-491b7947.js

dist/assets/index-4e43b61d.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-0890fbb0.js
+import{d as f,F as y,V as h,by as r,M as w,U as v,ao as T,j as i,aJ as b,A as _,aq as S}from"./index-0c30d8f3.js";import{s as L}from"./instrument-cdb8431b.js";import"./vue3-lottie.es-a82c1ad0.js";import"./index-abf541bd.js";import"./index-28526a4c.js";import"./index-f63bd93e.js";const x="_skeleton_vtlsh_1",A="_detail_vtlsh_12",N="_container_vtlsh_20",c={skeleton:x,detail:A,container:N},C=f({name:"music-list",setup(){const d=y(),a="productRenderType",e=h({isLoading:!0,isProductLoading:!1,step:0,product:[{state:!1,name:"五线谱",type:r.staff,base64:""},{state:!1,name:"首调",type:r.firstTone,base64:""},{state:!1,name:"固定调",type:r.fixedTone,base64:""}]});w(()=>{window.appName="colexiu",v.xmlUrl=d.xmlUrl,sessionStorage.setItem(a,e.product[e.step].type),T({message:"生成中",duration:0}),setTimeout(()=>{e.isLoading=!1},500)});const p=async()=>{var t;e.product[e.step].state=!0,e.product[e.step].base64=await l();try{console.log(JSON.parse(JSON.stringify(e.product)),e.step)}catch(n){}if(e.step+=1,e.step!==e.product.length){sessionStorage.setItem(a,e.product[e.step].type),_(()=>{e.isLoading=!0,setTimeout(()=>{e.isLoading=!1},500)});return}S(),console.log(e.product),(t=window.parent)==null||t.postMessage({api:"webApi_renderSvg",product:JSON.stringify(e.product)},"*")},l=()=>new Promise(t=>{setTimeout(async()=>{var n;try{const s=(n=document.getElementById("osmdSvgPage1"))==null?void 0:n.cloneNode(!0);if(!s){t("");return}const u=s.width.animVal.value,m=s.height.animVal.value,o=document.createElementNS("http://www.w3.org/2000/svg","rect");o.setAttribute("x","0"),o.setAttribute("y","0"),o.setAttribute("width",`${u*2}`),o.setAttribute("height",`${m*2}`),o.setAttribute("fill","#fff"),s.prepend(o);const g=L(s.outerHTML).toDataURL("image/png",1);t(g)}catch(s){t("")}},500)});return()=>i("div",{class:c.detail},[i("div",{id:"scrollContainer",class:[c.container,"hideCursor"]},[!e.isLoading&&i(b,{renderTypeKey:a,showSelection:!1,onRendered:p},null)])])}});export{C as default};
+========
+import{d as f,F as y,V as h,bx as r,M as w,U as v,ao as T,j as i,aJ as b,A as _,aq as S}from"./index-a3304b3b.js";import{s as x}from"./instrument-19bd8ae8.js";import"./vue3-lottie.es-d9098ac0.js";import"./index-aeda5d76.js";import"./index-d54d9301.js";import"./index-863cb74d.js";const L="_skeleton_vtlsh_1",A="_detail_vtlsh_12",N="_container_vtlsh_20",c={skeleton:L,detail:A,container:N},C=f({name:"music-list",setup(){const d=y(),a="productRenderType",e=h({isLoading:!0,isProductLoading:!1,step:0,product:[{state:!1,name:"五线谱",type:r.staff,base64:""},{state:!1,name:"首调",type:r.firstTone,base64:""},{state:!1,name:"固定调",type:r.fixedTone,base64:""}]});w(()=>{window.appName="colexiu",v.xmlUrl=d.xmlUrl,sessionStorage.setItem(a,e.product[e.step].type),T({message:"生成中",duration:0}),setTimeout(()=>{e.isLoading=!1},500)});const p=async()=>{var t;e.product[e.step].state=!0,e.product[e.step].base64=await l();try{console.log(JSON.parse(JSON.stringify(e.product)),e.step)}catch(n){}if(e.step+=1,e.step!==e.product.length){sessionStorage.setItem(a,e.product[e.step].type),_(()=>{e.isLoading=!0,setTimeout(()=>{e.isLoading=!1},500)});return}S(),console.log(e.product),(t=window.parent)==null||t.postMessage({api:"webApi_renderSvg",product:JSON.stringify(e.product)},"*")},l=()=>new Promise(t=>{setTimeout(async()=>{var n;try{const s=(n=document.getElementById("osmdSvgPage1"))==null?void 0:n.cloneNode(!0);if(!s){t("");return}const u=s.width.animVal.value,m=s.height.animVal.value,o=document.createElementNS("http://www.w3.org/2000/svg","rect");o.setAttribute("x","0"),o.setAttribute("y","0"),o.setAttribute("width",`${u*2}`),o.setAttribute("height",`${m*2}`),o.setAttribute("fill","#fff"),s.prepend(o);const g=x(s.outerHTML).toDataURL("image/png",1);t(g)}catch(s){t("")}},500)});return()=>i("div",{class:c.detail},[i("div",{id:"scrollContainer",class:[c.container,"hideCursor"]},[!e.isLoading&&i(b,{renderTypeKey:a,showSelection:!1,onRendered:p},null)])])}});export{C as default};
+>>>>>>>> guide:dist/assets/index-4e43b61d.js

dist/assets/index-863cb74d.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-f63bd93e.js
+import{c as C,o as E,q as L,t as w,d as B,r as h,bD as R,x as m,bE as N,M as F,g as M,h as _,j as r,A as j,bF as b,bG as q,L as y,C as A}from"./index-0c30d8f3.js";import{u as D}from"./index-abf541bd.js";const[G,o,H]=C("list"),I={error:Boolean,offset:E(300),loading:Boolean,disabled:Boolean,finished:Boolean,errorText:String,direction:L("down"),loadingText:String,finishedText:String,immediateCheck:w};var U=B({name:G,props:I,emits:["load","update:error","update:loading"],setup(e,{emit:c,slots:a}){const d=h(e.loading),u=h(),g=h(),s=D(),x=R(u),n=()=>{j(()=>{if(d.value||e.finished||e.disabled||e.error||(s==null?void 0:s.value)===!1)return;const{direction:t}=e,l=+e.offset,i=b(x);if(!i.height||q(u))return;let f=!1;const v=b(g);t==="up"?f=i.top-v.top<=l:f=v.bottom-i.bottom<=l,f&&(d.value=!0,c("update:loading",!0),c("load"))})},T=()=>{if(e.finished){const t=a.finished?a.finished():e.finishedText;if(t)return r("div",{class:o("finished-text")},[t])}},k=()=>{c("update:error",!1),n()},P=()=>{if(e.error){const t=a.error?a.error():e.errorText;if(t)return r("div",{role:"button",class:o("error-text"),tabindex:0,onClick:k},[t])}},S=()=>{if(d.value&&!e.finished&&!e.disabled)return r("div",{class:o("loading")},[a.loading?a.loading():r(y,{class:o("loading-icon")},{default:()=>[e.loadingText||H("loading")]})])};return m(()=>[e.loading,e.finished,e.error],n),s&&m(s,t=>{t&&n()}),N(()=>{d.value=e.loading}),F(()=>{e.immediateCheck&&n()}),M({check:n}),_("scroll",n,{target:x,passive:!0}),()=>{var t;const l=(t=a.default)==null?void 0:t.call(a),i=r("div",{ref:g,class:o("placeholder")},null);return r("div",{ref:u,role:"feed",class:o(),"aria-busy":d.value},[e.direction==="down"?l:i,S(),T(),P(),e.direction==="up"?l:i])}}});const J=A(U);export{J as L};
+========
+import{c as S,o as E,q as L,t as w,d as B,r as h,bC as R,x as m,bD as N,M as F,g as M,h as _,j as r,A as j,bE as b,bF as q,L as y,C as A}from"./index-a3304b3b.js";import{u as D}from"./index-aeda5d76.js";const[H,o,I]=S("list"),U={error:Boolean,offset:E(300),loading:Boolean,disabled:Boolean,finished:Boolean,errorText:String,direction:L("down"),loadingText:String,finishedText:String,immediateCheck:w};var V=B({name:H,props:U,emits:["load","update:error","update:loading"],setup(e,{emit:c,slots:a}){const d=h(e.loading),u=h(),g=h(),s=D(),x=R(u),n=()=>{j(()=>{if(d.value||e.finished||e.disabled||e.error||(s==null?void 0:s.value)===!1)return;const{direction:t}=e,l=+e.offset,i=b(x);if(!i.height||q(u))return;let f=!1;const v=b(g);t==="up"?f=i.top-v.top<=l:f=v.bottom-i.bottom<=l,f&&(d.value=!0,c("update:loading",!0),c("load"))})},T=()=>{if(e.finished){const t=a.finished?a.finished():e.finishedText;if(t)return r("div",{class:o("finished-text")},[t])}},k=()=>{c("update:error",!1),n()},P=()=>{if(e.error){const t=a.error?a.error():e.errorText;if(t)return r("div",{role:"button",class:o("error-text"),tabindex:0,onClick:k},[t])}},C=()=>{if(d.value&&!e.finished&&!e.disabled)return r("div",{class:o("loading")},[a.loading?a.loading():r(y,{class:o("loading-icon")},{default:()=>[e.loadingText||I("loading")]})])};return m(()=>[e.loading,e.finished,e.error],n),s&&m(s,t=>{t&&n()}),N(()=>{d.value=e.loading}),F(()=>{e.immediateCheck&&n()}),M({check:n}),_("scroll",n,{target:x,passive:!0}),()=>{var t;const l=(t=a.default)==null?void 0:t.call(a),i=r("div",{ref:g,class:o("placeholder")},null);return r("div",{ref:u,role:"feed",class:o(),"aria-busy":d.value},[e.direction==="down"?l:i,C(),T(),P(),e.direction==="up"?l:i])}}});const J=A(V);export{J as L};
+>>>>>>>> guide:dist/assets/index-863cb74d.js

dist/assets/index-f63bd93e.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-f63bd93e.js
 import{c as C,o as E,q as L,t as w,d as B,r as h,bD as R,x as m,bE as N,M as F,g as M,h as _,j as r,A as j,bF as b,bG as q,L as y,C as A}from"./index-0c30d8f3.js";import{u as D}from"./index-abf541bd.js";const[G,o,H]=C("list"),I={error:Boolean,offset:E(300),loading:Boolean,disabled:Boolean,finished:Boolean,errorText:String,direction:L("down"),loadingText:String,finishedText:String,immediateCheck:w};var U=B({name:G,props:I,emits:["load","update:error","update:loading"],setup(e,{emit:c,slots:a}){const d=h(e.loading),u=h(),g=h(),s=D(),x=R(u),n=()=>{j(()=>{if(d.value||e.finished||e.disabled||e.error||(s==null?void 0:s.value)===!1)return;const{direction:t}=e,l=+e.offset,i=b(x);if(!i.height||q(u))return;let f=!1;const v=b(g);t==="up"?f=i.top-v.top<=l:f=v.bottom-i.bottom<=l,f&&(d.value=!0,c("update:loading",!0),c("load"))})},T=()=>{if(e.finished){const t=a.finished?a.finished():e.finishedText;if(t)return r("div",{class:o("finished-text")},[t])}},k=()=>{c("update:error",!1),n()},P=()=>{if(e.error){const t=a.error?a.error():e.errorText;if(t)return r("div",{role:"button",class:o("error-text"),tabindex:0,onClick:k},[t])}},S=()=>{if(d.value&&!e.finished&&!e.disabled)return r("div",{class:o("loading")},[a.loading?a.loading():r(y,{class:o("loading-icon")},{default:()=>[e.loadingText||H("loading")]})])};return m(()=>[e.loading,e.finished,e.error],n),s&&m(s,t=>{t&&n()}),N(()=>{d.value=e.loading}),F(()=>{e.immediateCheck&&n()}),M({check:n}),_("scroll",n,{target:x,passive:!0}),()=>{var t;const l=(t=a.default)==null?void 0:t.call(a),i=r("div",{ref:g,class:o("placeholder")},null);return r("div",{ref:u,role:"feed",class:o(),"aria-busy":d.value},[e.direction==="down"?l:i,S(),T(),P(),e.direction==="up"?l:i])}}});const J=A(U);export{J as L};
+========
+import{c as S,o as E,q as L,t as w,d as B,r as h,bC as R,x as m,bD as N,M as F,g as M,h as _,j as r,A as j,bE as b,bF as q,L as y,C as A}from"./index-a3304b3b.js";import{u as D}from"./index-aeda5d76.js";const[H,o,I]=S("list"),U={error:Boolean,offset:E(300),loading:Boolean,disabled:Boolean,finished:Boolean,errorText:String,direction:L("down"),loadingText:String,finishedText:String,immediateCheck:w};var V=B({name:H,props:U,emits:["load","update:error","update:loading"],setup(e,{emit:c,slots:a}){const d=h(e.loading),u=h(),g=h(),s=D(),x=R(u),n=()=>{j(()=>{if(d.value||e.finished||e.disabled||e.error||(s==null?void 0:s.value)===!1)return;const{direction:t}=e,l=+e.offset,i=b(x);if(!i.height||q(u))return;let f=!1;const v=b(g);t==="up"?f=i.top-v.top<=l:f=v.bottom-i.bottom<=l,f&&(d.value=!0,c("update:loading",!0),c("load"))})},T=()=>{if(e.finished){const t=a.finished?a.finished():e.finishedText;if(t)return r("div",{class:o("finished-text")},[t])}},k=()=>{c("update:error",!1),n()},P=()=>{if(e.error){const t=a.error?a.error():e.errorText;if(t)return r("div",{role:"button",class:o("error-text"),tabindex:0,onClick:k},[t])}},C=()=>{if(d.value&&!e.finished&&!e.disabled)return r("div",{class:o("loading")},[a.loading?a.loading():r(y,{class:o("loading-icon")},{default:()=>[e.loadingText||I("loading")]})])};return m(()=>[e.loading,e.finished,e.error],n),s&&m(s,t=>{t&&n()}),N(()=>{d.value=e.loading}),F(()=>{e.immediateCheck&&n()}),M({check:n}),_("scroll",n,{target:x,passive:!0}),()=>{var t;const l=(t=a.default)==null?void 0:t.call(a),i=r("div",{ref:g,class:o("placeholder")},null);return r("div",{ref:u,role:"feed",class:o(),"aria-busy":d.value},[e.direction==="down"?l:i,C(),T(),P(),e.direction==="up"?l:i])}}});const J=A(V);export{J as L};
+>>>>>>>> guide:dist/assets/index-863cb74d.js

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

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-2aee5021.js
 System.register(["./index-legacy-b3823d1d.js"],(function(e,n){"use strict";var i,t,s,r,d,p,o;return{setters:[e=>{i=e.d,t=e.r,s=e.V,r=e.U,d=e.x,p=e.j,o=e.af}],execute:function(){e("M",i({name:"measureSpeed",setup(){const e=t(!1),n=s({speed:r.speed,originSpeed:r.originSpeed});return d((()=>r.section.length),(()=>{if("practise"===r.modeType){if(!e.value&&2===r.section.length){e.value=!0,n.speed=r.speed;const i=r.section[0].beatSpeed;r.originSpeed=i,o(i)}e.value&&0===r.section.length&&(e.value=!1,r.originSpeed=n.originSpeed,o(n.speed))}})),()=>p("div",null,null)}}))}}}));
+========
+System.register(["./index-legacy-d969a31f.js"],(function(e,n){"use strict";var i,t,s,r,d,p,o;return{setters:[e=>{i=e.d,t=e.r,s=e.V,r=e.U,d=e.x,p=e.j,o=e.af}],execute:function(){e("M",i({name:"measureSpeed",setup(){const e=t(!1),n=s({speed:r.speed,originSpeed:r.originSpeed});return d((()=>r.section.length),(()=>{if("practise"===r.modeType){if(!e.value&&2===r.section.length){e.value=!0,n.speed=r.speed;const i=r.section[0].beatSpeed;r.originSpeed=i,o(i)}e.value&&0===r.section.length&&(e.value=!1,r.originSpeed=n.originSpeed,o(n.speed))}})),()=>p("div",null,null)}}))}}}));
+>>>>>>>> guide:dist/assets/index-legacy-55cabd0b.js

dist/assets/index-legacy-55cabd0b.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-2aee5021.js
+System.register(["./index-legacy-b3823d1d.js"],(function(e,n){"use strict";var i,t,s,r,d,p,o;return{setters:[e=>{i=e.d,t=e.r,s=e.V,r=e.U,d=e.x,p=e.j,o=e.af}],execute:function(){e("M",i({name:"measureSpeed",setup(){const e=t(!1),n=s({speed:r.speed,originSpeed:r.originSpeed});return d((()=>r.section.length),(()=>{if("practise"===r.modeType){if(!e.value&&2===r.section.length){e.value=!0,n.speed=r.speed;const i=r.section[0].beatSpeed;r.originSpeed=i,o(i)}e.value&&0===r.section.length&&(e.value=!1,r.originSpeed=n.originSpeed,o(n.speed))}})),()=>p("div",null,null)}}))}}}));
+========
+System.register(["./index-legacy-d969a31f.js"],(function(e,n){"use strict";var i,t,s,r,d,p,o;return{setters:[e=>{i=e.d,t=e.r,s=e.V,r=e.U,d=e.x,p=e.j,o=e.af}],execute:function(){e("M",i({name:"measureSpeed",setup(){const e=t(!1),n=s({speed:r.speed,originSpeed:r.originSpeed});return d((()=>r.section.length),(()=>{if("practise"===r.modeType){if(!e.value&&2===r.section.length){e.value=!0,n.speed=r.speed;const i=r.section[0].beatSpeed;r.originSpeed=i,o(i)}e.value&&0===r.section.length&&(e.value=!1,r.originSpeed=n.originSpeed,o(n.speed))}})),()=>p("div",null,null)}}))}}}));
+>>>>>>>> guide:dist/assets/index-legacy-55cabd0b.js

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

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-92b3801a.js
+System.register(["./index-legacy-b3823d1d.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.F,a=e.V,o=e.by,r=e.M,s=e.U,d=e.j,l=e.aJ}],execute:function(){const t="_detail_vtlsh_12",c="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),i=a({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:o.staff,base64:""},{state:!1,name:"首调",type:o.firstTone,base64:""},{state:!1,name:"固定调",type:o.fixedTone,base64:""}]});r((()=>{window.appName="colexiu",s.xmlUrl=e.xmlUrl,i.isLoading=!1}));const h=async()=>{console.log("渲染完成")};return()=>d("div",{class:t},[d("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&d(l,{onRendered:h},null)])])}}))}}}));
+========
+System.register(["./index-legacy-d969a31f.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.F,a=e.V,o=e.bx,r=e.M,s=e.U,d=e.j,l=e.aJ}],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)])])}}))}}}));
+>>>>>>>> guide:dist/assets/index-legacy-6cdd9d37.js

dist/assets/index-legacy-92b3801a.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-92b3801a.js
 System.register(["./index-legacy-b3823d1d.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.F,a=e.V,o=e.by,r=e.M,s=e.U,d=e.j,l=e.aJ}],execute:function(){const t="_detail_vtlsh_12",c="_container_vtlsh_20";e("default",i({name:"music-list",setup(){const e=n(),i=a({isLoading:!0,isProductLoading:!1,product:[{state:!1,name:"五线谱",type:o.staff,base64:""},{state:!1,name:"首调",type:o.firstTone,base64:""},{state:!1,name:"固定调",type:o.fixedTone,base64:""}]});r((()=>{window.appName="colexiu",s.xmlUrl=e.xmlUrl,i.isLoading=!1}));const h=async()=>{console.log("渲染完成")};return()=>d("div",{class:t},[d("div",{id:"scrollContainer",class:[c,"hideCursor"]},[!i.isLoading&&d(l,{onRendered:h},null)])])}}))}}}));
+========
+System.register(["./index-legacy-d969a31f.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.F,a=e.V,o=e.bx,r=e.M,s=e.U,d=e.j,l=e.aJ}],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)])])}}))}}}));
+>>>>>>>> guide:dist/assets/index-legacy-6cdd9d37.js

dist/assets/index-legacy-e3d848f8.js

@@ -0,0 +1 @@
+System.register(["./index-legacy-d969a31f.js","./index-legacy-6f21d124.js"],(function(e,i){"use strict";var r,t,o,n,d,l,a,s,c,u,f,g,h,v,p,x,b,m,T;return{setters:[e=>{r=e.c,t=e.o,o=e.q,n=e.t,d=e.d,l=e.r,a=e.bC,s=e.x,c=e.bD,u=e.M,f=e.g,g=e.h,h=e.j,v=e.A,p=e.bE,x=e.bF,b=e.L,m=e.C},e=>{T=e.u}],execute:function(){const[i,C,k]=r("list"),y={error:Boolean,offset:t(300),loading:Boolean,disabled:Boolean,finished:Boolean,errorText:String,direction:o("down"),loadingText:String,finishedText:String,immediateCheck:n};var B=d({name:i,props:y,emits:["load","update:error","update:loading"],setup(e,{emit:i,slots:r}){const t=l(e.loading),o=l(),n=l(),d=T(),m=a(o),y=()=>{v((()=>{if(t.value||e.finished||e.disabled||e.error||!1===(null==d?void 0:d.value))return;const{direction:r}=e,l=+e.offset,a=p(m);if(!a.height||x(o))return;let s=!1;const c=p(n);s="up"===r?a.top-c.top<=l:c.bottom-a.bottom<=l,s&&(t.value=!0,i("update:loading",!0),i("load"))}))},B=()=>{if(e.finished){const i=r.finished?r.finished():e.finishedText;if(i)return h("div",{class:C("finished-text")},[i])}},S=()=>{i("update:error",!1),y()},j=()=>{if(e.error){const i=r.error?r.error():e.errorText;if(i)return h("div",{role:"button",class:C("error-text"),tabindex:0,onClick:S},[i])}},w=()=>{if(t.value&&!e.finished&&!e.disabled)return h("div",{class:C("loading")},[r.loading?r.loading():h(b,{class:C("loading-icon")},{default:()=>[e.loadingText||k("loading")]})])};return s((()=>[e.loading,e.finished,e.error]),y),d&&s(d,(e=>{e&&y()})),c((()=>{t.value=e.loading})),u((()=>{e.immediateCheck&&y()})),f({check:y}),g("scroll",y,{target:m,passive:!0}),()=>{var i;const d=null==(i=r.default)?void 0:i.call(r),l=h("div",{ref:n,class:C("placeholder")},null);return h("div",{ref:o,role:"feed",class:C(),"aria-busy":t.value},["down"===e.direction?d:l,w(),B(),j(),"up"===e.direction?d:l])}}});e("L",m(B))}}}));

dist/colexiu.html

@@ -2,7 +2,11 @@
 <html lang="en">
 
 <head>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/polyfills-80e475eb.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/polyfills-0bd9780b.js"></script>
+>>>>>>> guide
 
   <meta charset="UTF-8" />
   <link rel="icon" type="image/svg+xml" href="./vite.svg" />
@@ -40,11 +44,19 @@
       },
     })
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/colexiu-7af6f73b.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-0c30d8f3.js">
   <link rel="modulepreload" crossorigin href="./assets/index-abf541bd.js">
   <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-a82c1ad0.js">
   <link rel="modulepreload" crossorigin href="./assets/index-3e6ffe0e.js">
+=======
+  <script type="module" crossorigin src="./assets/colexiu-613b2a1f.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-a3304b3b.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-aeda5d76.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-d9098ac0.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-1e57f80a.js">
+>>>>>>> guide
   <link rel="stylesheet" href="./assets/index-96ddda46.css">
   <link rel="stylesheet" href="./assets/index-d2e7eb5d.css">
   <link rel="stylesheet" href="./assets/colexiu-4a62fa3a.css">
@@ -57,8 +69,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-00986d5e.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-b06d6d2b.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-62d16c43.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/colexiu-legacy-4e69bbee.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> guide
 </body>
 
 </html>

dist/index.html

@@ -2,7 +2,11 @@
 <html lang="ZH-cn">
 
 <head>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/polyfills-80e475eb.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/polyfills-0bd9780b.js"></script>
+>>>>>>> guide
 
   <meta charset="UTF-8">
   <link rel="icon" href="./favicon.ico" />
@@ -75,12 +79,21 @@
       }
     })
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index-8b35666b.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-0c30d8f3.js">
   <link rel="modulepreload" crossorigin href="./assets/index-abf541bd.js">
   <link rel="modulepreload" crossorigin href="./assets/index-f63bd93e.js">
   <link rel="modulepreload" crossorigin href="./assets/index-3dd38958.js">
   <link rel="modulepreload" crossorigin href="./assets/index-3e6ffe0e.js">
+=======
+  <script type="module" crossorigin src="./assets/index-a08f3ff2.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-a3304b3b.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-aeda5d76.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-863cb74d.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-d85c10c3.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-1e57f80a.js">
+>>>>>>> guide
   <link rel="modulepreload" crossorigin href="./assets/plyr.min-424cfb91.js">
   <link rel="stylesheet" href="./assets/index-96ddda46.css">
   <link rel="stylesheet" href="./assets/index-d2e7eb5d.css">
@@ -100,8 +113,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-00986d5e.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-621424cc.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-62d16c43.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-064c34ab.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> guide
 </body>
 
 </html>

dist/instrument.html

@@ -2,7 +2,11 @@
 <html lang="en">
 
 <head>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/polyfills-80e475eb.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/polyfills-0bd9780b.js"></script>
+>>>>>>> guide
 
   <meta charset="UTF-8" />
   <meta name="viewport"
@@ -38,12 +42,21 @@
       },
     })
   </script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/instrument-cdb8431b.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-0c30d8f3.js">
   <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-a82c1ad0.js">
   <link rel="modulepreload" crossorigin href="./assets/index-abf541bd.js">
   <link rel="modulepreload" crossorigin href="./assets/index-28526a4c.js">
   <link rel="modulepreload" crossorigin href="./assets/index-f63bd93e.js">
+=======
+  <script type="module" crossorigin src="./assets/instrument-19bd8ae8.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-a3304b3b.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-d9098ac0.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-aeda5d76.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-d54d9301.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-863cb74d.js">
+>>>>>>> guide
   <link rel="stylesheet" href="./assets/index-96ddda46.css">
   <link rel="stylesheet" href="./assets/index-d2e7eb5d.css">
   <link rel="stylesheet" href="./assets/instrument-f6ba4c10.css">
@@ -56,8 +69,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-00986d5e.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/instrument-legacy-4e8180a5.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-62d16c43.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/instrument-legacy-ac354ecb.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> guide
 </body>
 
 </html>

dist/orchestra.html

@@ -2,7 +2,11 @@
 <html lang="en">
 
 <head>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/polyfills-80e475eb.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/polyfills-0bd9780b.js"></script>
+>>>>>>> guide
 
   <meta charset="UTF-8" />
   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
@@ -41,6 +45,7 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/orchestra-af1bc67b.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-0c30d8f3.js">
   <link rel="modulepreload" crossorigin href="./assets/index-abf541bd.js">
@@ -48,6 +53,15 @@
   <link rel="modulepreload" crossorigin href="./assets/index-3dd38958.js">
   <link rel="modulepreload" crossorigin href="./assets/index-3e6ffe0e.js">
   <link rel="modulepreload" crossorigin href="./assets/index-28526a4c.js">
+=======
+  <script type="module" crossorigin src="./assets/orchestra-a5843a82.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-a3304b3b.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-aeda5d76.js">
+  <link rel="modulepreload" crossorigin href="./assets/vue3-lottie.es-d9098ac0.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-d85c10c3.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-1e57f80a.js">
+  <link rel="modulepreload" crossorigin href="./assets/index-d54d9301.js">
+>>>>>>> guide
   <link rel="stylesheet" href="./assets/index-96ddda46.css">
   <link rel="stylesheet" href="./assets/index-d2e7eb5d.css">
   <link rel="stylesheet" href="./assets/index-85f95688.css">
@@ -72,8 +86,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-00986d5e.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-7661531e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-62d16c43.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/orchestra-legacy-7b67bc05.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> guide
 </body>
 
 </html>

dist/report-share.html

@@ -2,7 +2,11 @@
 <html lang="en">
 
 <head>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/polyfills-80e475eb.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/polyfills-0bd9780b.js"></script>
+>>>>>>> guide
 
   <meta charset="UTF-8" />
   <!-- <link rel="icon" type="image/svg+xml" href="/vite.svg" /> -->
@@ -25,8 +29,13 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/report-share-5943bc54.js"></script>
   <link rel="modulepreload" crossorigin href="./assets/index-0c30d8f3.js">
+=======
+  <script type="module" crossorigin src="./assets/report-share-9603f6e4.js"></script>
+  <link rel="modulepreload" crossorigin href="./assets/index-a3304b3b.js">
+>>>>>>> guide
   <link rel="modulepreload" crossorigin href="./assets/plyr.min-424cfb91.js">
   <link rel="stylesheet" href="./assets/index-96ddda46.css">
   <link rel="stylesheet" href="./assets/plyr-ad8ef5ae.css">
@@ -51,8 +60,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-00986d5e.js"></script>
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-27cfa903.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-62d16c43.js"></script>
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/report-share-legacy-f7052141.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> guide
 </body>
 
 </html>

src/page-instrument/custom-plugins/guide-page/api.ts

@@ -0,0 +1,22 @@
+import request from "../../../utils/request";
+
+
+export const setGuidance = (params: any) => {
+    return request.post('/functionGuidance/save', {
+      data: params,
+      requestType: "json",
+    });
+  };
+  
+  /**
+   * 获取引导页
+   */
+  export const getGuidance = (params: any) => {
+    return request.get('/functionGuidance/queryTagDetail', {
+      data: params,
+      params,
+  
+    });
+  };
+  
+

src/page-instrument/custom-plugins/guide-page/index.module.less

@@ -54,7 +54,7 @@
   .box {
     position: fixed;
     box-shadow: rgba(33, 33, 33, 0.8) 0px 0px 0px 5000px;
-    transition: all 0.25s;
+    // transition: all 0.25s;
     transform: scale(1.2);
     border-radius: 8px;
   }

src/page-instrument/custom-plugins/guide-page/student-bottom.tsx

@@ -4,6 +4,7 @@ import { defineComponent, nextTick, onMounted, reactive, ref, watch } from "vue"
 import styles from "./index.module.less";
 import { getImage } from "./images";
 import { getQuery } from "/src/utils/queryString";
+import { getGuidance, setGuidance } from "./api";
 
 export default defineComponent({
 	name: "studentB-guide",
@@ -19,7 +20,7 @@ export default defineComponent({
 					img: getImage("studentB1.png"),
 					handStyle: {
 						top: "-1.39rem",
-						left: "1.4rem",
+						left: "1.7rem",
 						transform: "rotate(180deg)",
 					},
 					imgStyle: {
@@ -75,12 +76,35 @@ export default defineComponent({
 		});
 		const tipShow = ref(false);
 		const query: any = getQuery();
-		const guideInfo = localStorage.getItem("guideInfo");
-		if ((guideInfo && JSON.parse(guideInfo).studentB) || !query.showGuide) {
+		// const guideInfo = localStorage.getItem("guideInfo");
+		// if ((guideInfo && JSON.parse(guideInfo).studentB) || !query.showGuide) {
+		// 	tipShow.value = false;
+		// } else {
+		// 	tipShow.value = true;
+		// }
+		const guideInfo = ref({} as any)
+		const getAllGuidance = async()=>{
+		  try{
+		  const res = await getGuidance({guideTag:'guideInfo'})
+		  if(res.data){
+			guideInfo.value = JSON.parse(res.data?.guideValue) || null
+		  }else{
+			guideInfo.value = {}
+		  }
+	  
+	  
+		  if (guideInfo.value && guideInfo.value.studentB || !query.showGuide) {
 			tipShow.value = false;
-		} else {
+		  } else {
 			tipShow.value = true;
+		  }
+		  }catch(e){
+		  console.log(e)
+		  }
+		  // const guideInfo = localStorage.getItem('teacher-guideInfo');
+	  
 		}
+		getAllGuidance()
 		const steps = [ "modeType-0", "modeType-1", "modeType-2"];
 		const getStepELe = () => {
 			console.log(steps[data.step]);
@@ -108,14 +132,19 @@ export default defineComponent({
 			getStepELe();
 		};
 
-		const endGuide = () => {
-			let guideInfo = JSON.parse(localStorage.getItem("guideInfo") || "{}") || null;
-			if (!guideInfo) {
-				guideInfo = { studentB: true };
+		const endGuide = async() => {
+			// let guideInfo = JSON.parse(localStorage.getItem("guideInfo") || "{}") || null;
+			if (!guideInfo.value) {
+				guideInfo.value = { studentB: true };
 			} else {
-				guideInfo.studentB = true;
+				guideInfo.value.studentB = true;
 			}
-			localStorage.setItem("guideInfo", JSON.stringify(guideInfo));
+			// localStorage.setItem("guideInfo", JSON.stringify(guideInfo));
+			try{
+				const res = await setGuidance({guideTag:'guideInfo',guideValue:JSON.stringify(guideInfo.value)})
+			  }catch(e){
+				console.log(e)
+			  }
 			tipShow.value = false;
 			//  localStorage.setItem('endC')
 		};

src/page-instrument/custom-plugins/guide-page/student-top.tsx

@@ -5,6 +5,7 @@ import styles from "./index.module.less";
 import { getImage } from "./images";
 import { useRoute } from "vue-router";
 import { getQuery } from "/src/utils/queryString";
+import { getGuidance, setGuidance } from "./api";
 
 export default defineComponent({
   name: "studnetT-guide",
@@ -169,12 +170,37 @@ export default defineComponent({
     });
     const tipShow = ref(false)
     const query: any = getQuery();
-   const guideInfo = localStorage.getItem('guideInfo')
-   if(guideInfo&&JSON.parse(guideInfo).studnetT || !query.showGuide){
-    tipShow.value =false
-   }else {
-    tipShow.value =true
-   }
+  //  const guideInfo = localStorage.getItem('guideInfo')
+  //  if(guideInfo&&JSON.parse(guideInfo).studnetT || !query.showGuide){
+  //   tipShow.value =false
+  //  }else {
+  //   tipShow.value =true
+  //  }
+
+  const guideInfo = ref({} as any)
+  const getAllGuidance = async()=>{
+    try{
+    const res = await getGuidance({guideTag:'guideInfo'})
+    if(res.data){
+      guideInfo.value = JSON.parse(res.data?.guideValue) || null
+    }else{
+      guideInfo.value = {}
+    }
+
+
+    if (guideInfo.value && guideInfo.value.studnetT || !query.showGuide) {
+      tipShow.value = false;
+    } else {
+      tipShow.value = true;
+    }
+    }catch(e){
+    console.log(e)
+    }
+    // const guideInfo = localStorage.getItem('teacher-guideInfo');
+
+  }
+  getAllGuidance()
+
     const getStepELe = () => {
       console.log(`studnetT${data.step}`)
       const ele: HTMLElement = document.getElementById(`studnetT-${data.step}`)!;
@@ -206,14 +232,19 @@ export default defineComponent({
       getStepELe();
     };
     
-    const endGuide = ()=>{
-      let guideInfo = JSON.parse(localStorage.getItem('guideInfo') || '{}') || null
-      if(!guideInfo){
-        guideInfo = {studnetT:true}
+    const endGuide = async()=>{
+      // let guideInfo = JSON.parse(localStorage.getItem('guideInfo') || '{}') || null
+      if(!guideInfo.value){
+        guideInfo.value = {studnetT:true}
       }else{
-        guideInfo.studnetT = true
+        guideInfo.value.studnetT = true
       }
-      localStorage.setItem('guideInfo',JSON.stringify(guideInfo))
+      // localStorage.setItem('guideInfo',JSON.stringify(guideInfo))
+      try{
+				const res = await setGuidance({guideTag:'guideInfo',guideValue:JSON.stringify(guideInfo.value)})
+			  }catch(e){
+				console.log(e)
+			  }
       tipShow.value = false
     //  localStorage.setItem('endC')
     }

src/page-instrument/custom-plugins/guide-page/teacher-bootom.tsx

@@ -4,7 +4,7 @@ import { defineComponent, nextTick, onMounted, reactive, ref, watch } from "vue"
 import styles from "./index.module.less";
 import { getImage } from "./images";
 import { getQuery } from "/src/utils/queryString";
-
+import {getGuidance,setGuidance} from './api'
 export default defineComponent({
 	name: "aiTeacher-guide",
 	emits: ["close"],
@@ -15,17 +15,18 @@ export default defineComponent({
 			steps: [
 				{
 					eleRect: {
-						left: "5rem",
-						top: "-3rem",
+						left: "4.5rem",
+						top: "-3.6rem",
 					},
 					img: getImage("aiTeacher1.png"),
 					imgStyle: {
-						width: "6.48rem",
-						height: "3rem",
+						width: "7.776rem",
+						height: "3.6rem",
 					},
 					btnsStyle: {
-						bottom: ".9rem",
-						left: "1.7rem",
+						bottom: "1.3rem",
+						left: "2.1rem",
+				
 					},
 					boxStyle: {
 						borderRadius: "40px",
@@ -50,7 +51,8 @@ export default defineComponent({
 					},
 					btnsStyle: {
 						bottom: ".9rem",
-						left: "1rem",
+						left: ".9rem",
+						transform: "scale(.83)",
 					},
 					boxStyle: {
 						borderRadius: "40px",
@@ -68,7 +70,8 @@ export default defineComponent({
 					},
 					btnsStyle: {
 						bottom: ".9rem",
-						left: "1rem",
+						left: ".8rem",
+						transform: "scale(.83)",
 					},
 					boxStyle: {
 						borderRadius: "40px",
@@ -86,9 +89,10 @@ export default defineComponent({
 					},
 					btnsStyle: {
 						bottom: ".9rem",
-						left: "1.7rem",
+						left: "1.6rem",
 						"justify-content": "center",
 						padding: 0,
+						transform: "scale(.83)",
 					},
 					boxStyle: {
 						borderRadius: "40px",
@@ -99,13 +103,39 @@ export default defineComponent({
 		});
 
 		const tipShow = ref(false);
-		const guideInfo = localStorage.getItem("guideInfo");
+		// const guideInfo = localStorage.getItem("guideInfo");
 		const query: any = getQuery();
-		if ((guideInfo && JSON.parse(guideInfo).teacherBottom) || !query.showGuide) {
-			tipShow.value = false;
-		} else {
-			tipShow.value = true;
+		const guideInfo = ref({} as any)
+		const getAllGuidance = async()=>{
+		  try{
+			const res = await getGuidance({guideTag:'guideInfo'})
+			if(res.data){
+			  guideInfo.value = JSON.parse(res.data?.guideValue) || null
+			}else{
+			  guideInfo.value = {}
+			}
+	
+	
+			if (guideInfo.value && guideInfo.value.teacherBottom || !query.showGuide) {
+			  tipShow.value = false;
+			} else {
+			  tipShow.value = true;
+			}
+		  }catch(e){
+			console.log(e)
+		  }
+		  // const guideInfo = localStorage.getItem('teacher-guideInfo');
+	
 		}
+		getAllGuidance()
+
+
+
+		// if ((guideInfo && JSON.parse(guideInfo).teacherBottom) || !query.showGuide) {
+		// 	tipShow.value = false;
+		// } else {
+		// 	tipShow.value = true;
+		// }
 		const steps = ["modeType-box", "modeType-0", "modeType-1", "modeType-2"];
 		const getStepELe = () => {
 			console.log(steps[data.step]);
@@ -140,14 +170,19 @@ export default defineComponent({
 			getStepELe();
 		};
 
-		const endGuide = () => {
-			let guideInfo = JSON.parse(localStorage.getItem("guideInfo") || "{}") || null;
-			if (!guideInfo) {
-				guideInfo = { teacherBottom: true };
+		const endGuide = async() => {
+			// let guideInfo = JSON.parse(localStorage.getItem("guideInfo") || "{}") || null;
+			if (!guideInfo.value) {
+				guideInfo.value = { teacherBottom: true };
 			} else {
-				guideInfo.teacherBottom = true;
+				guideInfo.value.teacherBottom = true;
 			}
-			localStorage.setItem("guideInfo", JSON.stringify(guideInfo));
+			try{
+				const res = await setGuidance({guideTag:'guideInfo',guideValue:JSON.stringify(guideInfo.value)})
+			  }catch(e){
+				console.log(e)
+			  }
+			// localStorage.setItem("guideInfo", JSON.stringify(guideInfo));
 			tipShow.value = false;
 			//  localStorage.setItem('endC')
 		};

src/page-instrument/custom-plugins/guide-page/teacher-top.tsx

@@ -4,7 +4,7 @@ import { defineComponent, nextTick, onMounted, reactive, ref, watch } from "vue"
 import styles from "./index.module.less";
 import { getImage } from "./images";
 import { getQuery } from "/src/utils/queryString";
-
+import {getGuidance,setGuidance} from './api'
 export default defineComponent({
   name: "teacherTop-guide",
   emits: ["close"],
@@ -28,7 +28,9 @@ export default defineComponent({
           },
           btnsStyle: {
             top: "2.8rem",
-            left:'-0.4rem'
+            left:'-0.5rem',
+            transform: "scale(.83)",
+
           },
         },
         {
@@ -47,7 +49,8 @@ export default defineComponent({
           },
           btnsStyle: {
             top: "2.8rem",
-            left:'-0.4rem'
+            left:'-0.5rem',
+            transform: "scale(.83)",
           },
         },
         {
@@ -66,7 +69,8 @@ export default defineComponent({
           },
           btnsStyle: {
             top: "2.8rem",
-            left:'-0.4rem'
+            left:'-0.5rem',
+            transform: "scale(.83)",
           },
         },
         {
@@ -85,7 +89,8 @@ export default defineComponent({
           },
           btnsStyle: {
             top: "2.8rem",
-            left:'-0.4rem'
+            left:'-0.5rem',
+            transform: "scale(.83)",
           },
         },
         {
@@ -104,7 +109,8 @@ export default defineComponent({
           },
           btnsStyle: {
             top: "2.8rem",
-            left:'-0.4rem'
+            left:'-0.5rem',
+            transform: "scale(.83)",
           },
         },
         {
@@ -123,7 +129,8 @@ export default defineComponent({
           },
           btnsStyle: {
             top: "2.8rem",
-            left:'-2rem'
+            left:'-2.1rem',
+            transform: "scale(.83)",
           },
         },
       ],
@@ -131,12 +138,36 @@ export default defineComponent({
     });
     const tipShow = ref(false)
     const query: any = getQuery();
-   const guideInfo = localStorage.getItem('guideInfo' || !query.showGuide)
-   if(guideInfo&&JSON.parse(guideInfo).teacherTop){
-    tipShow.value =false
-   }else {
-    tipShow.value =true
-   }
+  //  const guideInfo = localStorage.getItem('guideInfo' || !query.showGuide)
+  //  if(guideInfo&&JSON.parse(guideInfo).teacherTop){
+  //   tipShow.value =false
+  //  }else {
+  //   tipShow.value =true
+  //  }
+  const guideInfo = ref({} as any)
+  const getAllGuidance = async()=>{
+    try{
+    const res = await getGuidance({guideTag:'guideInfo'})
+    if(res.data){
+      guideInfo.value = JSON.parse(res.data?.guideValue) || null
+    }else{
+      guideInfo.value = {}
+    }
+
+
+    if (guideInfo.value && guideInfo.value.teacherTop || !query.showGuide) {
+      tipShow.value = false;
+    } else {
+      tipShow.value = true;
+    }
+    }catch(e){
+    console.log(e)
+    }
+    // const guideInfo = localStorage.getItem('teacher-guideInfo');
+
+  }
+  getAllGuidance()
+
     const getStepELe = () => {
       console.log(`teacherTop${data.step}`)
       const ele: HTMLElement = document.getElementById(`teacherTop-${data.step}`)!;
@@ -168,14 +199,19 @@ export default defineComponent({
       getStepELe();
     };
     
-    const endGuide = ()=>{
-      let guideInfo = JSON.parse(localStorage.getItem('guideInfo') || '{}') || null
-      if(!guideInfo){
-        guideInfo = {teacherTop:true}
+    const endGuide = async()=>{
+      // let guideInfo = JSON.parse(localStorage.getItem('guideInfo') || '{}') || null
+      if(!guideInfo.value){
+        guideInfo.value = {teacherTop:true}
       }else{
-        guideInfo.teacherTop = true
+        guideInfo.value.teacherTop = true
       }
-      localStorage.setItem('guideInfo',JSON.stringify(guideInfo))
+      try{
+				const res = await setGuidance({guideTag:'guideInfo',guideValue:JSON.stringify(guideInfo.value)})
+			  }catch(e){
+				console.log(e)
+			  }
+      // localStorage.setItem('guideInfo',JSON.stringify(guideInfo))
       tipShow.value = false
     //  localStorage.setItem('endC')
     }