Merge branch 'feature-pc-choose' into gyt-test

dist/assets/arrow-left-legacy.27e8a022.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/arrow-left-legacy.27e8a022.js
 !function(){var e=document.createElement("style");e.innerHTML="._container_5v2hh_1{min-width:calc(2.66667rem * var(--screen));width:200%;max-width:calc(5.33333rem * var(--screen));background:#fff;display:flex;align-items:center;height:calc(.64rem * var(--screen));padding:0 calc(.10667rem * var(--screen));border-radius:calc(.4rem * var(--screen))}._container_5v2hh_1>img._icon_5v2hh_12{width:.53333rem;height:.53333rem}._container_5v2hh_1>img._status_5v2hh_16{width:.26667rem;height:.26667rem}._container_5v2hh_1 ._noticeBar_5v2hh_20{height:calc(.8rem * var(--screen));font-size:calc(.32rem * var(--screen));overflow:hidden;color:#000;font-weight:600;padding-left:calc(.16rem * var(--screen));flex:1}\n",document.head.appendChild(e),System.register(["./music-legacy.996cf9b7.js","./App-legacy.b4c36e98.js"],(function(e){"use strict";var r,t,c,n;return{setters:[function(e){r=e.M},function(e){t=e.d,c=e.a,n=e.V}],execute:function(){var i="_container_5v2hh_1",a="_icon_5v2hh_12",s="_status_5v2hh_16",h="_noticeBar_5v2hh_20";e("T",t({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render:function(){return c("div",{onClick:this.onClick,class:i},[c("img",{class:a,src:r},null),c(n,{text:this.title,color:"#4a4a4a",class:h,background:"none"},null),this.rightView?c("img",{class:s,src:"/orchestra-music-score/assets/arrow.7d6e3644.svg"},null):null])}})),e("I","/orchestra-music-score/assets/arrow-left.f58aff1f.svg")}}}))}();
+========
+!function(){var e=document.createElement("style");e.innerHTML="._container_5v2hh_1{min-width:calc(2.66667rem * var(--screen));width:200%;max-width:calc(5.33333rem * var(--screen));background:#fff;display:flex;align-items:center;height:calc(.64rem * var(--screen));padding:0 calc(.10667rem * var(--screen));border-radius:calc(.4rem * var(--screen))}._container_5v2hh_1>img._icon_5v2hh_12{width:.53333rem;height:.53333rem}._container_5v2hh_1>img._status_5v2hh_16{width:.26667rem;height:.26667rem}._container_5v2hh_1 ._noticeBar_5v2hh_20{height:calc(.8rem * var(--screen));font-size:calc(.32rem * var(--screen));overflow:hidden;color:#000;font-weight:600;padding-left:calc(.16rem * var(--screen));flex:1}\n",document.head.appendChild(e),System.register(["./music-legacy.996cf9b7.js","./App-legacy.15a58ca0.js"],(function(e){"use strict";var r,t,c,n;return{setters:[function(e){r=e.M},function(e){t=e.d,c=e.a,n=e.V}],execute:function(){var a="_container_5v2hh_1",i="_icon_5v2hh_12",s="_status_5v2hh_16",h="_noticeBar_5v2hh_20";e("T",t({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render:function(){return c("div",{onClick:this.onClick,class:a},[c("img",{class:i,src:r},null),c(n,{text:this.title,color:"#4a4a4a",class:h,background:"none"},null),this.rightView?c("img",{class:s,src:"/orchestra-music-score/assets/arrow.7d6e3644.svg"},null):null])}})),e("I","/orchestra-music-score/assets/arrow-left.f58aff1f.svg")}}}))}();
+>>>>>>>> feature-pc-choose:dist/assets/arrow-left-legacy.2be3a11d.js

dist/assets/arrow-left-legacy.2be3a11d.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/arrow-left-legacy.27e8a022.js
+!function(){var e=document.createElement("style");e.innerHTML="._container_5v2hh_1{min-width:calc(2.66667rem * var(--screen));width:200%;max-width:calc(5.33333rem * var(--screen));background:#fff;display:flex;align-items:center;height:calc(.64rem * var(--screen));padding:0 calc(.10667rem * var(--screen));border-radius:calc(.4rem * var(--screen))}._container_5v2hh_1>img._icon_5v2hh_12{width:.53333rem;height:.53333rem}._container_5v2hh_1>img._status_5v2hh_16{width:.26667rem;height:.26667rem}._container_5v2hh_1 ._noticeBar_5v2hh_20{height:calc(.8rem * var(--screen));font-size:calc(.32rem * var(--screen));overflow:hidden;color:#000;font-weight:600;padding-left:calc(.16rem * var(--screen));flex:1}\n",document.head.appendChild(e),System.register(["./music-legacy.996cf9b7.js","./App-legacy.b4c36e98.js"],(function(e){"use strict";var r,t,c,n;return{setters:[function(e){r=e.M},function(e){t=e.d,c=e.a,n=e.V}],execute:function(){var i="_container_5v2hh_1",a="_icon_5v2hh_12",s="_status_5v2hh_16",h="_noticeBar_5v2hh_20";e("T",t({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render:function(){return c("div",{onClick:this.onClick,class:i},[c("img",{class:a,src:r},null),c(n,{text:this.title,color:"#4a4a4a",class:h,background:"none"},null),this.rightView?c("img",{class:s,src:"/orchestra-music-score/assets/arrow.7d6e3644.svg"},null):null])}})),e("I","/orchestra-music-score/assets/arrow-left.f58aff1f.svg")}}}))}();
+========
+!function(){var e=document.createElement("style");e.innerHTML="._container_5v2hh_1{min-width:calc(2.66667rem * var(--screen));width:200%;max-width:calc(5.33333rem * var(--screen));background:#fff;display:flex;align-items:center;height:calc(.64rem * var(--screen));padding:0 calc(.10667rem * var(--screen));border-radius:calc(.4rem * var(--screen))}._container_5v2hh_1>img._icon_5v2hh_12{width:.53333rem;height:.53333rem}._container_5v2hh_1>img._status_5v2hh_16{width:.26667rem;height:.26667rem}._container_5v2hh_1 ._noticeBar_5v2hh_20{height:calc(.8rem * var(--screen));font-size:calc(.32rem * var(--screen));overflow:hidden;color:#000;font-weight:600;padding-left:calc(.16rem * var(--screen));flex:1}\n",document.head.appendChild(e),System.register(["./music-legacy.996cf9b7.js","./App-legacy.15a58ca0.js"],(function(e){"use strict";var r,t,c,n;return{setters:[function(e){r=e.M},function(e){t=e.d,c=e.a,n=e.V}],execute:function(){var a="_container_5v2hh_1",i="_icon_5v2hh_12",s="_status_5v2hh_16",h="_noticeBar_5v2hh_20";e("T",t({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render:function(){return c("div",{onClick:this.onClick,class:a},[c("img",{class:i,src:r},null),c(n,{text:this.title,color:"#4a4a4a",class:h,background:"none"},null),this.rightView?c("img",{class:s,src:"/orchestra-music-score/assets/arrow.7d6e3644.svg"},null):null])}})),e("I","/orchestra-music-score/assets/arrow-left.f58aff1f.svg")}}}))}();
+>>>>>>>> feature-pc-choose:dist/assets/arrow-left-legacy.2be3a11d.js

dist/assets/arrow-left.0b8863bd.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/arrow-left.6580c426.js
+import{M as o}from"./music.b35eb5be.js";import{d as e,a as t,V as r}from"./App.05fd3a47.js";const a="_container_5v2hh_1",n="_icon_5v2hh_12",c="_status_5v2hh_16",i="_noticeBar_5v2hh_20";var s={container:a,icon:n,status:c,noticeBar:i},l="/orchestra-music-score/assets/arrow.7d6e3644.svg",_=e({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render(){return t("div",{onClick:this.onClick,class:s.container},[t("img",{class:s.icon,src:o},null),t(r,{text:this.title,color:"#4a4a4a",class:s.noticeBar,background:"none"},null),this.rightView?t("img",{class:s.status,src:l},null):null])}}),f="/orchestra-music-score/assets/arrow-left.f58aff1f.svg";export{f as I,_ as T};
+========
+import{M as o}from"./music.b35eb5be.js";import{d as e,a as t,V as r}from"./App.948dcab3.js";const a="_container_5v2hh_1",n="_icon_5v2hh_12",c="_status_5v2hh_16",i="_noticeBar_5v2hh_20";var s={container:a,icon:n,status:c,noticeBar:i},l="/orchestra-music-score/assets/arrow.7d6e3644.svg",_=e({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render(){return t("div",{onClick:this.onClick,class:s.container},[t("img",{class:s.icon,src:o},null),t(r,{text:this.title,color:"#4a4a4a",class:s.noticeBar,background:"none"},null),this.rightView?t("img",{class:s.status,src:l},null):null])}}),f="/orchestra-music-score/assets/arrow-left.f58aff1f.svg";export{f as I,_ as T};
+>>>>>>>> feature-pc-choose:dist/assets/arrow-left.0b8863bd.js

dist/assets/arrow-left.6580c426.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/arrow-left.6580c426.js
 import{M as o}from"./music.b35eb5be.js";import{d as e,a as t,V as r}from"./App.05fd3a47.js";const a="_container_5v2hh_1",n="_icon_5v2hh_12",c="_status_5v2hh_16",i="_noticeBar_5v2hh_20";var s={container:a,icon:n,status:c,noticeBar:i},l="/orchestra-music-score/assets/arrow.7d6e3644.svg",_=e({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render(){return t("div",{onClick:this.onClick,class:s.container},[t("img",{class:s.icon,src:o},null),t(r,{text:this.title,color:"#4a4a4a",class:s.noticeBar,background:"none"},null),this.rightView?t("img",{class:s.status,src:l},null):null])}}),f="/orchestra-music-score/assets/arrow-left.f58aff1f.svg";export{f as I,_ as T};
+========
+import{M as o}from"./music.b35eb5be.js";import{d as e,a as t,V as r}from"./App.948dcab3.js";const a="_container_5v2hh_1",n="_icon_5v2hh_12",c="_status_5v2hh_16",i="_noticeBar_5v2hh_20";var s={container:a,icon:n,status:c,noticeBar:i},l="/orchestra-music-score/assets/arrow.7d6e3644.svg",_=e({name:"detail-title",props:{title:{type:String,default:""},rightView:{type:Boolean,default:!0},onClick:{type:Function}},render(){return t("div",{onClick:this.onClick,class:s.container},[t("img",{class:s.icon,src:o},null),t(r,{text:this.title,color:"#4a4a4a",class:s.noticeBar,background:"none"},null),this.rightView?t("img",{class:s.status,src:l},null):null])}}),f="/orchestra-music-score/assets/arrow-left.f58aff1f.svg";export{f as I,_ as T};
+>>>>>>>> feature-pc-choose:dist/assets/arrow-left.0b8863bd.js

dist/assets/colexiu-legacy.8db201ef.js

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

dist/assets/colexiu.a3983f93.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/colexiu.a3983f93.js
 import"./App.05fd3a47.js";import"./main.208a93f5.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.948dcab3.js";import"./main.c07fad72.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> feature-pc-choose:dist/assets/colexiu.da3ddb73.js

dist/assets/colexiu.da3ddb73.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/colexiu.a3983f93.js
+import"./App.05fd3a47.js";import"./main.208a93f5.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.948dcab3.js";import"./main.c07fad72.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> feature-pc-choose:dist/assets/colexiu.da3ddb73.js

dist/assets/index-legacy.122d7bc1.js

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

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

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

dist/assets/index.155c21f3.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.155c21f3.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.05fd3a47.js";import{I as u}from"./index.8731f725.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\u7EC3\u4E60","\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.948dcab3.js";import{I as u}from"./index.d5e700d4.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\u7EC3\u4E60","\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};
+>>>>>>>> feature-pc-choose:dist/assets/index.b0f65de9.js

dist/assets/index.1c211fca.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.fb3a4262.js
+import"./App.05fd3a47.js";import"./main.208a93f5.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.948dcab3.js";import"./main.c07fad72.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> feature-pc-choose:dist/assets/index.1c211fca.js

dist/assets/index.4e4421b7.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.4e4421b7.js
 import{d as r,a as e,B as t,g as a,K as o}from"./App.05fd3a47.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.948dcab3.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};
+>>>>>>>> feature-pc-choose:dist/assets/index.4fdf1e78.js

dist/assets/index.4fdf1e78.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.4e4421b7.js
+import{d as r,a as e,B as t,g as a,K as o}from"./App.05fd3a47.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.948dcab3.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};
+>>>>>>>> feature-pc-choose:dist/assets/index.4fdf1e78.js

dist/assets/index.74ae2283.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.ae8d028c.js
+import{r,b as n,d as l,a as t,R as i,U as u}from"./App.05fd3a47.js";var d="/orchestra-music-score/assets/videobg.2d19d627.png";const p=r(null);n();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",v="_content_15zo2_16",m="_full_15zo2_20";var h={popup:f,content:v,full:m};const o=r();var g=l({name:"player-popup",props:{btnClass:{type:String},popupClass:{type:String}},render(){return t(i,{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};
+========
+import{r,b as n,d as l,a as t,R as i,U as u}from"./App.948dcab3.js";var d="/orchestra-music-score/assets/videobg.2d19d627.png";const p=r(null);n();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",v="_content_15zo2_16",m="_full_15zo2_20";var h={popup:f,content:v,full:m};const o=r();var g=l({name:"player-popup",props:{btnClass:{type:String},popupClass:{type:String}},render(){return t(i,{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};
+>>>>>>>> feature-pc-choose:dist/assets/index.74ae2283.js

dist/assets/index.8731f725.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.8731f725.js
 import{d as x,a6 as w,r as u,a7 as E,W as N,w as $,a8 as B,a9 as D,a as e,aa as U,ab as f,ac as c,ad as C,ae as R,U as y,af as I,ag as j}from"./App.05fd3a47.js";var[F,n]=U("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?C(e("img",y({ref:d},a),null),[[R("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()])}}),_=j(V);export{_ as I};
+========
+import{d as x,a6 as w,r as u,a7 as E,W as N,w as $,a8 as B,a9 as D,a as e,aa as U,ab as f,ac as c,ad as C,ae as R,U as y,af as I,ag as j}from"./App.948dcab3.js";var[F,n]=U("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?C(e("img",y({ref:d},a),null),[[R("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()])}}),_=j(V);export{_ as I};
+>>>>>>>> feature-pc-choose:dist/assets/index.d5e700d4.js

dist/assets/index.ae8d028c.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.ae8d028c.js
 import{r,b as n,d as l,a as t,R as i,U as u}from"./App.05fd3a47.js";var d="/orchestra-music-score/assets/videobg.2d19d627.png";const p=r(null);n();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",v="_content_15zo2_16",m="_full_15zo2_20";var h={popup:f,content:v,full:m};const o=r();var g=l({name:"player-popup",props:{btnClass:{type:String},popupClass:{type:String}},render(){return t(i,{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};
+========
+import{r,b as n,d as l,a as t,R as i,U as u}from"./App.948dcab3.js";var d="/orchestra-music-score/assets/videobg.2d19d627.png";const p=r(null);n();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",v="_content_15zo2_16",m="_full_15zo2_20";var h={popup:f,content:v,full:m};const o=r();var g=l({name:"player-popup",props:{btnClass:{type:String},popupClass:{type:String}},render(){return t(i,{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};
+>>>>>>>> feature-pc-choose:dist/assets/index.74ae2283.js

dist/assets/index.b0f65de9.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.155c21f3.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.05fd3a47.js";import{I as u}from"./index.8731f725.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\u7EC3\u4E60","\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.948dcab3.js";import{I as u}from"./index.d5e700d4.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\u7EC3\u4E60","\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};
+>>>>>>>> feature-pc-choose:dist/assets/index.b0f65de9.js

dist/assets/index.d5e700d4.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.8731f725.js
+import{d as x,a6 as w,r as u,a7 as E,W as N,w as $,a8 as B,a9 as D,a as e,aa as U,ab as f,ac as c,ad as C,ae as R,U as y,af as I,ag as j}from"./App.05fd3a47.js";var[F,n]=U("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?C(e("img",y({ref:d},a),null),[[R("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()])}}),_=j(V);export{_ as I};
+========
+import{d as x,a6 as w,r as u,a7 as E,W as N,w as $,a8 as B,a9 as D,a as e,aa as U,ab as f,ac as c,ad as C,ae as R,U as y,af as I,ag as j}from"./App.948dcab3.js";var[F,n]=U("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?C(e("img",y({ref:d},a),null),[[R("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()])}}),_=j(V);export{_ as I};
+>>>>>>>> feature-pc-choose:dist/assets/index.d5e700d4.js

dist/assets/index.fb3a4262.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.fb3a4262.js
 import"./App.05fd3a47.js";import"./main.208a93f5.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.948dcab3.js";import"./main.c07fad72.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> feature-pc-choose:dist/assets/index.1c211fca.js

dist/assets/main-legacy.9f242e80.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/main-legacy.9f242e80.js
 System.register(["./App-legacy.b4c36e98.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.15a58ca0.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")}}}));
+>>>>>>>> feature-pc-choose:dist/assets/main-legacy.b27bcd0c.js

dist/assets/main-legacy.b27bcd0c.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/main-legacy.9f242e80.js
+System.register(["./App-legacy.b4c36e98.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.15a58ca0.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")}}}));
+>>>>>>>> feature-pc-choose:dist/assets/main-legacy.b27bcd0c.js

dist/assets/main.208a93f5.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/main.208a93f5.js
 import{s as r,f as t,c as e,A as m}from"./App.05fd3a47.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.948dcab3.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");
+>>>>>>>> feature-pc-choose:dist/assets/main.c07fad72.js

dist/assets/main.c07fad72.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/main.208a93f5.js
+import{s as r,f as t,c as e,A as m}from"./App.05fd3a47.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.948dcab3.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");
+>>>>>>>> feature-pc-choose:dist/assets/main.c07fad72.js

dist/assets/orchestra-legacy.b038b4cf.js

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

dist/assets/orchestra.1a30c9ee.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/orchestra.5e9e36f2.js
+import"./App.05fd3a47.js";import"./main.208a93f5.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.948dcab3.js";import"./main.c07fad72.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> feature-pc-choose:dist/assets/orchestra.1a30c9ee.js

dist/assets/orchestra.5e9e36f2.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/orchestra.5e9e36f2.js
 import"./App.05fd3a47.js";import"./main.208a93f5.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+========
+import"./App.948dcab3.js";import"./main.c07fad72.js";import"./lib-flexible.08f197e6.js";function t(){import("data:text/javascript,")}export{t as __vite_legacy_guard};
+>>>>>>>> feature-pc-choose:dist/assets/orchestra.1a30c9ee.js

dist/assets/state-legacy.5f3d6d4e.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/state-legacy.5f3d6d4e.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.b4c36e98.js"],(function(e){"use strict";var n,r,o;return{setters:[function(t){n=t.O,r=t.w,o=t.Q}],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.15a58ca0.js"],(function(e){"use strict";var n,r,o;return{setters:[function(t){n=t.O,r=t.w,o=t.Q}],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}}))}}}))}();
+>>>>>>>> feature-pc-choose:dist/assets/state-legacy.6a24481b.js

dist/assets/state-legacy.6a24481b.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/state-legacy.5f3d6d4e.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.b4c36e98.js"],(function(e){"use strict";var n,r,o;return{setters:[function(t){n=t.O,r=t.w,o=t.Q}],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.15a58ca0.js"],(function(e){"use strict";var n,r,o;return{setters:[function(t){n=t.O,r=t.w,o=t.Q}],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}}))}}}))}();
+>>>>>>>> feature-pc-choose:dist/assets/state-legacy.6a24481b.js

dist/assets/state.135a4bdf.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/state.2f7ca96a.js
+import{O as l,w as o,Q as r}from"./App.05fd3a47.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{O as l,w as o,Q as r}from"./App.948dcab3.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};
+>>>>>>>> feature-pc-choose:dist/assets/state.135a4bdf.js

dist/assets/state.2f7ca96a.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/state.2f7ca96a.js
 import{O as l,w as o,Q as r}from"./App.05fd3a47.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{O as l,w as o,Q as r}from"./App.948dcab3.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};
+>>>>>>>> feature-pc-choose:dist/assets/state.135a4bdf.js

dist/assets/vip.444bac44.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/vip.7d74f26a.js
+import{d as n,a as t,g as a,bh as r,J as c,B as i}from"./App.05fd3a47.js";const l="_container_za4sl_1",u="_picker_za4sl_24",p="_button_za4sl_30";var d={container:l,picker:u,button:p};const m="_container_dbwho_1",h="_picker_dbwho_24",_="_button_dbwho_27";var b={container:m,picker:h,button:_},f=n({name:"choosePartName",props:{isRem:{type:Boolean,default:!0},partNames:{type:Array,default:()=>[]},onSelectedPartName:{type:Function,default:e=>{}}},mounted(){this.isRem?this.styles=b:this.styles=d},data(){return{selectedPart:0,styles:{}}},render(){const e=this.styles;return t("div",{class:e.container},[t("h3",null,[a("\u8BF7\u9009\u62E9\u60A8\u7EC3\u4E60\u7684\u5206\u8C31")]),t(r,{class:e.picker,showToolbar:!1,columns:this.partNames.map((s,o)=>({text:c(s),value:o})),onChange:s=>{this.selectedPart=s.value},visibleItemCount:this.isRem?6:4},null),t(i,{class:e.button,type:"primary",round:!0,block:!0,color:"#01C1B5",onClick:()=>this.onSelectedPartName(this.selectedPart)},{default:()=>[a("\u786E\u5B9A")]})])}}),k="/orchestra-music-score/assets/vip.af2bccfe.png";export{f as C,k as V};
+========
+import{d as n,a as t,g as a,bh as r,J as c,B as i}from"./App.948dcab3.js";const l="_container_za4sl_1",u="_picker_za4sl_24",p="_button_za4sl_30";var d={container:l,picker:u,button:p};const m="_container_dbwho_1",h="_picker_dbwho_24",_="_button_dbwho_27";var b={container:m,picker:h,button:_},f=n({name:"choosePartName",props:{isRem:{type:Boolean,default:!0},partNames:{type:Array,default:()=>[]},onSelectedPartName:{type:Function,default:e=>{}}},mounted(){this.isRem?this.styles=b:this.styles=d},data(){return{selectedPart:0,styles:{}}},render(){const e=this.styles;return t("div",{class:e.container},[t("h3",null,[a("\u8BF7\u9009\u62E9\u60A8\u7EC3\u4E60\u7684\u5206\u8C31")]),t(r,{class:e.picker,showToolbar:!1,columns:this.partNames.map((s,o)=>({text:c(s),value:o})),onChange:s=>{this.selectedPart=s.value},visibleItemCount:this.isRem?6:4},null),t(i,{class:e.button,type:"primary",round:!0,block:!0,color:"#01C1B5",onClick:()=>this.onSelectedPartName(this.selectedPart)},{default:()=>[a("\u786E\u5B9A")]})])}}),k="/orchestra-music-score/assets/vip.af2bccfe.png";export{f as C,k as V};
+>>>>>>>> feature-pc-choose:dist/assets/vip.444bac44.js

dist/assets/vip.7d74f26a.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/vip.7d74f26a.js
 import{d as n,a as t,g as a,bh as r,J as c,B as i}from"./App.05fd3a47.js";const l="_container_za4sl_1",u="_picker_za4sl_24",p="_button_za4sl_30";var d={container:l,picker:u,button:p};const m="_container_dbwho_1",h="_picker_dbwho_24",_="_button_dbwho_27";var b={container:m,picker:h,button:_},f=n({name:"choosePartName",props:{isRem:{type:Boolean,default:!0},partNames:{type:Array,default:()=>[]},onSelectedPartName:{type:Function,default:e=>{}}},mounted(){this.isRem?this.styles=b:this.styles=d},data(){return{selectedPart:0,styles:{}}},render(){const e=this.styles;return t("div",{class:e.container},[t("h3",null,[a("\u8BF7\u9009\u62E9\u60A8\u7EC3\u4E60\u7684\u5206\u8C31")]),t(r,{class:e.picker,showToolbar:!1,columns:this.partNames.map((s,o)=>({text:c(s),value:o})),onChange:s=>{this.selectedPart=s.value},visibleItemCount:this.isRem?6:4},null),t(i,{class:e.button,type:"primary",round:!0,block:!0,color:"#01C1B5",onClick:()=>this.onSelectedPartName(this.selectedPart)},{default:()=>[a("\u786E\u5B9A")]})])}}),k="/orchestra-music-score/assets/vip.af2bccfe.png";export{f as C,k as V};
+========
+import{d as n,a as t,g as a,bh as r,J as c,B as i}from"./App.948dcab3.js";const l="_container_za4sl_1",u="_picker_za4sl_24",p="_button_za4sl_30";var d={container:l,picker:u,button:p};const m="_container_dbwho_1",h="_picker_dbwho_24",_="_button_dbwho_27";var b={container:m,picker:h,button:_},f=n({name:"choosePartName",props:{isRem:{type:Boolean,default:!0},partNames:{type:Array,default:()=>[]},onSelectedPartName:{type:Function,default:e=>{}}},mounted(){this.isRem?this.styles=b:this.styles=d},data(){return{selectedPart:0,styles:{}}},render(){const e=this.styles;return t("div",{class:e.container},[t("h3",null,[a("\u8BF7\u9009\u62E9\u60A8\u7EC3\u4E60\u7684\u5206\u8C31")]),t(r,{class:e.picker,showToolbar:!1,columns:this.partNames.map((s,o)=>({text:c(s),value:o})),onChange:s=>{this.selectedPart=s.value},visibleItemCount:this.isRem?6:4},null),t(i,{class:e.button,type:"primary",round:!0,block:!0,color:"#01C1B5",onClick:()=>this.onSelectedPartName(this.selectedPart)},{default:()=>[a("\u786E\u5B9A")]})])}}),k="/orchestra-music-score/assets/vip.af2bccfe.png";export{f as C,k as V};
+>>>>>>>> feature-pc-choose:dist/assets/vip.444bac44.js

dist/colexiu-report-share.html

@@ -119,6 +119,7 @@
       line-height: 1.8;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu-report-share.744adb4d.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.05fd3a47.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
@@ -127,6 +128,16 @@
   <link rel="modulepreload" href="/orchestra-music-score/assets/index.ae8d028c.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/index.62ee5f3c.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/state.2f7ca96a.js">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu-report-share.524e9581.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.948dcab3.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/arrow-left.0b8863bd.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.74ae2283.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.8c9e6646.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/state.135a4bdf.js">
+>>>>>>> feature-pc-choose
   <link rel="modulepreload" href="/orchestra-music-score/assets/wx_bg.fc243df2.js">
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.ea9326b4.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.34aba1e2.css">
@@ -193,7 +204,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.e65e4f45.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-report-share-legacy.8233ce8b.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.e0323776.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-report-share-legacy.c2fce627.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> feature-pc-choose
 </body>
 </html>

dist/colexiu-report.html

@@ -83,6 +83,7 @@
       height: 100Px;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu-report.c20a032f.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.05fd3a47.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
@@ -91,6 +92,16 @@
   <link rel="modulepreload" href="/orchestra-music-score/assets/index.ae8d028c.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/index.62ee5f3c.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/state.2f7ca96a.js">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu-report.8661d590.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.948dcab3.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/arrow-left.0b8863bd.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.74ae2283.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.8c9e6646.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/state.135a4bdf.js">
+>>>>>>> feature-pc-choose
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.ea9326b4.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/arrow-left.c6e43979.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.6e0505d3.css">
@@ -125,8 +136,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.e65e4f45.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-report-legacy.0678ed39.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.e0323776.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-report-legacy.f07c6e01.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> feature-pc-choose
 </body>
 
 </html>

dist/colexiu-share.html

@@ -65,11 +65,19 @@
       line-height: 1.8;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/colxiu-share.4eea73c3.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.05fd3a47.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.8731f725.js">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/colxiu-share.eeecf271.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.948dcab3.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.d5e700d4.js">
+>>>>>>> feature-pc-choose
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.ea9326b4.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/colxiu-share.8457fad4.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.fe7dacd8.css">
@@ -83,7 +91,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.e65e4f45.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colxiu-share-legacy.47ec4e4c.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.e0323776.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colxiu-share-legacy.0e116c72.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> feature-pc-choose
 </body>
 </html>

dist/colexiu.html

@@ -131,10 +131,17 @@
         line-height: 1.8;
       }
     </style>
+<<<<<<< HEAD
     <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu.a3983f93.js"></script>
     <link rel="modulepreload" href="/orchestra-music-score/assets/App.05fd3a47.js">
     <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
     <link rel="modulepreload" href="/orchestra-music-score/assets/main.208a93f5.js">
+=======
+    <script type="module" crossorigin src="/orchestra-music-score/assets/colexiu.da3ddb73.js"></script>
+    <link rel="modulepreload" href="/orchestra-music-score/assets/App.948dcab3.js">
+    <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+    <link rel="modulepreload" href="/orchestra-music-score/assets/main.c07fad72.js">
+>>>>>>> feature-pc-choose
     <link rel="stylesheet" href="/orchestra-music-score/assets/App.ea9326b4.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>
@@ -220,7 +227,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.e65e4f45.js"></script>
     <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-legacy.788de25c.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.e0323776.js"></script>
+    <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colexiu-legacy.8db201ef.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> feature-pc-choose
   </body>
 </html>

dist/colxiu-website.html

@@ -116,10 +116,17 @@
       line-height: 1.8;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/colxiu-website.4fa40d6c.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.05fd3a47.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/index.ae8d028c.js">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/colxiu-website.dc6acaa2.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.948dcab3.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/index.74ae2283.js">
+>>>>>>> feature-pc-choose
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.ea9326b4.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/index.6e0505d3.css">
   <link rel="stylesheet" href="/orchestra-music-score/assets/colxiu-website.a27d2131.css">
@@ -183,7 +190,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.e65e4f45.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colxiu-website-legacy.bc84da85.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.e0323776.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/colxiu-website-legacy.a9ee06c7.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> feature-pc-choose
 </body>
 </html>

dist/index.html

@@ -52,10 +52,17 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/index.fb3a4262.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.05fd3a47.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/main.208a93f5.js">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/index.1c211fca.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.948dcab3.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/main.c07fad72.js">
+>>>>>>> feature-pc-choose
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.ea9326b4.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>
@@ -84,8 +91,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.e65e4f45.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/index-legacy.c9e035f7.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.e0323776.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/index-legacy.2fdb7130.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> feature-pc-choose
 </body>
 
 </html>

dist/music-sheet.html

@@ -131,8 +131,13 @@
         line-height: 1.8;
       }
     </style>
+<<<<<<< HEAD
     <script type="module" crossorigin src="/orchestra-music-score/assets/music-sheet.ed6b1e1e.js"></script>
     <link rel="modulepreload" href="/orchestra-music-score/assets/App.05fd3a47.js">
+=======
+    <script type="module" crossorigin src="/orchestra-music-score/assets/music-sheet.0eb4d6b1.js"></script>
+    <link rel="modulepreload" href="/orchestra-music-score/assets/App.948dcab3.js">
+>>>>>>> feature-pc-choose
     <link rel="stylesheet" href="/orchestra-music-score/assets/App.ea9326b4.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>
@@ -218,7 +223,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.e65e4f45.js"></script>
     <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/music-sheet-legacy.bcc7e9ca.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.e0323776.js"></script>
+    <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/music-sheet-legacy.37106e19.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> feature-pc-choose
   </body>
 </html>

dist/orchestra.html

@@ -52,10 +52,17 @@
       transition: opacity .3s;
     }
   </style>
+<<<<<<< HEAD
   <script type="module" crossorigin src="/orchestra-music-score/assets/orchestra.5e9e36f2.js"></script>
   <link rel="modulepreload" href="/orchestra-music-score/assets/App.05fd3a47.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
   <link rel="modulepreload" href="/orchestra-music-score/assets/main.208a93f5.js">
+=======
+  <script type="module" crossorigin src="/orchestra-music-score/assets/orchestra.1a30c9ee.js"></script>
+  <link rel="modulepreload" href="/orchestra-music-score/assets/App.948dcab3.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/lib-flexible.08f197e6.js">
+  <link rel="modulepreload" href="/orchestra-music-score/assets/main.c07fad72.js">
+>>>>>>> feature-pc-choose
   <link rel="stylesheet" href="/orchestra-music-score/assets/App.ea9326b4.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>
@@ -84,8 +91,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.e65e4f45.js"></script>
   <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/orchestra-legacy.cf587d93.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.e0323776.js"></script>
+  <script nomodule id="vite-legacy-entry" data-src="/orchestra-music-score/assets/orchestra-legacy.b038b4cf.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> feature-pc-choose
 </body>
 
 </html>

index.html

@@ -39,6 +39,13 @@
       },
     })
   </script>
+  
+  <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
+  <script>
+    // VConsole will be exported to `window.VConsole` by default.
+    // var vConsole = new window.VConsole();
+  </script>
+
   <style>
     #lottieWeb {
       position: fixed;

orchestra.html

@@ -39,6 +39,13 @@
       },
     })
   </script>
+
+<script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>
+<script>
+  // VConsole will be exported to `window.VConsole` by default.
+  var vConsole = new window.VConsole();
+</script>
+  
   <style>
     #lottieWeb {
       position: fixed;

src/pages/detail/runtime.ts

@@ -494,6 +494,7 @@ export const refreshPlayer = async (ctime?: number) => {
       return false
     }
     const isNext = nextTime()
+    // 选段播放结束
     if (isNext) {
       // console.log("isNext", detailState.section[1], detailState.section[1].endtime, currentTimeNum)
       state.audiosInstance.setMute(true)
@@ -503,9 +504,9 @@ export const refreshPlayer = async (ctime?: number) => {
       } else {
         await state.audiosInstance.pause()
       }
-      // 如果是单元测验 和课后训练直接结束
-      if (unitTestData.isSelectMeasureMode && state.evaluatingStatus){
-        console.log(1)
+      // 如果是单元测验 和课后训练，或者是选段评测，选段播放结束 直接结束
+      if ((unitTestData.isSelectMeasureMode || detailState.section.length === 2) && state.evaluatingStatus){
+        console.log('选段播放结束')
         event.emit('ended')
         return
       }
@@ -653,6 +654,8 @@ let nowTime = 0
 
 let prevTime: number = 0
 
+let preAppAudioPlayTime = 0; // 上一次app返回的播放进度
+
 // 播放中一直触发
 const accelerateRefreshPlayer = () => {
   if (timer || !state.audiosInstance) {
@@ -1044,6 +1047,13 @@ export const setAudioInit = () => {
   // 监听评测曲谱音频播放进度，返回
   listenerMessage("playProgress", (res) => {
     const time = res?.content.currentTime / 1000
+    const diffTime = res?.content?.currentTime - preAppAudioPlayTime;
+    preAppAudioPlayTime = res?.content?.currentTime
+    // console.log('app返回的mp3进度',time)
+    if (diffTime < 0) {
+      console.log('进度返回异常','本次时间比上次慢',diffTime,'当前播放时间:',res?.content?.currentTime)
+      return
+    }
     requestAnimationFrame(async () => {
       if (state.playState === 'play') {
         state.currentTimeNum = time

src/subpages/colexiu/buttons/evaluating.tsx

@@ -25,6 +25,7 @@ import startData from './data/start_new.json'
 import startingData from './data/starting_new.json'
 import { unitTestData } from '../unitTest'
 import iconEvaluatingStart from './icons/icon-evaluatingStart.png'
+import iconEvaluatingBegin from './icons/icon-evaluatingBegin.png'
 import qs from 'query-string'
 import CheckDelayPopup from "/src/pages/detail/CheckDelayPopup";
 import Headphone, { HeadphoneData } from "/src/pages/detail/Headphone";
@@ -320,7 +321,9 @@ export const formatPitch = (num?: number): number => {
 }
 let starTime = 0
 const formatTimes = () => {
-  const rate = runtime.speed / detailState.baseSpeed //1
+  // const rate = runtime.speed / detailState.baseSpeed //1
+  const rate = runtime.basePlayRate; // 播放倍率
+  console.log('评测倍率123',rate)
   actualBeatLength = Math.round(detailState.times[0].fixtime * 1000 / rate)
   const difftime = detailState.times?.[0]?.difftime || 0
   let ListenMode = false
@@ -333,7 +336,7 @@ const formatTimes = () => {
   let preTimes = []
   let unitTestIdx = 0
   let preTime = 0
-  if (unitTestData.isSelectMeasureMode) {
+  if (unitTestData.isSelectMeasureMode || detailState.section.length == 2) {
     const startIndex = detailState.times.findIndex(
       (n: any) => n.NoteToGraphicalNoteObjectId == detailState.section[0].NoteToGraphicalNoteObjectId
     )
@@ -378,7 +381,8 @@ const formatTimes = () => {
   for (let index = 0; index < times.length; index++) {
     const item = times[index]
     const note = getNoteByMeasuresSlursStart(item)
-    const rate = runtime.speed / detailState.baseSpeed //1
+    // const rate = runtime.speed / detailState.baseSpeed //1
+    const rate = runtime.basePlayRate; // 播放倍率
     const start = difftime + (item.sourceRelativeTime || item.relativeTime) - starTime
     const end = difftime + (item.sourceRelaEndtime || item.relaEndtime) - starTime
     // console.log(start, end, starTime)
@@ -430,6 +434,7 @@ const formatTimes = () => {
     // console.log('时间1111', data)
     datas.push(data)
   }
+  starTime = 0;
   return {
     datas,
     firstNoteTime
@@ -462,6 +467,7 @@ const connect = async () => {
     // beatLength: Math.round((RuntimeUtils.getFixTime(detailState.times[0].beatSpeed) * 1000) / rate),
     beatLength: actualBeatLength,
     evaluationCriteria: getEvaluationCriteria(),
+    speedRate: parseFloat(runtime.basePlayRate.toFixed(2)), // 播放倍率
   }
   // console.log("🚀 ~ content:", content, rate)
   const clientType = useClientType()
@@ -659,8 +665,9 @@ const playerStop = () => {
 export const evaluatPlayerStop = playerStop
 
 const endevent = (evt: Event) => {
+  console.log('选段播放结束事件')
   // 如果是单元测验和课后训练 播放结束
-  if (unitTestData.isSelectMeasureMode && playStatus.value === 'play') {
+  if ((unitTestData.isSelectMeasureMode || detailState.section.length === 2) && playStatus.value === 'play') {
     playerStop()
     canSubmit.value = true
     return
@@ -704,6 +711,7 @@ const evaluatStart = () => {
       content: {
         accompanimentState: SettingState.eva.mute ? 1 : 0,
         firstNoteTime: calculateInfo.firstNoteTime || 0,
+        speedRate: parseFloat(runtime.basePlayRate.toFixed(2)), // 播放倍率
       }
     },
     () => {
@@ -983,8 +991,7 @@ export default defineComponent({
             {startButtonShow.value && !delayData.open && modelType.value !== 'init' && (
               <div
                 style={{
-                  backgroundImage: `url(${iconEvaluatingStart})`,
-                  'transform': detailState.isSpecialShapedScreen ? `translateX(${detailState.notchHeight / 4}px)`  : '',
+                  backgroundImage: `url(${iconEvaluatingBegin})`
                 }}
                 class={[styles.evaluatStartBtn]}
                 onClick={async () => {