Merge branch 'master' into online

dist/assets/colexiu-legacy.dd529ec8.js

@@ -0,0 +1 @@
+System.register(["./App-legacy.36ae9f6e.js","./main-legacy.a17863ed.js","./lib-flexible-legacy.e8ca3d6a.js"],(function(){"use strict";return{setters:[function(){},function(){},function(){}],execute:function(){}}}));

dist/assets/colexiu.ba8ca6d9.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/colexiu.ba8ca6d9.js
 import"./App.a9d4801b.js";import"./main.bff7592c.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.b1d638c8.js";import"./main.fc6e7dc5.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> master:dist/assets/colexiu.dccf0d60.js

dist/assets/colexiu.dccf0d60.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/colexiu.ba8ca6d9.js
+import"./App.a9d4801b.js";import"./main.bff7592c.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.b1d638c8.js";import"./main.fc6e7dc5.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> master:dist/assets/colexiu.dccf0d60.js

dist/assets/index-legacy.30664b09.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy.30664b09.js
 System.register(["./App-legacy.91ed5be6.js"],(function(s){"use strict";var o,e,l,t;return{setters:[function(s){o=s.d,e=s.a,l=s.P,t=s.F}],execute:function(){s("P",o({name:"PopupWraper",props:["className","overlayClass","rootClassName"],data:function(){return{show:!1,opened:!1}},methods:{open:function(){this.show=!0,this.opened=!0},close:function(){this.show=!1},closed:function(){this.opened=!1}},render:function(){var s,o,n=this;return e(t,null,[null===(s=(o=this.$slots).default)||void 0===s?void 0:s.call(o),e(l,{class:this.className,overlayClass:this.overlayClass,show:this.show,closeable:!0,style:"background-color: transparent;",onClosed:this.closed,teleport:"body",onClickCloseIcon:this.close},{default:function(){var s,o,l,t;return n.opened?e("div",{class:n.rootClassName},[null===(s=(o=n.$slots).more)||void 0===s?void 0:s.call(o),null===(l=(t=n.$slots).popup)||void 0===l?void 0:l.call(t)]):null}})])}}))}}}));
+========
+System.register(["./App-legacy.36ae9f6e.js"],(function(s){"use strict";var o,e,l,t;return{setters:[function(s){o=s.d,e=s.a,l=s.P,t=s.F}],execute:function(){s("P",o({name:"PopupWraper",props:["className","overlayClass","rootClassName"],data:function(){return{show:!1,opened:!1}},methods:{open:function(){this.show=!0,this.opened=!0},close:function(){this.show=!1},closed:function(){this.opened=!1}},render:function(){var s,o,n=this;return e(t,null,[null===(s=(o=this.$slots).default)||void 0===s?void 0:s.call(o),e(l,{class:this.className,overlayClass:this.overlayClass,show:this.show,closeable:!0,style:"background-color: transparent;",onClosed:this.closed,teleport:"body",onClickCloseIcon:this.close},{default:function(){var s,o,l,t;return n.opened?e("div",{class:n.rootClassName},[null===(s=(o=n.$slots).more)||void 0===s?void 0:s.call(o),null===(l=(t=n.$slots).popup)||void 0===l?void 0:l.call(t)]):null}})])}}))}}}));
+>>>>>>>> master:dist/assets/index-legacy.f48ceedb.js

dist/assets/index-legacy.db11b89d.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy.f217ee97.js
+System.register(["./App-legacy.91ed5be6.js"],(function(e){"use strict";var t,r,n,u,i;return{setters:[function(e){t=e.d,r=e.a,n=e.B,u=e.g,i=e.K}],execute:function(){e("default",t({name:"notfund",render:function(){var e=this;return r(i,{image:"error",description:this.$route.path+" 路径不存在"},{default:function(){return[r(n,{type:"primary",color:"#01C1B5",onClick:function(){return e.$router.replace("/")}},{default:function(){return[u("返回首页")]}})]}})}}))}}}));
+========
+System.register(["./App-legacy.36ae9f6e.js"],(function(e){"use strict";var t,r,n,u,i;return{setters:[function(e){t=e.d,r=e.a,n=e.B,u=e.g,i=e.K}],execute:function(){e("default",t({name:"notfund",render:function(){var e=this;return r(i,{image:"error",description:this.$route.path+" 路径不存在"},{default:function(){return[r(n,{type:"primary",color:"#01C1B5",onClick:function(){return e.$router.replace("/")}},{default:function(){return[u("返回首页")]}})]}})}}))}}}));
+>>>>>>>> master:dist/assets/index-legacy.db11b89d.js

dist/assets/index-legacy.f217ee97.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy.f217ee97.js
 System.register(["./App-legacy.91ed5be6.js"],(function(e){"use strict";var t,r,n,u,i;return{setters:[function(e){t=e.d,r=e.a,n=e.B,u=e.g,i=e.K}],execute:function(){e("default",t({name:"notfund",render:function(){var e=this;return r(i,{image:"error",description:this.$route.path+" 路径不存在"},{default:function(){return[r(n,{type:"primary",color:"#01C1B5",onClick:function(){return e.$router.replace("/")}},{default:function(){return[u("返回首页")]}})]}})}}))}}}));
+========
+System.register(["./App-legacy.36ae9f6e.js"],(function(e){"use strict";var t,r,n,u,i;return{setters:[function(e){t=e.d,r=e.a,n=e.B,u=e.g,i=e.K}],execute:function(){e("default",t({name:"notfund",render:function(){var e=this;return r(i,{image:"error",description:this.$route.path+" 路径不存在"},{default:function(){return[r(n,{type:"primary",color:"#01C1B5",onClick:function(){return e.$router.replace("/")}},{default:function(){return[u("返回首页")]}})]}})}}))}}}));
+>>>>>>>> master:dist/assets/index-legacy.db11b89d.js

dist/assets/index-legacy.f48ceedb.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy.30664b09.js
+System.register(["./App-legacy.91ed5be6.js"],(function(s){"use strict";var o,e,l,t;return{setters:[function(s){o=s.d,e=s.a,l=s.P,t=s.F}],execute:function(){s("P",o({name:"PopupWraper",props:["className","overlayClass","rootClassName"],data:function(){return{show:!1,opened:!1}},methods:{open:function(){this.show=!0,this.opened=!0},close:function(){this.show=!1},closed:function(){this.opened=!1}},render:function(){var s,o,n=this;return e(t,null,[null===(s=(o=this.$slots).default)||void 0===s?void 0:s.call(o),e(l,{class:this.className,overlayClass:this.overlayClass,show:this.show,closeable:!0,style:"background-color: transparent;",onClosed:this.closed,teleport:"body",onClickCloseIcon:this.close},{default:function(){var s,o,l,t;return n.opened?e("div",{class:n.rootClassName},[null===(s=(o=n.$slots).more)||void 0===s?void 0:s.call(o),null===(l=(t=n.$slots).popup)||void 0===l?void 0:l.call(t)]):null}})])}}))}}}));
+========
+System.register(["./App-legacy.36ae9f6e.js"],(function(s){"use strict";var o,e,l,t;return{setters:[function(s){o=s.d,e=s.a,l=s.P,t=s.F}],execute:function(){s("P",o({name:"PopupWraper",props:["className","overlayClass","rootClassName"],data:function(){return{show:!1,opened:!1}},methods:{open:function(){this.show=!0,this.opened=!0},close:function(){this.show=!1},closed:function(){this.opened=!1}},render:function(){var s,o,n=this;return e(t,null,[null===(s=(o=this.$slots).default)||void 0===s?void 0:s.call(o),e(l,{class:this.className,overlayClass:this.overlayClass,show:this.show,closeable:!0,style:"background-color: transparent;",onClosed:this.closed,teleport:"body",onClickCloseIcon:this.close},{default:function(){var s,o,l,t;return n.opened?e("div",{class:n.rootClassName},[null===(s=(o=n.$slots).more)||void 0===s?void 0:s.call(o),null===(l=(t=n.$slots).popup)||void 0===l?void 0:l.call(t)]):null}})])}}))}}}));
+>>>>>>>> master:dist/assets/index-legacy.f48ceedb.js

dist/assets/index-legacy.f8c90866.js

@@ -0,0 +1 @@
+System.register(["./App-legacy.36ae9f6e.js","./main-legacy.a17863ed.js","./lib-flexible-legacy.e8ca3d6a.js"],(function(){"use strict";return{setters:[function(){},function(){},function(){}],execute:function(){}}}));

dist/assets/index.2139e947.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.8fdb2bad.js
+import{d as p,a as s,P as n,F as h}from"./App.a9d4801b.js";var i=p({name:"PopupWraper",props:["className","overlayClass","rootClassName"],data(){return{show:!1,opened:!1}},methods:{open(){this.show=!0,this.opened=!0},close(){this.show=!1},closed(){this.opened=!1}},render(){var e,o;return s(h,null,[(o=(e=this.$slots).default)==null?void 0:o.call(e),s(n,{class:this.className,overlayClass:this.overlayClass,show:this.show,closeable:!0,style:"background-color: transparent;",onClosed:this.closed,teleport:"body",onClickCloseIcon:this.close},{default:()=>{var a,t,l,r;return this.opened?s("div",{class:this.rootClassName},[(t=(a=this.$slots).more)==null?void 0:t.call(a),(r=(l=this.$slots).popup)==null?void 0:r.call(l)]):null}})])}});export{i as P};
+========
+import{d as p,a as s,P as n,F as h}from"./App.b1d638c8.js";var i=p({name:"PopupWraper",props:["className","overlayClass","rootClassName"],data(){return{show:!1,opened:!1}},methods:{open(){this.show=!0,this.opened=!0},close(){this.show=!1},closed(){this.opened=!1}},render(){var e,o;return s(h,null,[(o=(e=this.$slots).default)==null?void 0:o.call(e),s(n,{class:this.className,overlayClass:this.overlayClass,show:this.show,closeable:!0,style:"background-color: transparent;",onClosed:this.closed,teleport:"body",onClickCloseIcon:this.close},{default:()=>{var a,t,l,r;return this.opened?s("div",{class:this.rootClassName},[(t=(a=this.$slots).more)==null?void 0:t.call(a),(r=(l=this.$slots).popup)==null?void 0:r.call(l)]):null}})])}});export{i as P};
+>>>>>>>> master:dist/assets/index.2139e947.js

dist/assets/index.50533348.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.96d37cbe.js
+import{d as r,a as e,B as t,g as a,K as o}from"./App.a9d4801b.js";var u=r({name:"notfund",render(){return e(o,{image:"error",description:this.$route.path+" \u8DEF\u5F84\u4E0D\u5B58\u5728"},{default:()=>[e(t,{type:"primary",color:"#01C1B5",onClick:()=>this.$router.replace("/")},{default:()=>[a("\u8FD4\u56DE\u9996\u9875")]})]})}});export{u as default};
+========
+import{d as r,a as e,B as t,g as a,K as o}from"./App.b1d638c8.js";var u=r({name:"notfund",render(){return e(o,{image:"error",description:this.$route.path+" \u8DEF\u5F84\u4E0D\u5B58\u5728"},{default:()=>[e(t,{type:"primary",color:"#01C1B5",onClick:()=>this.$router.replace("/")},{default:()=>[a("\u8FD4\u56DE\u9996\u9875")]})]})}});export{u as default};
+>>>>>>>> master:dist/assets/index.50533348.js

dist/assets/index.6e0505d3.css

@@ -0,0 +1 @@
+._popup_15zo2_1{min-width:55vw;max-height:70vh}._popup_15zo2_1 .van-badge__wrapper{color:var(--primary-color);background-color:#fff;border-radius:50%;font-size:20PX;padding:5PX;font-weight:700;right:0;top:0;transform:translate(100%,-100%)}._content_15zo2_16{border-radius:.26667rem;overflow:hidden}._content_15zo2_16._full_15zo2_20{width:96vw;height:96vh}._content_15zo2_16._full_15zo2_20 .plyr video{max-height:100%!important}._content_15zo2_16 .plyr{border-radius:.26667rem;overflow:hidden;--plyr-color-main: var(--primary-color)}._content_15zo2_16 .plyr video{max-height:80vh}._content_15zo2_16 .plyr__poster{background-color:#fff;background-size:70%}._content_15zo2_16 .plyr__control--overlaid{background-color:rgba(0,0,0,.5)}._content_15zo2_16 .plyr--audio{min-width:100%}._content_15zo2_16 .van-field__word-limit{font-size:12PX;color:#ccc}

dist/assets/index.8fdb2bad.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.8fdb2bad.js
 import{d as p,a as s,P as n,F as h}from"./App.a9d4801b.js";var i=p({name:"PopupWraper",props:["className","overlayClass","rootClassName"],data(){return{show:!1,opened:!1}},methods:{open(){this.show=!0,this.opened=!0},close(){this.show=!1},closed(){this.opened=!1}},render(){var e,o;return s(h,null,[(o=(e=this.$slots).default)==null?void 0:o.call(e),s(n,{class:this.className,overlayClass:this.overlayClass,show:this.show,closeable:!0,style:"background-color: transparent;",onClosed:this.closed,teleport:"body",onClickCloseIcon:this.close},{default:()=>{var a,t,l,r;return this.opened?s("div",{class:this.rootClassName},[(t=(a=this.$slots).more)==null?void 0:t.call(a),(r=(l=this.$slots).popup)==null?void 0:r.call(l)]):null}})])}});export{i as P};
+========
+import{d as p,a as s,P as n,F as h}from"./App.b1d638c8.js";var i=p({name:"PopupWraper",props:["className","overlayClass","rootClassName"],data(){return{show:!1,opened:!1}},methods:{open(){this.show=!0,this.opened=!0},close(){this.show=!1},closed(){this.opened=!1}},render(){var e,o;return s(h,null,[(o=(e=this.$slots).default)==null?void 0:o.call(e),s(n,{class:this.className,overlayClass:this.overlayClass,show:this.show,closeable:!0,style:"background-color: transparent;",onClosed:this.closed,teleport:"body",onClickCloseIcon:this.close},{default:()=>{var a,t,l,r;return this.opened?s("div",{class:this.rootClassName},[(t=(a=this.$slots).more)==null?void 0:t.call(a),(r=(l=this.$slots).popup)==null?void 0:r.call(l)]):null}})])}});export{i as P};
+>>>>>>>> master:dist/assets/index.2139e947.js

dist/assets/index.9346d1dd.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.ec5efe3d.js
+import"./App.a9d4801b.js";import"./main.bff7592c.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.b1d638c8.js";import"./main.fc6e7dc5.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> master:dist/assets/index.9346d1dd.js

dist/assets/index.96d37cbe.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.96d37cbe.js
 import{d as r,a as e,B as t,g as a,K as o}from"./App.a9d4801b.js";var u=r({name:"notfund",render(){return e(o,{image:"error",description:this.$route.path+" \u8DEF\u5F84\u4E0D\u5B58\u5728"},{default:()=>[e(t,{type:"primary",color:"#01C1B5",onClick:()=>this.$router.replace("/")},{default:()=>[a("\u8FD4\u56DE\u9996\u9875")]})]})}});export{u as default};
+========
+import{d as r,a as e,B as t,g as a,K as o}from"./App.b1d638c8.js";var u=r({name:"notfund",render(){return e(o,{image:"error",description:this.$route.path+" \u8DEF\u5F84\u4E0D\u5B58\u5728"},{default:()=>[e(t,{type:"primary",color:"#01C1B5",onClick:()=>this.$router.replace("/")},{default:()=>[a("\u8FD4\u56DE\u9996\u9875")]})]})}});export{u as default};
+>>>>>>>> master:dist/assets/index.50533348.js

dist/assets/index.9f027f1e.js

@@ -0,0 +1 @@
+import{d as x,a6 as w,r as u,a7 as E,X as N,w as $,a8 as B,a9 as D,a as e,aa as C,ab as f,ac as c,ad as R,ae as U,W as y,af as I,ag as j}from"./App.b1d638c8.js";var[F,n]=C("image"),V=x({name:F,props:{src:String,alt:String,fit:String,round:Boolean,width:[Number,String],height:[Number,String],radius:[Number,String],lazyLoad:Boolean,iconSize:[Number,String],showError:w,iconPrefix:String,showLoading:w,errorIcon:{type:String,default:"photo-fail"},loadingIcon:{type:String,default:"photo"}},emits:["load","error"],setup(r,{emit:s,slots:i}){var o=u(!1),t=u(!0),d=u(),{$Lazyload:l}=E().proxy,S=N(()=>{var a={};return f(r.width)&&(a.width=c(r.width)),f(r.height)&&(a.height=c(r.height)),f(r.radius)&&(a.overflow="hidden",a.borderRadius=c(r.radius)),a});$(()=>r.src,()=>{o.value=!1,t.value=!0});var v=a=>{t.value=!1,s("load",a)},g=a=>{o.value=!0,t.value=!1,s("error",a)},L=()=>i.loading?i.loading():e(I,{size:r.iconSize,name:r.loadingIcon,class:n("loading-icon"),classPrefix:r.iconPrefix},null),z=()=>i.error?i.error():e(I,{size:r.iconSize,name:r.errorIcon,class:n("error-icon"),classPrefix:r.iconPrefix},null),b=()=>{if(t.value&&r.showLoading)return e("div",{class:n("loading")},[L()]);if(o.value&&r.showError)return e("div",{class:n("error")},[z()])},P=()=>{if(!(o.value||!r.src)){var a={alt:r.alt,class:n("img"),style:{objectFit:r.fit}};return r.lazyLoad?R(e("img",y({ref:d},a),null),[[U("lazy"),r.src]]):e("img",y({src:r.src,onLoad:v,onError:g},a),null)}},h=({el:a})=>{a===d.value&&t.value&&v()},m=({el:a})=>{a===d.value&&!o.value&&g()};return l&&B&&(l.$on("loaded",h),l.$on("error",m),D(()=>{l.$off("loaded",h),l.$off("error",m)})),()=>e("div",{class:n({round:r.round}),style:S.value},[P(),b(),i.default==null?void 0:i.default()])}}),X=j(V);export{X as I};

dist/assets/index.bf78487b.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.fcde2039.js
+import{d as a,ak as n,s as r,l as o,H as c,a as t,g as l,b as d}from"./App.a9d4801b.js";import{I as u}from"./index.9bdf05db.js";const m="_container_1rete_1",_="_content_1rete_6",p="_title_1rete_11",g="_items_1rete_27",h="_inner_1rete_37",v="_img_1rete_41";var s={container:m,content:_,title:p,items:g,inner:h,img:v};const y=d();var S=a({name:"classify",data(){return{list:[]}},mounted(){const e=sessionStorage.getItem("musicScoreList");if(e){let i=JSON.parse(e);this.list=i}else this.$router.replace("/");n(["_trackEvent","\u4E91\u6559\u7EC3","\u5207\u6362\u9875\u9762","\u5206\u7C7B\u9875\u9762"]),r.subjectId=r.origanSubjectId},methods:{async FetchList(){try{const{parentId:e}=this.$route.query,i=await o.get("/sysMusicScoreCategories/queryTree",{params:{parentId:e||0}});this.list=i.data}catch{}},onClickLeft(){y.isApp&&c({api:"back"})},toDetail(e){this.$router.push({path:"/list/"+e.id,query:{...this.$route.query}})}},render(){return t("div",{class:s.container},[t("div",{class:s.content},[t("div",{class:s.title},[l("\u6559\u6750")]),t("div",{class:s.items},[this.list.map(e=>t("div",{key:e.id,onClick:()=>this.toDetail(e)},[t("div",{class:s.inner},[t(u,{src:e.coverImg,class:s.img},null),t("div",{class:"van-ellipsis"},[e.name])])]))])])])}});export{S as default};
+========
+import{d as a,ak as n,s as r,l as o,H as c,a as t,g as l,b as d}from"./App.b1d638c8.js";import{I as u}from"./index.9f027f1e.js";const m="_container_1rete_1",_="_content_1rete_6",p="_title_1rete_11",g="_items_1rete_27",h="_inner_1rete_37",v="_img_1rete_41";var s={container:m,content:_,title:p,items:g,inner:h,img:v};const y=d();var S=a({name:"classify",data(){return{list:[]}},mounted(){const e=sessionStorage.getItem("musicScoreList");if(e){let i=JSON.parse(e);this.list=i}else this.$router.replace("/");n(["_trackEvent","\u4E91\u6559\u7EC3","\u5207\u6362\u9875\u9762","\u5206\u7C7B\u9875\u9762"]),r.subjectId=r.origanSubjectId},methods:{async FetchList(){try{const{parentId:e}=this.$route.query,i=await o.get("/sysMusicScoreCategories/queryTree",{params:{parentId:e||0}});this.list=i.data}catch{}},onClickLeft(){y.isApp&&c({api:"back"})},toDetail(e){this.$router.push({path:"/list/"+e.id,query:{...this.$route.query}})}},render(){return t("div",{class:s.container},[t("div",{class:s.content},[t("div",{class:s.title},[l("\u6559\u6750")]),t("div",{class:s.items},[this.list.map(e=>t("div",{key:e.id,onClick:()=>this.toDetail(e)},[t("div",{class:s.inner},[t(u,{src:e.coverImg,class:s.img},null),t("div",{class:"van-ellipsis"},[e.name])])]))])])])}});export{S as default};
+>>>>>>>> master:dist/assets/index.bf78487b.js

dist/assets/index.df25cb8c.js

@@ -0,0 +1 @@
+import{P as n}from"./index.2139e947.js";import{r,b as i,d as l,a as t,W as u}from"./App.b1d638c8.js";var d="/orchestra-music-score/assets/videobg.2d19d627.png";const p=r(null);i();var c=l({name:"setting-content",props:{close:{type:Function,default:()=>{}},videoFilePath:{type:String},className:{type:String}},data(){return{isFullScreen:!1}},mounted(){},methods:{mediaType(){const e=(this.videoFilePath||"").split(".").pop();return e==="wav"||e==="mp3"?"audio":"video"}},render(){return t("div",null,[this.mediaType()==="audio"?t("audio",{ref:p,src:this.videoFilePath,controls:"false",preload:"metadata",playsinline:!0},null):t("video",{ref:p,src:this.videoFilePath,"data-poster":d,controls:"false",preload:"metadata",playsinline:!0},null)])}});const f="_popup_15zo2_1",m="_content_15zo2_16",v="_full_15zo2_20";var h={popup:f,content:m,full:v};const o=r();var g=l({name:"player-popup",props:{btnClass:{type:String},popupClass:{type:String}},render(){return t(n,{ref:o,className:h.popup},{default:()=>{var e,s,a;return[t("div",{onClick:(e=o.value)==null?void 0:e.open},[(a=(s=this.$slots).default)==null?void 0:a.call(s)])]},popup:()=>{var e;return t(c,u({close:(e=o.value)==null?void 0:e.close,className:this.popupClass},this.$attrs),null)}})}});export{g as P};

dist/assets/index.ec5efe3d.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.ec5efe3d.js
 import"./App.a9d4801b.js";import"./main.bff7592c.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.b1d638c8.js";import"./main.fc6e7dc5.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> master:dist/assets/index.9346d1dd.js

dist/assets/index.fcde2039.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.fcde2039.js
 import{d as a,ak as n,s as r,l as o,H as c,a as t,g as l,b as d}from"./App.a9d4801b.js";import{I as u}from"./index.9bdf05db.js";const m="_container_1rete_1",_="_content_1rete_6",p="_title_1rete_11",g="_items_1rete_27",h="_inner_1rete_37",v="_img_1rete_41";var s={container:m,content:_,title:p,items:g,inner:h,img:v};const y=d();var S=a({name:"classify",data(){return{list:[]}},mounted(){const e=sessionStorage.getItem("musicScoreList");if(e){let i=JSON.parse(e);this.list=i}else this.$router.replace("/");n(["_trackEvent","\u4E91\u6559\u7EC3","\u5207\u6362\u9875\u9762","\u5206\u7C7B\u9875\u9762"]),r.subjectId=r.origanSubjectId},methods:{async FetchList(){try{const{parentId:e}=this.$route.query,i=await o.get("/sysMusicScoreCategories/queryTree",{params:{parentId:e||0}});this.list=i.data}catch{}},onClickLeft(){y.isApp&&c({api:"back"})},toDetail(e){this.$router.push({path:"/list/"+e.id,query:{...this.$route.query}})}},render(){return t("div",{class:s.container},[t("div",{class:s.content},[t("div",{class:s.title},[l("\u6559\u6750")]),t("div",{class:s.items},[this.list.map(e=>t("div",{key:e.id,onClick:()=>this.toDetail(e)},[t("div",{class:s.inner},[t(u,{src:e.coverImg,class:s.img},null),t("div",{class:"van-ellipsis"},[e.name])])]))])])])}});export{S as default};
+========
+import{d as a,ak as n,s as r,l as o,H as c,a as t,g as l,b as d}from"./App.b1d638c8.js";import{I as u}from"./index.9f027f1e.js";const m="_container_1rete_1",_="_content_1rete_6",p="_title_1rete_11",g="_items_1rete_27",h="_inner_1rete_37",v="_img_1rete_41";var s={container:m,content:_,title:p,items:g,inner:h,img:v};const y=d();var S=a({name:"classify",data(){return{list:[]}},mounted(){const e=sessionStorage.getItem("musicScoreList");if(e){let i=JSON.parse(e);this.list=i}else this.$router.replace("/");n(["_trackEvent","\u4E91\u6559\u7EC3","\u5207\u6362\u9875\u9762","\u5206\u7C7B\u9875\u9762"]),r.subjectId=r.origanSubjectId},methods:{async FetchList(){try{const{parentId:e}=this.$route.query,i=await o.get("/sysMusicScoreCategories/queryTree",{params:{parentId:e||0}});this.list=i.data}catch{}},onClickLeft(){y.isApp&&c({api:"back"})},toDetail(e){this.$router.push({path:"/list/"+e.id,query:{...this.$route.query}})}},render(){return t("div",{class:s.container},[t("div",{class:s.content},[t("div",{class:s.title},[l("\u6559\u6750")]),t("div",{class:s.items},[this.list.map(e=>t("div",{key:e.id,onClick:()=>this.toDetail(e)},[t("div",{class:s.inner},[t(u,{src:e.coverImg,class:s.img},null),t("div",{class:"van-ellipsis"},[e.name])])]))])])])}});export{S as default};
+>>>>>>>> master:dist/assets/index.bf78487b.js

dist/assets/main-legacy.a17863ed.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/main-legacy.f65d094d.js
+System.register(["./App-legacy.91ed5be6.js","./lib-flexible-legacy.e8ca3d6a.js"],(function(){"use strict";var e,t,o,c;return{setters:[function(n){e=n.s,t=n.f,o=n.c,c=n.A},function(){}],execute:function(){e.clintNmae="colexiu",window.DYEnvironment="colexiu";try{document.body.style.setProperty("--osdm-zoom",""+t())}catch(n){console.log("🚀 ~ error",n)}o(c).mount("#app")}}}));
+========
+System.register(["./App-legacy.36ae9f6e.js","./lib-flexible-legacy.e8ca3d6a.js"],(function(){"use strict";var e,t,o,c;return{setters:[function(n){e=n.s,t=n.f,o=n.c,c=n.A},function(){}],execute:function(){e.clintNmae="colexiu",window.DYEnvironment="colexiu";try{document.body.style.setProperty("--osdm-zoom",""+t())}catch(n){console.log("🚀 ~ error",n)}o(c).mount("#app")}}}));
+>>>>>>>> master:dist/assets/main-legacy.a17863ed.js

dist/assets/main-legacy.f65d094d.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/main-legacy.f65d094d.js
 System.register(["./App-legacy.91ed5be6.js","./lib-flexible-legacy.e8ca3d6a.js"],(function(){"use strict";var e,t,o,c;return{setters:[function(n){e=n.s,t=n.f,o=n.c,c=n.A},function(){}],execute:function(){e.clintNmae="colexiu",window.DYEnvironment="colexiu";try{document.body.style.setProperty("--osdm-zoom",""+t())}catch(n){console.log("🚀 ~ error",n)}o(c).mount("#app")}}}));
+========
+System.register(["./App-legacy.36ae9f6e.js","./lib-flexible-legacy.e8ca3d6a.js"],(function(){"use strict";var e,t,o,c;return{setters:[function(n){e=n.s,t=n.f,o=n.c,c=n.A},function(){}],execute:function(){e.clintNmae="colexiu",window.DYEnvironment="colexiu";try{document.body.style.setProperty("--osdm-zoom",""+t())}catch(n){console.log("🚀 ~ error",n)}o(c).mount("#app")}}}));
+>>>>>>>> master:dist/assets/main-legacy.a17863ed.js

dist/assets/main.bff7592c.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/main.bff7592c.js
 import{s as r,f as t,c as e,A as m}from"./App.a9d4801b.js";import"./lib-flexible.08f197e6.js";r.clintNmae="colexiu";window.DYEnvironment="colexiu";try{document.body.style.setProperty("--osdm-zoom",""+t())}catch(o){console.log("\u{1F680} ~ error",o)}e(m).mount("#app");
+========
+import{s as r,f as t,c as e,A as m}from"./App.b1d638c8.js";import"./lib-flexible.08f197e6.js";r.clintNmae="colexiu";window.DYEnvironment="colexiu";try{document.body.style.setProperty("--osdm-zoom",""+t())}catch(o){console.log("\u{1F680} ~ error",o)}e(m).mount("#app");
+>>>>>>>> master:dist/assets/main.fc6e7dc5.js

dist/assets/main.fc6e7dc5.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/main.bff7592c.js
+import{s as r,f as t,c as e,A as m}from"./App.a9d4801b.js";import"./lib-flexible.08f197e6.js";r.clintNmae="colexiu";window.DYEnvironment="colexiu";try{document.body.style.setProperty("--osdm-zoom",""+t())}catch(o){console.log("\u{1F680} ~ error",o)}e(m).mount("#app");
+========
+import{s as r,f as t,c as e,A as m}from"./App.b1d638c8.js";import"./lib-flexible.08f197e6.js";r.clintNmae="colexiu";window.DYEnvironment="colexiu";try{document.body.style.setProperty("--osdm-zoom",""+t())}catch(o){console.log("\u{1F680} ~ error",o)}e(m).mount("#app");
+>>>>>>>> master:dist/assets/main.fc6e7dc5.js

dist/assets/orchestra-legacy.1467b104.js

@@ -0,0 +1 @@
+System.register(["./App-legacy.36ae9f6e.js","./main-legacy.a17863ed.js","./lib-flexible-legacy.e8ca3d6a.js"],(function(){"use strict";return{setters:[function(){},function(){},function(){}],execute:function(){}}}));

dist/assets/orchestra.26182b2b.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/orchestra.83e24cc3.js
+import"./App.a9d4801b.js";import"./main.bff7592c.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.b1d638c8.js";import"./main.fc6e7dc5.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> master:dist/assets/orchestra.26182b2b.js

dist/assets/orchestra.83e24cc3.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/orchestra.83e24cc3.js
 import"./App.a9d4801b.js";import"./main.bff7592c.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.b1d638c8.js";import"./main.fc6e7dc5.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> master:dist/assets/orchestra.26182b2b.js

dist/assets/state-legacy.4df7d35a.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/state-legacy.c7bb505c.js
+!function(){function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},t(e)}System.register(["./App-legacy.91ed5be6.js"],(function(e){"use strict";var n,r,o;return{setters:[function(t){n=t.N,r=t.w,o=t.O}],execute:function(){var i=function e(n){if(null===n)return null;var r=Object.assign({},n);return Object.keys(r).forEach((function(o){return r[o]="object"===t(n[o])?e(n[o]):n[o]})),Array.isArray(n)?(r.length=n.length,Array.from(r)):r},u={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},c=e("g",(function(){return i(u)})),s=e("s",n(c()));r(s,(function(){o.set("state",s)}));e("a",(function(){var t=o.get("state");if(t)for(var e in t)if(Object.prototype.hasOwnProperty.call(t,e)){var n=t[e];s[e]=n}}))}}}))}();
+========
+!function(){function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},t(e)}System.register(["./App-legacy.36ae9f6e.js"],(function(e){"use strict";var n,r,o;return{setters:[function(t){n=t.N,r=t.w,o=t.O}],execute:function(){var i=function e(n){if(null===n)return null;var r=Object.assign({},n);return Object.keys(r).forEach((function(o){return r[o]="object"===t(n[o])?e(n[o]):n[o]})),Array.isArray(n)?(r.length=n.length,Array.from(r)):r},u={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},c=e("g",(function(){return i(u)})),f=e("s",n(c()));r(f,(function(){o.set("state",f)}));e("a",(function(){var t=o.get("state");if(t)for(var e in t)if(Object.prototype.hasOwnProperty.call(t,e)){var n=t[e];f[e]=n}}))}}}))}();
+>>>>>>>> master:dist/assets/state-legacy.4df7d35a.js

dist/assets/state-legacy.c7bb505c.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/state-legacy.c7bb505c.js
 !function(){function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},t(e)}System.register(["./App-legacy.91ed5be6.js"],(function(e){"use strict";var n,r,o;return{setters:[function(t){n=t.N,r=t.w,o=t.O}],execute:function(){var i=function e(n){if(null===n)return null;var r=Object.assign({},n);return Object.keys(r).forEach((function(o){return r[o]="object"===t(n[o])?e(n[o]):n[o]})),Array.isArray(n)?(r.length=n.length,Array.from(r)):r},u={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},c=e("g",(function(){return i(u)})),s=e("s",n(c()));r(s,(function(){o.set("state",s)}));e("a",(function(){var t=o.get("state");if(t)for(var e in t)if(Object.prototype.hasOwnProperty.call(t,e)){var n=t[e];s[e]=n}}))}}}))}();
+========
+!function(){function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},t(e)}System.register(["./App-legacy.36ae9f6e.js"],(function(e){"use strict";var n,r,o;return{setters:[function(t){n=t.N,r=t.w,o=t.O}],execute:function(){var i=function e(n){if(null===n)return null;var r=Object.assign({},n);return Object.keys(r).forEach((function(o){return r[o]="object"===t(n[o])?e(n[o]):n[o]})),Array.isArray(n)?(r.length=n.length,Array.from(r)):r},u={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},c=e("g",(function(){return i(u)})),f=e("s",n(c()));r(f,(function(){o.set("state",f)}));e("a",(function(){var t=o.get("state");if(t)for(var e in t)if(Object.prototype.hasOwnProperty.call(t,e)){var n=t[e];f[e]=n}}))}}}))}();
+>>>>>>>> master:dist/assets/state-legacy.4df7d35a.js

dist/assets/state.e3c80c0f.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/state.e3c80c0f.js
 import{N as l,w as o,O as r}from"./App.a9d4801b.js";const n=t=>{if(t===null)return null;let e=Object.assign({},t);return Object.keys(e).forEach(s=>e[s]=typeof t[s]=="object"?n(t[s]):t[s]),Array.isArray(t)?(e.length=t.length,Array.from(e)):e},c={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},i=()=>n(c),a=l(i());o(a,()=>{r.set("state",a)});const f=()=>{const t=r.get("state");if(t){for(const e in t)if(Object.prototype.hasOwnProperty.call(t,e)){const s=t[e];a[e]=s}}};export{f as a,i as g,a as s};
+========
+import{N as l,w as o,O as r}from"./App.b1d638c8.js";const n=t=>{if(t===null)return null;let e=Object.assign({},t);return Object.keys(e).forEach(s=>e[s]=typeof t[s]=="object"?n(t[s]):t[s]),Array.isArray(t)?(e.length=t.length,Array.from(e)):e},c={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},i=()=>n(c),a=l(i());o(a,()=>{r.set("state",a)});const f=()=>{const t=r.get("state");if(t){for(const e in t)if(Object.prototype.hasOwnProperty.call(t,e)){const s=t[e];a[e]=s}}};export{f as a,i as g,a as s};
+>>>>>>>> master:dist/assets/state.f3420323.js

dist/assets/state.f3420323.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/state.e3c80c0f.js
+import{N as l,w as o,O as r}from"./App.a9d4801b.js";const n=t=>{if(t===null)return null;let e=Object.assign({},t);return Object.keys(e).forEach(s=>e[s]=typeof t[s]=="object"?n(t[s]):t[s]),Array.isArray(t)?(e.length=t.length,Array.from(e)):e},c={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},i=()=>n(c),a=l(i());o(a,()=>{r.set("state",a)});const f=()=>{const t=r.get("state");if(t){for(const e in t)if(Object.prototype.hasOwnProperty.call(t,e)){const s=t[e];a[e]=s}}};export{f as a,i as g,a as s};
+========
+import{N as l,w as o,O as r}from"./App.b1d638c8.js";const n=t=>{if(t===null)return null;let e=Object.assign({},t);return Object.keys(e).forEach(s=>e[s]=typeof t[s]=="object"?n(t[s]):t[s]),Array.isArray(t)?(e.length=t.length,Array.from(e)):e},c={list:[],params:{page:1,rows:10},error:!1,levelId:0,typeId:0,levelOptions:[],typeOptions:null,finished:!1,loading:!1,search:"",subjectId:0,parentId:1},i=()=>n(c),a=l(i());o(a,()=>{r.set("state",a)});const f=()=>{const t=r.get("state");if(t){for(const e in t)if(Object.prototype.hasOwnProperty.call(t,e)){const s=t[e];a[e]=s}}};export{f as a,i as g,a as s};
+>>>>>>>> master:dist/assets/state.f3420323.js

dist/colexiu-report-share.html

@@ -116,6 +116,7 @@
       line-height: 1.8;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu-report-share.277a8790.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.a9d4801b.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
@@ -130,6 +131,22 @@
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.007e2b62.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.06f6a16d.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.555177a3.css">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu-report-share.fd69d130.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.b1d638c8.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/music.b35eb5be.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.d1b64a7c.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.2139e947.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.df25cb8c.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.0023e190.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/state.f3420323.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/wx_bg.fc243df2.js">
+  <link rel="stylesheet" href="/orchestra-music-score/assets/App.8c54dc63.css">
+  <link rel="stylesheet" href="/orchestra-music-score/assets/index.06f6a16d.css">
+  <link rel="stylesheet" href="/orchestra-music-score/assets/index.6e0505d3.css">
+  <link rel="stylesheet" href="/orchestra-music-score/assets/index.007e2b62.css">
+>>>>>>> master
   <link rel="stylesheet" href="/orchestra-music-score/assets/colexiu-report-share.b2f28b0e.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.fe7dacd8.css">
   <script type="module">try{import("_").catch(()=>1);}catch(e){}window.__vite_is_dynamic_import_support=true;</script>
@@ -191,7 +208,12 @@
   </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 id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.93313b91.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-report-share-legacy.4b981513.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.2297a4a6.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-report-share-legacy.ad57ab08.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> master
 </body>
 </html>

dist/colexiu-report.html

@@ -80,6 +80,7 @@
       height: 100Px;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu-report.72e75957.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.a9d4801b.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
@@ -94,6 +95,22 @@
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.555177a3.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.007e2b62.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/colexiu-report.9f05fcc2.css">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu-report.6ed19845.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.b1d638c8.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/music.b35eb5be.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.d1b64a7c.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.2139e947.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.df25cb8c.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.0023e190.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/state.f3420323.js">
+  <link rel="stylesheet" href="/orchestra-music-score/assets/App.8c54dc63.css">
+  <link rel="stylesheet" href="/orchestra-music-score/assets/index.007e2b62.css">
+  <link rel="stylesheet" href="/orchestra-music-score/assets/index.06f6a16d.css">
+  <link rel="stylesheet" href="/orchestra-music-score/assets/index.6e0505d3.css">
+  <link rel="stylesheet" href="/orchestra-music-score/assets/colexiu-report.fdd70890.css">
+>>>>>>> master
   <script type="module">try{import("_").catch(()=>1);}catch(e){}window.__vite_is_dynamic_import_support=true;</script>
   <script type="module">!function(){if(window.__vite_is_dynamic_import_support)return;console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above 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>
@@ -123,8 +140,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 id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.93313b91.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-report-legacy.755d16eb.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.2297a4a6.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-report-legacy.27245be7.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> master
 </body>
 
 </html>

dist/colexiu-share.html

@@ -62,12 +62,21 @@
       line-height: 1.8;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/colxiu-share.e605283a.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.a9d4801b.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/wx_bg.fc243df2.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/index.9bdf05db.js">
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.01a50f76.css">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/colxiu-share.8902fea5.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.b1d638c8.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/wx_bg.fc243df2.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.9f027f1e.js">
+  <link rel="stylesheet" href="/orchestra-music-score/assets/App.8c54dc63.css">
+>>>>>>> master
   <link rel="stylesheet" href="/orchestra-music-score/assets/colxiu-share.8457fad4.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.fe7dacd8.css">
   <script type="module">try{import("_").catch(()=>1);}catch(e){}window.__vite_is_dynamic_import_support=true;</script>
@@ -80,7 +89,12 @@
   </div>
   
   <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 id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.93313b91.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colxiu-share-legacy.98d70592.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.2297a4a6.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colxiu-share-legacy.858acb59.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> master
 </body>
 </html>

dist/colexiu.html

@@ -128,11 +128,19 @@
         line-height: 1.8;
       }
     </style>
+<<<<<<< HEAD
     <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu.ba8ca6d9.js"></script>
     <link rel="modulepreload" href="/orchestra-music-score/assets/App.a9d4801b.js">
     <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
     <link rel="modulepreload" href="/orchestra-music-score/assets/main.bff7592c.js">
     <link rel="stylesheet" href="/orchestra-music-score/assets/App.01a50f76.css">
+=======
+    <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu.dccf0d60.js"></script>
+    <link rel="modulepreload" href="/orchestra-music-score/assets/App.b1d638c8.js">
+    <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+    <link rel="modulepreload" href="/orchestra-music-score/assets/main.fc6e7dc5.js">
+    <link rel="stylesheet" href="/orchestra-music-score/assets/App.8c54dc63.css">
+>>>>>>> master
     <script type="module">try{import("_").catch(()=>1);}catch(e){}window.__vite_is_dynamic_import_support=true;</script>
     <script type="module">!function(){if(window.__vite_is_dynamic_import_support)return;console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above 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>
@@ -217,7 +225,12 @@
     </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 id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.93313b91.js"></script>
     <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-legacy.3317f1a3.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+    <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.2297a4a6.js"></script>
+    <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-legacy.dd529ec8.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> master
   </body>
 </html>

dist/colxiu-website.html

@@ -116,6 +116,7 @@
       line-height: 1.8;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/colxiu-website.627d2ce8.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.a9d4801b.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
@@ -123,6 +124,15 @@
   <link rel="modulepreload" href="/orchestra-music-score/assets/index.af7ec131.js">
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.01a50f76.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.555177a3.css">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/colxiu-website.78bac364.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.b1d638c8.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.2139e947.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.df25cb8c.js">
+  <link rel="stylesheet" href="/orchestra-music-score/assets/App.8c54dc63.css">
+  <link rel="stylesheet" href="/orchestra-music-score/assets/index.6e0505d3.css">
+>>>>>>> master
   <link rel="stylesheet" href="/orchestra-music-score/assets/colxiu-website.a27d2131.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.fe7dacd8.css">
   <script type="module">try{import("_").catch(()=>1);}catch(e){}window.__vite_is_dynamic_import_support=true;</script>
@@ -184,7 +194,12 @@
   </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 id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.93313b91.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colxiu-website-legacy.1762d7e9.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.2297a4a6.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colxiu-website-legacy.a374f328.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> master
 </body>
 </html>

dist/index.html

@@ -49,11 +49,19 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/index.ec5efe3d.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.a9d4801b.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/main.bff7592c.js">
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.01a50f76.css">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/index.9346d1dd.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.b1d638c8.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/main.fc6e7dc5.js">
+  <link rel="stylesheet" href="/orchestra-music-score/assets/App.8c54dc63.css">
+>>>>>>> master
   <script type="module">try{import("_").catch(()=>1);}catch(e){}window.__vite_is_dynamic_import_support=true;</script>
   <script type="module">!function(){if(window.__vite_is_dynamic_import_support)return;console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above 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>
@@ -81,8 +89,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 id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.93313b91.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/index-legacy.f2a15e15.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.2297a4a6.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/index-legacy.f8c90866.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> master
 </body>
 
 </html>

dist/music-sheet.html

@@ -128,9 +128,15 @@
         line-height: 1.8;
       }
     </style>
+<<<<<<< HEAD
     <script type="module" crossorigin src="/orchestra-music-score/assets/music-sheet.02bde301.js"></script>
     <link rel="modulepreload" href="/orchestra-music-score/assets/App.a9d4801b.js">
     <link rel="stylesheet" href="/orchestra-music-score/assets/App.01a50f76.css">
+=======
+    <script type="module" crossorigin src="/orchestra-music-score/assets/music-sheet.cbef5b1f.js"></script>
+    <link rel="modulepreload" href="/orchestra-music-score/assets/App.b1d638c8.js">
+    <link rel="stylesheet" href="/orchestra-music-score/assets/App.8c54dc63.css">
+>>>>>>> master
     <link rel="stylesheet" href="/orchestra-music-score/assets/index.fe7dacd8.css">
     <script type="module">try{import("_").catch(()=>1);}catch(e){}window.__vite_is_dynamic_import_support=true;</script>
     <script type="module">!function(){if(window.__vite_is_dynamic_import_support)return;console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above 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>
@@ -215,7 +221,12 @@
     </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 id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.93313b91.js"></script>
     <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/music-sheet-legacy.33f08532.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+    <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.2297a4a6.js"></script>
+    <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/music-sheet-legacy.4c5b1a6e.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> master
   </body>
 </html>

dist/orchestra.html

@@ -49,11 +49,19 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/orchestra.83e24cc3.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.a9d4801b.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/main.bff7592c.js">
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.01a50f76.css">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/orchestra.26182b2b.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.b1d638c8.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/main.fc6e7dc5.js">
+  <link rel="stylesheet" href="/orchestra-music-score/assets/App.8c54dc63.css">
+>>>>>>> master
   <script type="module">try{import("_").catch(()=>1);}catch(e){}window.__vite_is_dynamic_import_support=true;</script>
   <script type="module">!function(){if(window.__vite_is_dynamic_import_support)return;console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above 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>
@@ -81,8 +89,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 id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.93313b91.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/orchestra-legacy.d4e16e7d.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule id="vite-legacy-polyfill" src="/orchestra-music-score/assets/polyfills-legacy.2297a4a6.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/orchestra-legacy.1467b104.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> master
 </body>
 
 </html>

src/pages/detail/runtime.ts

@@ -33,6 +33,7 @@ import EventEmitter from 'eventemitter3'
 import { useClientType, useOriginSearch } from '/src/subpages/colexiu/uses'
 import { evaluatPlayerStop } from '/src/subpages/colexiu/buttons/evaluating'
 import { unitTestData } from '/src/subpages/colexiu/unitTest'
+import { modelType } from '/src/subpages/colexiu/buttons'
 
 export const event = new EventEmitter()
 
@@ -443,7 +444,11 @@ export const refreshPlayer = async (ctime?: number) => {
       }
       setSectionModeCurrentTime()
       clearAccelerateRefreshPlayer()
-      setTimeout(() => setPlayState(), 1000)
+      setTimeout(() => {
+        if (detailState.section.length){
+          setPlayState()
+        }
+      }, 1000)
       state.loading = false
       return
     }
@@ -487,7 +492,6 @@ export const resetPlayStatus = async (notStop?: boolean) => {
             songID: detailState.activeDetail.examSongId,
           },
         })
-        endCapture()
       } else {
         console.log('resetPlayStatus调用暂停')
         state.audiosInstance.pause()
@@ -540,15 +544,10 @@ export const pause = async () => {
       api: 'cloudSuspend',
     })
     await setDelayTime(200)
-    endCapture()
   } else {
     state.playState = state.audiosInstance.getStatus()
     clearAccelerateRefreshPlayer()
     state.audiosInstance.pause()
-    setTimeout(() => {
-      // 确保播放完毕，延迟200ms
-      endCapture()
-    }, 200)
   }
 }
 
@@ -712,6 +711,7 @@ const cloudToggleState = async () => {
 }
 
 export const toggleState = async (delay?: number) => {
+  if (modelType.value === 'init') return
   if (detailState.activeDetail.isAppPlay) {
     await cloudToggleState()
   } else {

src/pages/detail/speed.module.less

@@ -27,7 +27,7 @@
   align-items: center;
   justify-content: space-between;
   height: calc(90% - 65px);
-  max-height: 300PX;
+  max-height: 400PX;
   >span{
       margin-right: calc(10px * var(--screen));
   }
@@ -49,6 +49,12 @@
               margin-top: calc(2px * var(--screen));
           }
         }
+        .van-button:first-child{
+          margin-bottom: 5px;
+        }
+        .van-button:nth-child(3){
+          margin-top: 5px;
+        }
       }
       .slider{
         height: calc(100vh - 40px - 65px - 20px - 20px);

src/pages/report/player/content.tsx

@@ -1,15 +1,15 @@
 import { defineComponent, ref, Ref } from 'vue'
 import classnames from 'classnames'
-import appstate from '/src/state'
-import Plyr from 'plyr'
-import request from '/src/helpers/request'
-import qs from 'query-string'
-import 'plyr/dist/plyr.css'
+// import appstate from '/src/state'
+// import Plyr from 'plyr'
+// import request from '/src/helpers/request'
+// import qs from 'query-string'
+// import 'plyr/dist/plyr.css'
 
 import videobg from './videobg.png'
 
 const videoRef: Ref<HTMLVideoElement | null> = ref(null)
-let play: Plyr | null = null
+// let play: Plyr | null = null
 
 import styles from './index.module.less'
 import { postMessage } from '/src/helpers/native-message'
@@ -38,98 +38,99 @@ export default defineComponent({
     }
   },
   mounted() {
-    if (videoRef.value) {
-      const options: any = {
-        controls: ['play-large', 'play', 'progress', 'current-time', 'airplay'],
-        fullscreen: browserInfo.ios ? {
-          enabled: true,
-          fallback: true,
-          iosNative: true,
-        } : false
-      }
-      if (browserInfo.ios) {
-        options.controls.push('fullscreen')
-      }
-      play = new Plyr(videoRef.value, options)
-      play.on('enterfullscreen', () => (this.isFullScreen = true))
-      play.on('exitfullscreen', () => (this.isFullScreen = false))
-      if (this.mediaType() === 'video' && getRequestHostname() === '/api-student') {
-        const shareButton = document.createElement('button')
-        shareButton.className = 'plyr__controls__item plyr__control plyr__share-button'
-        shareButton.innerHTML = `<?xml version="1.0" encoding="UTF-8"?>
-        <svg width="19px" height="19px" viewBox="0 0 19 19" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-            <!-- Generator: Sketch 62 (91390) - https://sketch.com -->
-            <title>编组 12</title>
-            <desc>Created with Sketch.</desc>
-            <g id="分享" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-                <g id="训练统计备份-11" transform="translate(-343.000000, -35.000000)" fill="#fff" fill-rule="nonzero" stroke="#fff" stroke-width="0.4">
-                    <g id="编组-12" transform="translate(344.000000, 36.000000)">
-                        <g id="编组备份">
-                            <path d="M16.2470898,9.95964844 C15.8204687,9.95964844 15.4739063,10.3062109 15.4739063,10.7331641 L15.4739063,13.322207 C15.4739063,14.5087305 14.5086328,15.4740625 13.3220898,15.4740625 L3.70880859,15.4740625 C2.52246094,15.4740625 1.55714844,14.5087305 1.55714844,13.322207 L1.55714844,3.70892578 C1.55714844,2.52259766 2.52246094,1.55728516 3.70880859,1.55728516 L6.24816406,1.55728516 C6.67533203,1.55728516 7.02169922,1.21089844 7.02169922,0.784316406 C7.02169922,0.356972656 6.6753125,0.0105859375 6.24816406,0.0105859375 L3.70880859,0.0105859375 C1.66607422,0.0105859375 0.0106640625,1.66619141 0.0106640625,3.70892578 L0.0106640625,13.322207 C0.0106640625,15.3649609 1.66607422,17.0207227 3.70880859,17.0207227 L13.3220898,17.0207227 C15.3648047,17.0207227 17.0206055,15.3649609 17.0206055,13.322207 L17.0206055,10.7331641 C17.0206055,10.3062109 16.674043,9.95964844 16.2470898,9.95964844 Z" id="路径"></path>
-                            <path d="M10.8350195,1.56066406 L14.4217969,1.56066406 C14.3497037,1.60870774 14.2825522,1.66378187 14.2213281,1.72507812 L6.35746094,9.58894531 C5.96238281,9.98341797 5.88708984,10.5485742 6.18929688,10.8502148 C6.49111328,11.1525977 7.05607422,11.0770703 7.45056641,10.6818555 L15.3149805,2.81818359 C15.3739557,2.75927938 15.4271724,2.69487912 15.4739063,2.62585937 L15.4739063,6.19996094 C15.4739063,6.62693359 15.8200977,6.97310547 16.2470898,6.97310547 C16.6743945,6.97310547 17.0202734,6.62693359 17.0202734,6.19996094 L17.0202734,0.787519531 C17.0202734,0.360546875 16.6743945,0.014375 16.2470898,0.014375 L10.8350195,0.014375 C10.4076758,0.014375 10.0618359,0.360566406 10.0618359,0.787519531 C10.0618359,1.21447266 10.4076758,1.56066406 10.8350195,1.56066406 Z" id="路径"></path>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </svg>`
-        shareButton.onclick = async () => {
-          try {
-            const pathname =
-            location.origin.indexOf('localhost') > -1 || location.origin.indexOf('192.168') > -1 ? '' : '/accompany'
-            const getShareUrl = () => {
-              const shareData: any = {
-                name: appstate.user?.username || '',
-                subjectName: (appstate.user?.subjectName || '').split(',')[0] || '',
-                avatar: encodeURIComponent(appstate.user?.avatar || ''),
-                src: encodeURIComponent(this.videoFilePath || ''),
-              }
-              return `${location.origin}${pathname}/share-colexiu/index.html?${qs.stringify(shareData)}`
-            }
-            // const pathname =
-            //   location.origin.indexOf('localhost') > -1 || location.origin.indexOf('192.168') > -1 ? '' : '/accompany'
-            // const url = `${location.origin}${pathname}/share-colexiu/index.html?src=${encodeURIComponent(
-            //   this.videoFilePath || ''
-            // )}&name=${encodeURIComponent(appstate.user?.student?.username || '')}&subjectName=${encodeURIComponent(
-            //   (appstate.user?.student?.subjectNames || '').split(',')[0] || ''
-            // )}&avatar=${encodeURIComponent(appstate.user?.student?.avatar || '')}`
-            const res = await request.post('/sysConfig/shortURL', {
-              data: {
-                orginURL: getShareUrl(),
-              },
-            })
+    return
+    // if (videoRef.value) {
+    //   const options: any = {
+    //     controls: ['play-large', 'play', 'progress', 'current-time', 'airplay'],
+    //     fullscreen: browserInfo.ios ? {
+    //       enabled: true,
+    //       fallback: true,
+    //       iosNative: true,
+    //     } : false
+    //   }
+    //   if (browserInfo.ios) {
+    //     options.controls.push('fullscreen')
+    //   }
+    //   play = new Plyr(videoRef.value, options)
+    //   play.on('enterfullscreen', () => (this.isFullScreen = true))
+    //   play.on('exitfullscreen', () => (this.isFullScreen = false))
+    //   if (this.mediaType() === 'video' && getRequestHostname() === '/api-student') {
+    //     const shareButton = document.createElement('button')
+    //     shareButton.className = 'plyr__controls__item plyr__control plyr__share-button'
+    //     shareButton.innerHTML = `<?xml version="1.0" encoding="UTF-8"?>
+    //     <svg width="19px" height="19px" viewBox="0 0 19 19" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    //         <!-- Generator: Sketch 62 (91390) - https://sketch.com -->
+    //         <title>编组 12</title>
+    //         <desc>Created with Sketch.</desc>
+    //         <g id="分享" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    //             <g id="训练统计备份-11" transform="translate(-343.000000, -35.000000)" fill="#fff" fill-rule="nonzero" stroke="#fff" stroke-width="0.4">
+    //                 <g id="编组-12" transform="translate(344.000000, 36.000000)">
+    //                     <g id="编组备份">
+    //                         <path d="M16.2470898,9.95964844 C15.8204687,9.95964844 15.4739063,10.3062109 15.4739063,10.7331641 L15.4739063,13.322207 C15.4739063,14.5087305 14.5086328,15.4740625 13.3220898,15.4740625 L3.70880859,15.4740625 C2.52246094,15.4740625 1.55714844,14.5087305 1.55714844,13.322207 L1.55714844,3.70892578 C1.55714844,2.52259766 2.52246094,1.55728516 3.70880859,1.55728516 L6.24816406,1.55728516 C6.67533203,1.55728516 7.02169922,1.21089844 7.02169922,0.784316406 C7.02169922,0.356972656 6.6753125,0.0105859375 6.24816406,0.0105859375 L3.70880859,0.0105859375 C1.66607422,0.0105859375 0.0106640625,1.66619141 0.0106640625,3.70892578 L0.0106640625,13.322207 C0.0106640625,15.3649609 1.66607422,17.0207227 3.70880859,17.0207227 L13.3220898,17.0207227 C15.3648047,17.0207227 17.0206055,15.3649609 17.0206055,13.322207 L17.0206055,10.7331641 C17.0206055,10.3062109 16.674043,9.95964844 16.2470898,9.95964844 Z" id="路径"></path>
+    //                         <path d="M10.8350195,1.56066406 L14.4217969,1.56066406 C14.3497037,1.60870774 14.2825522,1.66378187 14.2213281,1.72507812 L6.35746094,9.58894531 C5.96238281,9.98341797 5.88708984,10.5485742 6.18929688,10.8502148 C6.49111328,11.1525977 7.05607422,11.0770703 7.45056641,10.6818555 L15.3149805,2.81818359 C15.3739557,2.75927938 15.4271724,2.69487912 15.4739063,2.62585937 L15.4739063,6.19996094 C15.4739063,6.62693359 15.8200977,6.97310547 16.2470898,6.97310547 C16.6743945,6.97310547 17.0202734,6.62693359 17.0202734,6.19996094 L17.0202734,0.787519531 C17.0202734,0.360546875 16.6743945,0.014375 16.2470898,0.014375 L10.8350195,0.014375 C10.4076758,0.014375 10.0618359,0.360566406 10.0618359,0.787519531 C10.0618359,1.21447266 10.4076758,1.56066406 10.8350195,1.56066406 Z" id="路径"></path>
+    //                     </g>
+    //                 </g>
+    //             </g>
+    //         </g>
+    //     </svg>`
+    //     shareButton.onclick = async () => {
+    //       try {
+    //         const pathname =
+    //         location.origin.indexOf('localhost') > -1 || location.origin.indexOf('192.168') > -1 ? '' : '/accompany'
+    //         const getShareUrl = () => {
+    //           const shareData: any = {
+    //             name: appstate.user?.username || '',
+    //             subjectName: (appstate.user?.subjectName || '').split(',')[0] || '',
+    //             avatar: encodeURIComponent(appstate.user?.avatar || ''),
+    //             src: encodeURIComponent(this.videoFilePath || ''),
+    //           }
+    //           return `${location.origin}${pathname}/share-colexiu/index.html?${qs.stringify(shareData)}`
+    //         }
+    //         // const pathname =
+    //         //   location.origin.indexOf('localhost') > -1 || location.origin.indexOf('192.168') > -1 ? '' : '/accompany'
+    //         // const url = `${location.origin}${pathname}/share-colexiu/index.html?src=${encodeURIComponent(
+    //         //   this.videoFilePath || ''
+    //         // )}&name=${encodeURIComponent(appstate.user?.student?.username || '')}&subjectName=${encodeURIComponent(
+    //         //   (appstate.user?.student?.subjectNames || '').split(',')[0] || ''
+    //         // )}&avatar=${encodeURIComponent(appstate.user?.student?.avatar || '')}`
+    //         const res = await request.post('/sysConfig/shortURL', {
+    //           data: {
+    //             orginURL: getShareUrl(),
+    //           },
+    //         })
 
-            postMessage(
-              {
-                api: 'shareAchievements',
-                content: {
-                  title: '用这款APP在家就能高效完成乐器练习，快来看我分享的作品吧！',
-                  desc: '坚持练习，收获成长！今天我用小酷AI录制了一段演奏视频，欢迎大家来观看！',
-                  image: '',
-                  video: res.data,
-                  type: 'video',
-                  button: ['copy'],
-                  url: getShareUrl()
-                },
-              },
-              (res) => {
-                if (res?.content?.message) {
-                  Toast(res?.content?.message)
-                }
-              }
-            )
-          } catch (error) {
-            Toast('分享地址获取失败，请重试')
-          }
-        }
-        play.elements.controls?.appendChild(shareButton)
-      }
-    }
-  },
-  unmounted() {
-    if (play) {
-      play = null
-    }
+    //         postMessage(
+    //           {
+    //             api: 'shareAchievements',
+    //             content: {
+    //               title: '用这款APP在家就能高效完成乐器练习，快来看我分享的作品吧！',
+    //               desc: '坚持练习，收获成长！今天我用小酷AI录制了一段演奏视频，欢迎大家来观看！',
+    //               image: '',
+    //               video: res.data,
+    //               type: 'video',
+    //               button: ['copy'],
+    //               url: getShareUrl()
+    //             },
+    //           },
+    //           (res) => {
+    //             if (res?.content?.message) {
+    //               Toast(res?.content?.message)
+    //             }
+    //           }
+    //         )
+    //       } catch (error) {
+    //         Toast('分享地址获取失败，请重试')
+    //       }
+    //     }
+    //     play.elements.controls?.appendChild(shareButton)
+    //   }
+    // }
   },
+  // unmounted() {
+  //   if (play) {
+  //     play = null
+  //   }
+  // },
   methods: {
     mediaType(): 'audio' | 'video' {
       const subfix = (this.videoFilePath || '').split('.').pop()
@@ -141,7 +142,7 @@ export default defineComponent({
   },
   render() {
     return (
-      <div class={classnames(styles.content, styles.fbcContent, { [styles.full]: this.isFullScreen }, this.className)}>
+      <div>
         {this.mediaType() === 'audio' ? (
           <audio ref={videoRef} src={this.videoFilePath} controls="false" preload="metadata" playsinline />
         ) : (

src/subpages/colexiu-report/header/index.module.less

@@ -208,6 +208,7 @@
   width: 16px;
   height: 16px;
   display: flex;
+  z-index: 10;
   img {
     display: block;
     width: 100%;
@@ -233,3 +234,29 @@
     // overflow: hidden;
   }
 }
+.videoContent{
+  margin: 0;
+  border-radius: 10px;
+  --plyr-color-main: var(--van-primary-color);
+  background-color: transparent;
+  .box{
+    display: flex;
+    align-items: center;
+    overflow: hidden;
+    max-width: 80vw;
+    height: 80vh;
+    max-height: 325px;
+    video{
+      width: 100%;
+      height: 100%;
+      object-fit: contain;
+    }
+    
+  }
+  :global{
+    .plyr{
+      border-radius: 10px;
+      height: 100%;
+    }
+  }
+}

src/subpages/colexiu-report/header/index.tsx

@@ -1,4 +1,4 @@
-import { defineComponent, toRefs, PropType, ref, Transition, onMounted } from 'vue'
+import { defineComponent, toRefs, PropType, ref, Transition, onMounted, computed, nextTick } from 'vue'
 import { Button, Grid, GridItem, Popup } from 'vant'
 import qs from 'query-string'
 import { MusicSheelDetail, ShaeetStatusType } from '../../colexiu/index.d'
@@ -17,6 +17,9 @@ import detailStyles from './index.module.less'
 import { postMessage } from '/src/helpers/native-message'
 import { useOriginSearch } from '../../colexiu/uses'
 import { browser } from '/src/helpers/utils'
+import videobg from './videobg.png'
+import 'plyr/dist/plyr.css'
+import Plyr from 'plyr'
 
 export const active = ref<'pitch' | 'rhythm' | 'completion'>('pitch')
 
@@ -40,12 +43,14 @@ export default defineComponent({
     const browserInfo = browser()
     const search = useOriginSearch()
     const { detail, record } = toRefs(props)
+    const videoShow = ref(false)
+    const isInitPlyr = ref(false)
     const back = () => {
       postMessage({
         api: 'back',
       })
     }
-
+    const _plrl = ref()
     const autoShow = () => {
       if (localStorage.getItem('explain-view') != '1') {
         visible.value = true
@@ -81,6 +86,26 @@ export default defineComponent({
         },
       })
     }
+    const mediaType = computed(() => {
+      const subfix = (record.value?.videoFilePath || '').split('.').pop()
+      if (subfix === 'wav' || subfix === 'mp3') {
+        return 'audio'
+      }
+      return 'video'
+    })
+
+    const openAudioAndVideo = () => {
+      videoShow.value = true
+      if (isInitPlyr.value) return
+      nextTick(() => {
+        const id = mediaType.value === 'audio' ? '#audioSrc' : '#videoSrc'
+        _plrl.value = new Plyr(id, {
+          controls: ['play-large', 'play', 'progress'],
+          fullscreen: {enabled: false}
+        })
+        isInitPlyr.value = true
+      })
+    }
 
     expose({
       autoShow,
@@ -92,12 +117,12 @@ export default defineComponent({
           <div class={styles.info}>
             <div class={styles.leftButton}>
               <Button onClick={back} class={styles.back}>
-                <img style={{width: '30px', height: '30px', display: 'block'}} src={BackIcon} alt="back" />
+                <img style={{ width: '30px', height: '30px', display: 'block' }} src={BackIcon} alt="back" />
               </Button>
               <span class={styles.musicName}>{record?.value?.sysMusicScoreName}</span>
             </div>
             {record.value && record.value?.heardLevel ? (
-              <Grid class={styles.center} columnNum={5} style={{alignItems: 'center', 'flex-wrap' : 'nowrap'}}>
+              <Grid class={styles.center} columnNum={5} style={{ alignItems: 'center', 'flex-wrap': 'nowrap' }}>
                 <GridItem
                   class="van-hairline--right"
                   vSlots={{
@@ -112,17 +137,21 @@ export default defineComponent({
                     text: () => <span>评测分数</span>,
                   }}
                 />
-                {detailState.isPercussion ? null : <GridItem
-                  class="van-hairline--right"
-                  onClick={() => {
-                    active.value = 'pitch'
-                    emit('activeChange', 'pitch')
-                  }}
-                  vSlots={{
-                    icon: () => <span style={{ color: 'var(--van-primary-color)' }}>{record.value?.intonation}分</span>,
-                    text: () => <span class={['switch', { active: active.value === 'pitch' }]}>音准</span>,
-                  }}
-                />}
+                {detailState.isPercussion ? null : (
+                  <GridItem
+                    class="van-hairline--right"
+                    onClick={() => {
+                      active.value = 'pitch'
+                      emit('activeChange', 'pitch')
+                    }}
+                    vSlots={{
+                      icon: () => (
+                        <span style={{ color: 'var(--van-primary-color)' }}>{record.value?.intonation}分</span>
+                      ),
+                      text: () => <span class={['switch', { active: active.value === 'pitch' }]}>音准</span>,
+                    }}
+                  />
+                )}
                 <GridItem
                   class="van-hairline--right"
                   onClick={() => {
@@ -134,29 +163,33 @@ export default defineComponent({
                     text: () => <span class={['switch', { active: active.value === 'rhythm' }]}>节奏</span>,
                   }}
                 />
-                {detailState.isPercussion ? null : <GridItem
-                  onClick={() => {
-                    active.value = 'completion'
-                    emit('activeChange', 'completion')
-                  }}
-                  vSlots={{
-                    icon: () => <span style={{ color: '#4EA1FF' }}>{record.value?.integrity}分</span>,
-                    text: () => <span class={['switch', { active: active.value === 'completion' }]}>完成度</span>,
-                  }}
-                />}
-              </Grid>
-            ) : null}
-            <Grid class={styles.btns} style={{alignItems: 'center', 'flex-wrap' : 'nowrap'}}>
-              {record.value?.videoFilePath && browserInfo.isStudent ? (
-                <PlayerPopup {...record.value} btnClass={'van-grid-item'} popupClass={detailStyles.popup}>
+                {detailState.isPercussion ? null : (
                   <GridItem
+                    onClick={() => {
+                      active.value = 'completion'
+                      emit('activeChange', 'completion')
+                    }}
                     vSlots={{
-                      icon: () => <img src={ReplayIcon} />,
-                      text: () => <span>回放</span>,
+                      icon: () => <span style={{ color: '#4EA1FF' }}>{record.value?.integrity}分</span>,
+                      text: () => <span class={['switch', { active: active.value === 'completion' }]}>完成度</span>,
                     }}
                   />
-                </PlayerPopup>
-              ) : null}
+                )}
+              </Grid>
+            ) : null}
+            <Grid class={styles.btns} style={{ alignItems: 'center', 'flex-wrap': 'nowrap' }}>
+              {record.value?.videoFilePath && browserInfo.isStudent ? (
+                <GridItem
+                  onClick={openAudioAndVideo}
+                  vSlots={{
+                    icon: () => <img src={ReplayIcon} />,
+                    text: () => <span>回放</span>,
+                  }}
+                />
+              ) : // <PlayerPopup {...record.value} btnClass={'van-grid-item'} popupClass={detailStyles.popup}>
+
+              // </PlayerPopup>
+              null}
               <GridItem
                 onClick={() => (visible.value = true)}
                 vSlots={{
@@ -283,6 +316,29 @@ export default defineComponent({
               />
             </Grid>
           </Popup>
+
+          <Popup teleport="body" v-model:show={videoShow.value} class={styles.videoContent} onClose={() => {
+            _plrl.value?.pause()
+          }}>
+            <div class={styles.close} onClick={() => (videoShow.value = false)}>
+              <img src={CloseIcon} />
+            </div>
+            {mediaType.value === 'audio' && (
+              <audio id="audioSrc" src={record.value?.videoFilePath} controls="false" preload="metadata" playsinline />
+            )}
+            {mediaType.value === 'video' && (
+              <div class={styles.box}>
+                <video
+                  id="videoSrc"
+                  class={styles.videoBox}
+                  src={record.value?.videoFilePath}
+                  data-poster={videobg}
+                  preload="metadata"
+                  playsinline
+                />
+              </div>
+            )}
+          </Popup>
         </header>
       )
     }

src/subpages/colexiu-report/index.tsx

@@ -257,7 +257,6 @@ export default defineComponent({
           class={[
             styles.container,
             SettingState.sett.eyeProtection && 'eyeProtection',
-            SettingState.sett.camera && 'openCamera',
           ]}
         >
           {!renderLoading.value && (

src/subpages/colexiu/buttons/index.tsx

@@ -227,7 +227,7 @@ export default defineComponent({
                 onClick={() => {
                   // 不是课后训练选段和单元测验选段,切换模式去除选段
                   if (!unitTestData.isSelectMeasureMode && detailState.sectionStatus) {
-                    RuntimeUtils.sectionChange()
+                    RuntimeUtils.clearSectionStatus()
                   }
                   if (modelType.value === 'practice') {
                     // 当前为练习模式,需要停止播放
@@ -264,8 +264,10 @@ export default defineComponent({
                   show-arrow={false}
                   vSlots={{
                     reference: () => (
-                      <div>
-                        <Button class={[styles.button, styles.hasText]}>
+                      <div onClick={(e: Event) => {
+                        if (!startButtonShow.value) e.stopPropagation()
+                      }}>
+                        <Button class={[styles.button, styles.hasText]} disabled={!startButtonShow.value}>
                           <img src={SettingState.sett.camera ? iconCameraOn : iconCameraOff} />
                           <span>摄像头</span>
                         </Button>
@@ -337,6 +339,7 @@ export default defineComponent({
                 <Button
                   data-step="m3"
                   class={[styles.button, styles.hasText]}
+                  disabled={runtime.playState === 'play'}
                   onClick={() => {
                     SettingState.sett.fingering = !SettingState.sett.fingering
                     RuntimeUtils.event.emit('settingFingeringChange')
@@ -443,7 +446,7 @@ export default defineComponent({
                   onClick={() => {
                     settingPopup.value?.onShow()
                   }}
-                  disabled={runtime.evaluatingStatus && !startButtonShow.value}
+                  disabled={(runtime.evaluatingStatus && !startButtonShow.value) || runtime.playState === 'play' || followRef.value?.data.start }
                 >
                   <ButtonIcon name="setting" />
                   <span>设置</span>

src/subpages/colexiu/index.tsx

@@ -134,7 +134,11 @@ export default defineComponent({
     const settingFingeringChange = throttle(() => {
       const { direction } = fingeringDetail.value as ITypeContentItem
       if (direction === 'vertical') {
-        // Toast('加载中，请稍后...')
+        Toast('加载中，请稍后...')
+        // Toast({
+        //   type: 'loading',
+        //   message: '加载中...'
+        // })
         setTimeout(() => {
           MusicSheetRef.value.reRender()
         }, 16)