Merge branch 'feature-tianyong' into jenkins

dist/assets/deep-clone-64c12665.js

@@ -0,0 +1 @@
+import{y as e,E as a,d as t,I as o,r as s,af as r,a1 as l,n,ab as c,j as i,at as f,az as d,a as u,U as p,a7 as b,ar as g,W as m,ag as w,w as y}from"./index-0df642ea.js";const[h,v]=e("notice-bar"),k=y(t({name:h,props:{text:String,mode:String,color:String,delay:a(1),speed:a(60),leftIcon:String,wrapable:Boolean,background:String,scrollable:{type:Boolean,"default":null}},emits:["close","replay"],setup(e,{emit:a,slots:t}){let y,h=0,k=0;const x=o(),j=o(),S=s({show:!0,offset:0,duration:0}),I=t=>{"closeable"===e.mode&&(S.show=!1,a("close",t))},A=()=>{if(t["right-icon"])return t["right-icon"]();const a="closeable"===e.mode?"cross":"link"===e.mode?"arrow":void 0;return a?u(p,{name:a,"class":v("right-icon"),onClick:I},null):void 0},T=()=>{S.offset=h,S.duration=0,m((()=>{g((()=>{S.offset=-k,S.duration=(k+h)/+e.speed,a("replay")}))}))},B=()=>{const a=!1===e.scrollable&&!e.wrapable,o={transform:S.offset?"translateX(".concat(S.offset,"px)"):"",transitionDuration:"".concat(S.duration,"s")};return u("div",{ref:x,role:"marquee","class":v("wrap")},[u("div",{ref:j,style:o,"class":[v("content"),{"van-ellipsis":a}],onTransitionend:T},[t["default"]?t["default"]():e.text])])},E=()=>{const{delay:a,speed:t,scrollable:o}=e,s=w(a)?1e3*+a:0;h=0,k=0,S.offset=0,S.duration=0,clearTimeout(y),y=setTimeout((()=>{if(!x.value||!j.value||!1===o)return;const e=b(x).width,a=b(j).width;(o||a>e)&&g((()=>{h=e,k=a,S.offset=-k,S.duration=k/+t}))}),s)};return r(E),l(E),n("pageshow",E),c({reset:E}),i((()=>[e.text,e.scrollable]),E),()=>{const{color:a,wrapable:o,background:s}=e;return f(u("div",{role:"alert","class":v({wrapable:o}),style:{color:a,background:s}},[t["left-icon"]?t["left-icon"]():e.leftIcon?u(p,{"class":v("left-icon"),name:e.leftIcon},null):void 0,B(),A()]),[[d,S.show]])}}})),x=e=>{if(null===e)return null;const a=Object.assign({},e);return Object.keys(a).forEach((t=>a[t]="object"==typeof e[t]?x(e[t]):e[t])),Array.isArray(e)?(a.length=e.length,Array.from(a)):a};export{k as N,x as d};

dist/assets/index-33e7c552.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-53cfe6dc.js
+import{d as a,a as s}from"./index-c711d25e.js";const i=""+new URL("loading-9729222e.gif",import.meta.url).href,o="_loading_xbdvm_1",e=a({name:"o-loading",setup:()=>()=>s("div",{"class":o},[s("img",{"class":o,src:i},null)])});export{e as O};
+========
+import{d as a,a as s}from"./index-0df642ea.js";const i=""+new URL("loading-9729222e.gif",import.meta.url).href,o="_loading_xbdvm_1",e=a({name:"o-loading",setup:()=>()=>s("div",{"class":o},[s("img",{"class":o,src:i},null)])});export{e as O};
+>>>>>>>> feature-tianyong:dist/assets/index-33e7c552.js

dist/assets/index-50f11351.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-50f11351.js
 import{y as l,a4 as e,an as a,d as i,aY as r,a as t,D as n,A as s,G as o,ao as c,ag as u,U as d,w as v}from"./index-c711d25e.js";const[b,f]=l("cell"),g={tag:n("div"),icon:String,size:String,title:s,value:s,label:s,center:Boolean,isLink:Boolean,border:o,iconPrefix:String,valueClass:c,labelClass:c,titleClass:c,titleStyle:null,arrowDirection:String,required:{type:[Boolean,String],"default":null},clickable:{type:Boolean,"default":null}},p=v(i({name:b,props:e({},g,a),setup(l,{slots:e}){const a=r(),i=()=>{if(e.label||u(l.label))return t("div",{"class":[f("label"),l.labelClass]},[e.label?e.label():l.label])},n=()=>{var a;if(e.title||u(l.title)){const r=null==(a=e.title)?void 0:a.call(e);if(Array.isArray(r)&&0===r.length)return;return t("div",{"class":[f("title"),l.titleClass],style:l.titleStyle},[r||t("span",null,[l.title]),i()])}},s=()=>{const a=e.value||e["default"];if(a||u(l.value))return t("div",{"class":[f("value"),l.valueClass]},[a?a():t("span",null,[l.value])])},o=()=>{if(e["right-icon"])return e["right-icon"]();if(l.isLink){const e=l.arrowDirection&&"right"!==l.arrowDirection?"arrow-".concat(l.arrowDirection):"arrow";return t(d,{name:e,"class":f("right-icon")},null)}};return()=>{var i;const{tag:r,size:c,center:u,border:v,isLink:b,required:g}=l,p=null!=(i=l.clickable)?i:b,y={center:u,required:!!g,clickable:p,borderless:!v};return c&&(y[c]=!!c),t(r,{"class":f(y),role:p?"button":void 0,tabindex:p?0:void 0,onClick:a},{"default":()=>{var a;return[e.icon?e.icon():l.icon?t(d,{name:l.icon,"class":f("left-icon"),classPrefix:l.iconPrefix},null):void 0,n(),s(),o(),null==(a=e.extra)?void 0:a.call(e)]}})}}}));export{p as C,g as c};
+========
+import{y as l,a4 as e,an as a,d as i,aY as r,a as t,D as n,A as s,G as o,ao as c,ag as u,U as d,w as v}from"./index-0df642ea.js";const[b,f]=l("cell"),g={tag:n("div"),icon:String,size:String,title:s,value:s,label:s,center:Boolean,isLink:Boolean,border:o,iconPrefix:String,valueClass:c,labelClass:c,titleClass:c,titleStyle:null,arrowDirection:String,required:{type:[Boolean,String],"default":null},clickable:{type:Boolean,"default":null}},p=v(i({name:b,props:e({},g,a),setup(l,{slots:e}){const a=r(),i=()=>{if(e.label||u(l.label))return t("div",{"class":[f("label"),l.labelClass]},[e.label?e.label():l.label])},n=()=>{var a;if(e.title||u(l.title)){const r=null==(a=e.title)?void 0:a.call(e);if(Array.isArray(r)&&0===r.length)return;return t("div",{"class":[f("title"),l.titleClass],style:l.titleStyle},[r||t("span",null,[l.title]),i()])}},s=()=>{const a=e.value||e["default"];if(a||u(l.value))return t("div",{"class":[f("value"),l.valueClass]},[a?a():t("span",null,[l.value])])},o=()=>{if(e["right-icon"])return e["right-icon"]();if(l.isLink){const e=l.arrowDirection&&"right"!==l.arrowDirection?"arrow-".concat(l.arrowDirection):"arrow";return t(d,{name:e,"class":f("right-icon")},null)}};return()=>{var i;const{tag:r,size:c,center:u,border:v,isLink:b,required:g}=l,p=null!=(i=l.clickable)?i:b,y={center:u,required:!!g,clickable:p,borderless:!v};return c&&(y[c]=!!c),t(r,{"class":f(y),role:p?"button":void 0,tabindex:p?0:void 0,onClick:a},{"default":()=>{var a;return[e.icon?e.icon():l.icon?t(d,{name:l.icon,"class":f("left-icon"),classPrefix:l.iconPrefix},null):void 0,n(),s(),o(),null==(a=e.extra)?void 0:a.call(e)]}})}}}));export{p as C,g as c};
+>>>>>>>> feature-tianyong:dist/assets/index-91943e7c.js

dist/assets/index-53cfe6dc.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-53cfe6dc.js
 import{d as a,a as s}from"./index-c711d25e.js";const i=""+new URL("loading-9729222e.gif",import.meta.url).href,o="_loading_xbdvm_1",e=a({name:"o-loading",setup:()=>()=>s("div",{"class":o},[s("img",{"class":o,src:i},null)])});export{e as O};
+========
+import{d as a,a as s}from"./index-0df642ea.js";const i=""+new URL("loading-9729222e.gif",import.meta.url).href,o="_loading_xbdvm_1",e=a({name:"o-loading",setup:()=>()=>s("div",{"class":o},[s("img",{"class":o,src:i},null)])});export{e as O};
+>>>>>>>> feature-tianyong:dist/assets/index-33e7c552.js

dist/assets/index-6f86b5c0.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-6f86b5c0.js
 import{I as e,b6 as t,j as n,b7 as a,b8 as o,b9 as u}from"./index-c711d25e.js";function c(e){return!!a()&&(o(e),!0)}function i(e){return"function"==typeof e?e():u(e)}const s="undefined"!=typeof window&&"undefined"!=typeof document,l=Object.prototype.toString,r=e=>"[object Object]"===l.call(e),f=()=>{};function m(a,o=1e3,u={}){const{immediate:l=!0,immediateCallback:r=!1}=u;let f=null;const m=e(!1);function d(){f&&(clearInterval(f),f=null)}function b(){m.value=!1,d()}function p(){const e=i(o);e<=0||(m.value=!0,r&&a(),d(),f=setInterval(a,e))}return l&&s&&p(),(t(o)||"function"==typeof o)&&c(n(o,(()=>{m.value&&s&&p()}))),c(b),{isActive:m,pause:b,resume:p}}function d(t=1e3,n={}){const{controls:a=!1,immediate:o=!0,callback:u}=n,c=e(0),i=()=>c.value+=1,s=m(u?()=>{i(),u(c.value)}:i,t,{immediate:o});return a?{counter:c,reset:()=>{c.value=0},...s}:c}export{m as a,r as b,i as c,s as i,f as n,c as t,d as u};
+========
+import{I as e,b6 as t,j as n,b7 as a,b8 as o,b9 as u}from"./index-0df642ea.js";function c(e){return!!a()&&(o(e),!0)}function i(e){return"function"==typeof e?e():u(e)}const s="undefined"!=typeof window&&"undefined"!=typeof document,l=Object.prototype.toString,r=e=>"[object Object]"===l.call(e),f=()=>{};function m(a,o=1e3,u={}){const{immediate:l=!0,immediateCallback:r=!1}=u;let f=null;const m=e(!1);function d(){f&&(clearInterval(f),f=null)}function b(){m.value=!1,d()}function p(){const e=i(o);e<=0||(m.value=!0,r&&a(),d(),f=setInterval(a,e))}return l&&s&&p(),(t(o)||"function"==typeof o)&&c(n(o,(()=>{m.value&&s&&p()}))),c(b),{isActive:m,pause:b,resume:p}}function d(t=1e3,n={}){const{controls:a=!1,immediate:o=!0,callback:u}=n,c=e(0),i=()=>c.value+=1,s=m(u?()=>{i(),u(c.value)}:i,t,{immediate:o});return a?{counter:c,reset:()=>{c.value=0},...s}:c}export{m as a,r as b,i as c,s as i,f as n,c as t,d as u};
+>>>>>>>> feature-tianyong:dist/assets/index-ad0e4977.js

dist/assets/index-91943e7c.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-50f11351.js
+import{y as l,a4 as e,an as a,d as i,aY as r,a as t,D as n,A as s,G as o,ao as c,ag as u,U as d,w as v}from"./index-c711d25e.js";const[b,f]=l("cell"),g={tag:n("div"),icon:String,size:String,title:s,value:s,label:s,center:Boolean,isLink:Boolean,border:o,iconPrefix:String,valueClass:c,labelClass:c,titleClass:c,titleStyle:null,arrowDirection:String,required:{type:[Boolean,String],"default":null},clickable:{type:Boolean,"default":null}},p=v(i({name:b,props:e({},g,a),setup(l,{slots:e}){const a=r(),i=()=>{if(e.label||u(l.label))return t("div",{"class":[f("label"),l.labelClass]},[e.label?e.label():l.label])},n=()=>{var a;if(e.title||u(l.title)){const r=null==(a=e.title)?void 0:a.call(e);if(Array.isArray(r)&&0===r.length)return;return t("div",{"class":[f("title"),l.titleClass],style:l.titleStyle},[r||t("span",null,[l.title]),i()])}},s=()=>{const a=e.value||e["default"];if(a||u(l.value))return t("div",{"class":[f("value"),l.valueClass]},[a?a():t("span",null,[l.value])])},o=()=>{if(e["right-icon"])return e["right-icon"]();if(l.isLink){const e=l.arrowDirection&&"right"!==l.arrowDirection?"arrow-".concat(l.arrowDirection):"arrow";return t(d,{name:e,"class":f("right-icon")},null)}};return()=>{var i;const{tag:r,size:c,center:u,border:v,isLink:b,required:g}=l,p=null!=(i=l.clickable)?i:b,y={center:u,required:!!g,clickable:p,borderless:!v};return c&&(y[c]=!!c),t(r,{"class":f(y),role:p?"button":void 0,tabindex:p?0:void 0,onClick:a},{"default":()=>{var a;return[e.icon?e.icon():l.icon?t(d,{name:l.icon,"class":f("left-icon"),classPrefix:l.iconPrefix},null):void 0,n(),s(),o(),null==(a=e.extra)?void 0:a.call(e)]}})}}}));export{p as C,g as c};
+========
+import{y as l,a4 as e,an as a,d as i,aY as r,a as t,D as n,A as s,G as o,ao as c,ag as u,U as d,w as v}from"./index-0df642ea.js";const[b,f]=l("cell"),g={tag:n("div"),icon:String,size:String,title:s,value:s,label:s,center:Boolean,isLink:Boolean,border:o,iconPrefix:String,valueClass:c,labelClass:c,titleClass:c,titleStyle:null,arrowDirection:String,required:{type:[Boolean,String],"default":null},clickable:{type:Boolean,"default":null}},p=v(i({name:b,props:e({},g,a),setup(l,{slots:e}){const a=r(),i=()=>{if(e.label||u(l.label))return t("div",{"class":[f("label"),l.labelClass]},[e.label?e.label():l.label])},n=()=>{var a;if(e.title||u(l.title)){const r=null==(a=e.title)?void 0:a.call(e);if(Array.isArray(r)&&0===r.length)return;return t("div",{"class":[f("title"),l.titleClass],style:l.titleStyle},[r||t("span",null,[l.title]),i()])}},s=()=>{const a=e.value||e["default"];if(a||u(l.value))return t("div",{"class":[f("value"),l.valueClass]},[a?a():t("span",null,[l.value])])},o=()=>{if(e["right-icon"])return e["right-icon"]();if(l.isLink){const e=l.arrowDirection&&"right"!==l.arrowDirection?"arrow-".concat(l.arrowDirection):"arrow";return t(d,{name:e,"class":f("right-icon")},null)}};return()=>{var i;const{tag:r,size:c,center:u,border:v,isLink:b,required:g}=l,p=null!=(i=l.clickable)?i:b,y={center:u,required:!!g,clickable:p,borderless:!v};return c&&(y[c]=!!c),t(r,{"class":f(y),role:p?"button":void 0,tabindex:p?0:void 0,onClick:a},{"default":()=>{var a;return[e.icon?e.icon():l.icon?t(d,{name:l.icon,"class":f("left-icon"),classPrefix:l.iconPrefix},null):void 0,n(),s(),o(),null==(a=e.extra)?void 0:a.call(e)]}})}}}));export{p as C,g as c};
+>>>>>>>> feature-tianyong:dist/assets/index-91943e7c.js

dist/assets/index-a2acd3ae.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-a2acd3ae.js
 import{O as s}from"./index-c4f86748.js";import{d as i,a as t,O as e,p as a}from"./index-c711d25e.js";import{I as o}from"./index-ffa8032f.js";import"./index-d4277b16.js";import"./index-6f86b5c0.js";const r=i({name:"classify-list",data:()=>({list:[],liveConfig:!1}),mounted(){const s=sessionStorage.getItem("musicScoreList");if(s){const i=JSON.parse(s);this.list=i}else this.$router.replace("/")},methods:{toDetail(s){this.$router.push({path:"/music-list/"+s.id,query:{...this.$route.query}})},goBack(){this.$router.push({path:"/",query:{...this.$route.query}})}},render(){return t("div",{"class":"_container_1askh_1"},[t(s,{position:"top"},{"default":()=>[t(e,{border:!1,isFixed:!1,backIconColor:"white"},null)]}),t("div",{"class":"_content_1askh_12"},[t("div",{"class":"_title_1askh_22"},[a("教材")]),t("div",{"class":"_items_1askh_38"},[this.list.map((s=>t("div",{key:s.id,onClick:()=>this.toDetail(s)},[t("div",{"class":"_inner_1askh_49"},[t(o,{src:s.coverImg,"class":"_img_1askh_53"},null),t("div",{"class":"van-ellipsis"},[s.name])])])))])])])}});export{r as default};
+========
+import{O as s}from"./index-dd444708.js";import{d as i,a as t,O as e,p as a}from"./index-0df642ea.js";import{I as o}from"./index-b794171a.js";import"./index-ad5740fd.js";import"./index-ad0e4977.js";const r=i({name:"classify-list",data:()=>({list:[],liveConfig:!1}),mounted(){const s=sessionStorage.getItem("musicScoreList");if(s){const i=JSON.parse(s);this.list=i}else this.$router.replace("/")},methods:{toDetail(s){this.$router.push({path:"/music-list/"+s.id,query:{...this.$route.query}})},goBack(){this.$router.push({path:"/",query:{...this.$route.query}})}},render(){return t("div",{"class":"_container_1askh_1"},[t(s,{position:"top"},{"default":()=>[t(e,{border:!1,isFixed:!1,backIconColor:"white"},null)]}),t("div",{"class":"_content_1askh_12"},[t("div",{"class":"_title_1askh_22"},[a("教材")]),t("div",{"class":"_items_1askh_38"},[this.list.map((s=>t("div",{key:s.id,onClick:()=>this.toDetail(s)},[t("div",{"class":"_inner_1askh_49"},[t(o,{src:s.coverImg,"class":"_img_1askh_53"},null),t("div",{"class":"van-ellipsis"},[s.name])])])))])])])}});export{r as default};
+>>>>>>>> feature-tianyong:dist/assets/index-cb71d199.js

dist/assets/index-ad0e4977.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-6f86b5c0.js
+import{I as e,b6 as t,j as n,b7 as a,b8 as o,b9 as u}from"./index-c711d25e.js";function c(e){return!!a()&&(o(e),!0)}function i(e){return"function"==typeof e?e():u(e)}const s="undefined"!=typeof window&&"undefined"!=typeof document,l=Object.prototype.toString,r=e=>"[object Object]"===l.call(e),f=()=>{};function m(a,o=1e3,u={}){const{immediate:l=!0,immediateCallback:r=!1}=u;let f=null;const m=e(!1);function d(){f&&(clearInterval(f),f=null)}function b(){m.value=!1,d()}function p(){const e=i(o);e<=0||(m.value=!0,r&&a(),d(),f=setInterval(a,e))}return l&&s&&p(),(t(o)||"function"==typeof o)&&c(n(o,(()=>{m.value&&s&&p()}))),c(b),{isActive:m,pause:b,resume:p}}function d(t=1e3,n={}){const{controls:a=!1,immediate:o=!0,callback:u}=n,c=e(0),i=()=>c.value+=1,s=m(u?()=>{i(),u(c.value)}:i,t,{immediate:o});return a?{counter:c,reset:()=>{c.value=0},...s}:c}export{m as a,r as b,i as c,s as i,f as n,c as t,d as u};
+========
+import{I as e,b6 as t,j as n,b7 as a,b8 as o,b9 as u}from"./index-0df642ea.js";function c(e){return!!a()&&(o(e),!0)}function i(e){return"function"==typeof e?e():u(e)}const s="undefined"!=typeof window&&"undefined"!=typeof document,l=Object.prototype.toString,r=e=>"[object Object]"===l.call(e),f=()=>{};function m(a,o=1e3,u={}){const{immediate:l=!0,immediateCallback:r=!1}=u;let f=null;const m=e(!1);function d(){f&&(clearInterval(f),f=null)}function b(){m.value=!1,d()}function p(){const e=i(o);e<=0||(m.value=!0,r&&a(),d(),f=setInterval(a,e))}return l&&s&&p(),(t(o)||"function"==typeof o)&&c(n(o,(()=>{m.value&&s&&p()}))),c(b),{isActive:m,pause:b,resume:p}}function d(t=1e3,n={}){const{controls:a=!1,immediate:o=!0,callback:u}=n,c=e(0),i=()=>c.value+=1,s=m(u?()=>{i(),u(c.value)}:i,t,{immediate:o});return a?{counter:c,reset:()=>{c.value=0},...s}:c}export{m as a,r as b,i as c,s as i,f as n,c as t,d as u};
+>>>>>>>> feature-tianyong:dist/assets/index-ad0e4977.js

dist/assets/index-ad5740fd.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-d4277b16.js
+import{t as e,i as n,n as o,b as a,c as t}from"./index-6f86b5c0.js";import{c as i,j as r,I as s,ay as u,o as v}from"./index-c711d25e.js";function l(e){var n;const o=t(e);return null!=(n=null==o?void 0:o.$el)?n:o}const c=n?window:void 0;function d(...n){let i,s,u,v;if("string"==typeof n[0]||Array.isArray(n[0])?([s,u,v]=n,i=c):[i,s,u,v]=n,!i)return o;Array.isArray(s)||(s=[s]),Array.isArray(u)||(u=[u]);const d=[],f=()=>{d.forEach((e=>e())),d.length=0},p=r((()=>[l(i),t(v)]),(([e,n])=>{if(f(),!e)return;const o=a(n)?{...n}:n;d.push(...s.flatMap((n=>u.map((a=>{return i=n,r=a,s=o,(t=e).addEventListener(i,r,s),()=>t.removeEventListener(i,r,s);var t,i,r,s})))))}),{immediate:!0,flush:"post"}),w=()=>{p(),f()};return e(w),w}function f(e){const n=function(){const e=s(!1);return u()&&v((()=>{e.value=!0})),e}();return i((()=>(n.value,Boolean(e()))))}function p(n,o,a={}){const{window:t=c,...s}=a;let u;const v=f((()=>t&&"ResizeObserver"in t)),d=()=>{u&&(u.disconnect(),u=void 0)},p=i((()=>Array.isArray(n)?n.map((e=>l(e))):[l(n)])),w=r(p,(e=>{if(d(),v.value&&t){u=new ResizeObserver(o);for(const n of e)n&&u.observe(n,s)}}),{immediate:!0,flush:"post",deep:!0}),y=()=>{d(),w()};return e(y),{isSupported:v,stop:y}}function w(e={}){const{window:n=c}=e,o=null==n?void 0:n.navigator,a=f((()=>o&&"connection"in o)),t=s(!0),i=s(!1),r=s(void 0),u=s(void 0),v=s(void 0),l=s(void 0),p=s(void 0),w=s(void 0),y=s("unknown"),m=a.value&&o.connection;function A(){o&&(t.value=o.onLine,r.value=t.value?void 0:Date.now(),u.value=t.value?Date.now():void 0,m&&(v.value=m.downlink,l.value=m.downlinkMax,w.value=m.effectiveType,p.value=m.rtt,i.value=m.saveData,y.value=m.type))}return n&&(d(n,"offline",(()=>{t.value=!1,r.value=Date.now()})),d(n,"online",(()=>{t.value=!0,u.value=Date.now()}))),m&&d(m,"change",A,!1),A(),{isSupported:a,isOnline:t,saveData:i,offlineAt:r,onlineAt:u,downlink:v,downlinkMax:l,effectiveType:w,rtt:p,type:y}}export{p as a,w as u};
+========
+import{t as e,i as n,n as o,b as a,c as t}from"./index-ad0e4977.js";import{c as i,j as r,I as s,ay as u,o as v}from"./index-0df642ea.js";function l(e){var n;const o=t(e);return null!=(n=null==o?void 0:o.$el)?n:o}const c=n?window:void 0;function d(...n){let i,s,u,v;if("string"==typeof n[0]||Array.isArray(n[0])?([s,u,v]=n,i=c):[i,s,u,v]=n,!i)return o;Array.isArray(s)||(s=[s]),Array.isArray(u)||(u=[u]);const d=[],f=()=>{d.forEach((e=>e())),d.length=0},p=r((()=>[l(i),t(v)]),(([e,n])=>{if(f(),!e)return;const o=a(n)?{...n}:n;d.push(...s.flatMap((n=>u.map((a=>{return i=n,r=a,s=o,(t=e).addEventListener(i,r,s),()=>t.removeEventListener(i,r,s);var t,i,r,s})))))}),{immediate:!0,flush:"post"}),w=()=>{p(),f()};return e(w),w}function f(e){const n=function(){const e=s(!1);return u()&&v((()=>{e.value=!0})),e}();return i((()=>(n.value,Boolean(e()))))}function p(n,o,a={}){const{window:t=c,...s}=a;let u;const v=f((()=>t&&"ResizeObserver"in t)),d=()=>{u&&(u.disconnect(),u=void 0)},p=i((()=>Array.isArray(n)?n.map((e=>l(e))):[l(n)])),w=r(p,(e=>{if(d(),v.value&&t){u=new ResizeObserver(o);for(const n of e)n&&u.observe(n,s)}}),{immediate:!0,flush:"post",deep:!0}),y=()=>{d(),w()};return e(y),{isSupported:v,stop:y}}function w(e={}){const{window:n=c}=e,o=null==n?void 0:n.navigator,a=f((()=>o&&"connection"in o)),t=s(!0),i=s(!1),r=s(void 0),u=s(void 0),v=s(void 0),l=s(void 0),p=s(void 0),w=s(void 0),y=s("unknown"),m=a.value&&o.connection;function A(){o&&(t.value=o.onLine,r.value=t.value?void 0:Date.now(),u.value=t.value?Date.now():void 0,m&&(v.value=m.downlink,l.value=m.downlinkMax,w.value=m.effectiveType,p.value=m.rtt,i.value=m.saveData,y.value=m.type))}return n&&(d(n,"offline",(()=>{t.value=!1,r.value=Date.now()})),d(n,"online",(()=>{t.value=!0,u.value=Date.now()}))),m&&d(m,"change",A,!1),A(),{isSupported:a,isOnline:t,saveData:i,offlineAt:r,onlineAt:u,downlink:v,downlinkMax:l,effectiveType:w,rtt:p,type:y}}export{p as a,w as u};
+>>>>>>>> feature-tianyong:dist/assets/index-ad5740fd.js

dist/assets/index-b794171a.js

@@ -0,0 +1 @@
+import{y as o,d as a,I as r,ay as e,c as l,z as s,ag as i,j as n,_ as t,a0 as d,o as c,L as u,a as v,A as g,G as f,D as h,at as m,bc as p,H as y,U as w,w as b}from"./index-0df642ea.js";const[z,L]=o("image"),S=b(a({name:z,props:{src:String,alt:String,fit:String,position:String,round:Boolean,block:Boolean,width:g,height:g,radius:g,lazyLoad:Boolean,iconSize:g,showError:f,errorIcon:h("photo-fail"),iconPrefix:String,showLoading:f,loadingIcon:h("photo")},emits:["load","error"],setup(o,{emit:a,slots:g}){const f=r(!1),h=r(!0),b=r(),{$Lazyload:z}=e().proxy,S=l((()=>{const a={width:s(o.width),height:s(o.height)};return i(o.radius)&&(a.overflow="hidden",a.borderRadius=s(o.radius)),a}));n((()=>o.src),(()=>{f.value=!1,h.value=!0}));const x=o=>{h.value&&(h.value=!1,a("load",o))},I=()=>{const o=new Event("load");Object.defineProperty(o,"target",{value:b.value,enumerable:!0}),x(o)},j=o=>{f.value=!0,h.value=!1,a("error",o)},P=(a,r,e)=>e?e():v(w,{name:a,size:o.iconSize,"class":r,classPrefix:o.iconPrefix},null),$=()=>{if(f.value||!o.src)return;const a={alt:o.alt,"class":L("img"),style:{objectFit:o.fit,objectPosition:o.position}};return o.lazyLoad?m(v("img",y({ref:b},a),null),[[p("lazy"),o.src]]):v("img",y({ref:b,src:o.src,onLoad:x,onError:j},a),null)},E=({el:o})=>{const a=()=>{o===b.value&&h.value&&I()};b.value?a():u(a)},k=({el:o})=>{o!==b.value||f.value||j()};return z&&t&&(z.$on("loaded",E),z.$on("error",k),d((()=>{z.$off("loaded",E),z.$off("error",k)}))),c((()=>{u((()=>{var a;(null==(a=b.value)?void 0:a.complete)&&!o.lazyLoad&&I()}))})),()=>{var a;return v("div",{"class":L({round:o.round,block:o.block}),style:S.value},[$(),h.value&&o.showLoading?v("div",{"class":L("loading")},[P(o.loadingIcon,L("loading-icon"),g.loading)]):f.value&&o.showError?v("div",{"class":L("error")},[P(o.errorIcon,L("error-icon"),g.error)]):void 0,null==(a=g["default"])?void 0:a.call(g)])}}}));export{S as I};

dist/assets/index-c4f86748.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-c4f86748.js
 import{a as t}from"./index-d4277b16.js";import{d as e,r as o,I as s,o as i,j as a,a as f}from"./index-c711d25e.js";const d=e({name:"m-sticky",props:{position:{type:String,"default":"top"},mode:{type:String,"default":"fixed"},offsetTop:{type:String,"default":"0px"},offsetBottom:{"default":"0px"},varName:{type:String,"default":"--header-height"}},emits:["barHeight"],setup(e,{slots:d,emit:p}){const l=o({divStyle:{},heightV:0,sectionStyle:{width:"100%",height:"auto",left:"0"}}),n=s(),c=s();return i((()=>{"top"===e.position?l.divStyle.top=e.offsetTop||"0px":l.divStyle.bottom=e.offsetBottom||"0px";try{t(c.value,(t=>{const o=t[0],{height:s}=o.contentRect;Math.abs(s-l.heightV)>1&&setTimeout((()=>{var t;t=s,l.sectionStyle.height="".concat(t,"px"),l.heightV=t,document.documentElement.style.setProperty(e.varName,"".concat(t,"px")),p("barHeight",t)}),10)}))}catch(o){}})),a((()=>e.offsetTop),(()=>{l.divStyle.top=e.offsetTop})),a((()=>e.offsetBottom),(()=>{l.divStyle.bottom=e.offsetBottom})),()=>f("div",{style:[l.sectionStyle],"class":"sticky"===e.mode&&"_sticky_4d2w6_1"},[f("div",{ref:n,"class":["van-sticky","fixed"===e.mode?"van-sticky--fixed":""],style:[l.divStyle,l.sectionStyle]},[f("div",{ref:c},[d["default"]&&d["default"]()])])])}});export{d as O};
+========
+import{a as t}from"./index-ad5740fd.js";import{d as e,r as o,I as s,o as i,j as a,a as f}from"./index-0df642ea.js";const d=e({name:"m-sticky",props:{position:{type:String,"default":"top"},mode:{type:String,"default":"fixed"},offsetTop:{type:String,"default":"0px"},offsetBottom:{"default":"0px"},varName:{type:String,"default":"--header-height"}},emits:["barHeight"],setup(e,{slots:d,emit:p}){const l=o({divStyle:{},heightV:0,sectionStyle:{width:"100%",height:"auto",left:"0"}}),n=s(),c=s();return i((()=>{"top"===e.position?l.divStyle.top=e.offsetTop||"0px":l.divStyle.bottom=e.offsetBottom||"0px";try{t(c.value,(t=>{const o=t[0],{height:s}=o.contentRect;Math.abs(s-l.heightV)>1&&setTimeout((()=>{var t;t=s,l.sectionStyle.height="".concat(t,"px"),l.heightV=t,document.documentElement.style.setProperty(e.varName,"".concat(t,"px")),p("barHeight",t)}),10)}))}catch(o){}})),a((()=>e.offsetTop),(()=>{l.divStyle.top=e.offsetTop})),a((()=>e.offsetBottom),(()=>{l.divStyle.bottom=e.offsetBottom})),()=>f("div",{style:[l.sectionStyle],"class":"sticky"===e.mode&&"_sticky_4d2w6_1"},[f("div",{ref:n,"class":["van-sticky","fixed"===e.mode?"van-sticky--fixed":""],style:[l.divStyle,l.sectionStyle]},[f("div",{ref:c},[d["default"]&&d["default"]()])])])}});export{d as O};
+>>>>>>>> feature-tianyong:dist/assets/index-dd444708.js

dist/assets/index-cb71d199.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-a2acd3ae.js
+import{O as s}from"./index-c4f86748.js";import{d as i,a as t,O as e,p as a}from"./index-c711d25e.js";import{I as o}from"./index-ffa8032f.js";import"./index-d4277b16.js";import"./index-6f86b5c0.js";const r=i({name:"classify-list",data:()=>({list:[],liveConfig:!1}),mounted(){const s=sessionStorage.getItem("musicScoreList");if(s){const i=JSON.parse(s);this.list=i}else this.$router.replace("/")},methods:{toDetail(s){this.$router.push({path:"/music-list/"+s.id,query:{...this.$route.query}})},goBack(){this.$router.push({path:"/",query:{...this.$route.query}})}},render(){return t("div",{"class":"_container_1askh_1"},[t(s,{position:"top"},{"default":()=>[t(e,{border:!1,isFixed:!1,backIconColor:"white"},null)]}),t("div",{"class":"_content_1askh_12"},[t("div",{"class":"_title_1askh_22"},[a("教材")]),t("div",{"class":"_items_1askh_38"},[this.list.map((s=>t("div",{key:s.id,onClick:()=>this.toDetail(s)},[t("div",{"class":"_inner_1askh_49"},[t(o,{src:s.coverImg,"class":"_img_1askh_53"},null),t("div",{"class":"van-ellipsis"},[s.name])])])))])])])}});export{r as default};
+========
+import{O as s}from"./index-dd444708.js";import{d as i,a as t,O as e,p as a}from"./index-0df642ea.js";import{I as o}from"./index-b794171a.js";import"./index-ad5740fd.js";import"./index-ad0e4977.js";const r=i({name:"classify-list",data:()=>({list:[],liveConfig:!1}),mounted(){const s=sessionStorage.getItem("musicScoreList");if(s){const i=JSON.parse(s);this.list=i}else this.$router.replace("/")},methods:{toDetail(s){this.$router.push({path:"/music-list/"+s.id,query:{...this.$route.query}})},goBack(){this.$router.push({path:"/",query:{...this.$route.query}})}},render(){return t("div",{"class":"_container_1askh_1"},[t(s,{position:"top"},{"default":()=>[t(e,{border:!1,isFixed:!1,backIconColor:"white"},null)]}),t("div",{"class":"_content_1askh_12"},[t("div",{"class":"_title_1askh_22"},[a("教材")]),t("div",{"class":"_items_1askh_38"},[this.list.map((s=>t("div",{key:s.id,onClick:()=>this.toDetail(s)},[t("div",{"class":"_inner_1askh_49"},[t(o,{src:s.coverImg,"class":"_img_1askh_53"},null),t("div",{"class":"van-ellipsis"},[s.name])])])))])])])}});export{r as default};
+>>>>>>>> feature-tianyong:dist/assets/index-cb71d199.js

dist/assets/index-d4277b16.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-d4277b16.js
 import{t as e,i as n,n as o,b as a,c as t}from"./index-6f86b5c0.js";import{c as i,j as r,I as s,ay as u,o as v}from"./index-c711d25e.js";function l(e){var n;const o=t(e);return null!=(n=null==o?void 0:o.$el)?n:o}const c=n?window:void 0;function d(...n){let i,s,u,v;if("string"==typeof n[0]||Array.isArray(n[0])?([s,u,v]=n,i=c):[i,s,u,v]=n,!i)return o;Array.isArray(s)||(s=[s]),Array.isArray(u)||(u=[u]);const d=[],f=()=>{d.forEach((e=>e())),d.length=0},p=r((()=>[l(i),t(v)]),(([e,n])=>{if(f(),!e)return;const o=a(n)?{...n}:n;d.push(...s.flatMap((n=>u.map((a=>{return i=n,r=a,s=o,(t=e).addEventListener(i,r,s),()=>t.removeEventListener(i,r,s);var t,i,r,s})))))}),{immediate:!0,flush:"post"}),w=()=>{p(),f()};return e(w),w}function f(e){const n=function(){const e=s(!1);return u()&&v((()=>{e.value=!0})),e}();return i((()=>(n.value,Boolean(e()))))}function p(n,o,a={}){const{window:t=c,...s}=a;let u;const v=f((()=>t&&"ResizeObserver"in t)),d=()=>{u&&(u.disconnect(),u=void 0)},p=i((()=>Array.isArray(n)?n.map((e=>l(e))):[l(n)])),w=r(p,(e=>{if(d(),v.value&&t){u=new ResizeObserver(o);for(const n of e)n&&u.observe(n,s)}}),{immediate:!0,flush:"post",deep:!0}),y=()=>{d(),w()};return e(y),{isSupported:v,stop:y}}function w(e={}){const{window:n=c}=e,o=null==n?void 0:n.navigator,a=f((()=>o&&"connection"in o)),t=s(!0),i=s(!1),r=s(void 0),u=s(void 0),v=s(void 0),l=s(void 0),p=s(void 0),w=s(void 0),y=s("unknown"),m=a.value&&o.connection;function A(){o&&(t.value=o.onLine,r.value=t.value?void 0:Date.now(),u.value=t.value?Date.now():void 0,m&&(v.value=m.downlink,l.value=m.downlinkMax,w.value=m.effectiveType,p.value=m.rtt,i.value=m.saveData,y.value=m.type))}return n&&(d(n,"offline",(()=>{t.value=!1,r.value=Date.now()})),d(n,"online",(()=>{t.value=!0,u.value=Date.now()}))),m&&d(m,"change",A,!1),A(),{isSupported:a,isOnline:t,saveData:i,offlineAt:r,onlineAt:u,downlink:v,downlinkMax:l,effectiveType:w,rtt:p,type:y}}export{p as a,w as u};
+========
+import{t as e,i as n,n as o,b as a,c as t}from"./index-ad0e4977.js";import{c as i,j as r,I as s,ay as u,o as v}from"./index-0df642ea.js";function l(e){var n;const o=t(e);return null!=(n=null==o?void 0:o.$el)?n:o}const c=n?window:void 0;function d(...n){let i,s,u,v;if("string"==typeof n[0]||Array.isArray(n[0])?([s,u,v]=n,i=c):[i,s,u,v]=n,!i)return o;Array.isArray(s)||(s=[s]),Array.isArray(u)||(u=[u]);const d=[],f=()=>{d.forEach((e=>e())),d.length=0},p=r((()=>[l(i),t(v)]),(([e,n])=>{if(f(),!e)return;const o=a(n)?{...n}:n;d.push(...s.flatMap((n=>u.map((a=>{return i=n,r=a,s=o,(t=e).addEventListener(i,r,s),()=>t.removeEventListener(i,r,s);var t,i,r,s})))))}),{immediate:!0,flush:"post"}),w=()=>{p(),f()};return e(w),w}function f(e){const n=function(){const e=s(!1);return u()&&v((()=>{e.value=!0})),e}();return i((()=>(n.value,Boolean(e()))))}function p(n,o,a={}){const{window:t=c,...s}=a;let u;const v=f((()=>t&&"ResizeObserver"in t)),d=()=>{u&&(u.disconnect(),u=void 0)},p=i((()=>Array.isArray(n)?n.map((e=>l(e))):[l(n)])),w=r(p,(e=>{if(d(),v.value&&t){u=new ResizeObserver(o);for(const n of e)n&&u.observe(n,s)}}),{immediate:!0,flush:"post",deep:!0}),y=()=>{d(),w()};return e(y),{isSupported:v,stop:y}}function w(e={}){const{window:n=c}=e,o=null==n?void 0:n.navigator,a=f((()=>o&&"connection"in o)),t=s(!0),i=s(!1),r=s(void 0),u=s(void 0),v=s(void 0),l=s(void 0),p=s(void 0),w=s(void 0),y=s("unknown"),m=a.value&&o.connection;function A(){o&&(t.value=o.onLine,r.value=t.value?void 0:Date.now(),u.value=t.value?Date.now():void 0,m&&(v.value=m.downlink,l.value=m.downlinkMax,w.value=m.effectiveType,p.value=m.rtt,i.value=m.saveData,y.value=m.type))}return n&&(d(n,"offline",(()=>{t.value=!1,r.value=Date.now()})),d(n,"online",(()=>{t.value=!0,u.value=Date.now()}))),m&&d(m,"change",A,!1),A(),{isSupported:a,isOnline:t,saveData:i,offlineAt:r,onlineAt:u,downlink:v,downlinkMax:l,effectiveType:w,rtt:p,type:y}}export{p as a,w as u};
+>>>>>>>> feature-tianyong:dist/assets/index-ad5740fd.js

dist/assets/index-dd444708.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-c4f86748.js
+import{a as t}from"./index-d4277b16.js";import{d as e,r as o,I as s,o as i,j as a,a as f}from"./index-c711d25e.js";const d=e({name:"m-sticky",props:{position:{type:String,"default":"top"},mode:{type:String,"default":"fixed"},offsetTop:{type:String,"default":"0px"},offsetBottom:{"default":"0px"},varName:{type:String,"default":"--header-height"}},emits:["barHeight"],setup(e,{slots:d,emit:p}){const l=o({divStyle:{},heightV:0,sectionStyle:{width:"100%",height:"auto",left:"0"}}),n=s(),c=s();return i((()=>{"top"===e.position?l.divStyle.top=e.offsetTop||"0px":l.divStyle.bottom=e.offsetBottom||"0px";try{t(c.value,(t=>{const o=t[0],{height:s}=o.contentRect;Math.abs(s-l.heightV)>1&&setTimeout((()=>{var t;t=s,l.sectionStyle.height="".concat(t,"px"),l.heightV=t,document.documentElement.style.setProperty(e.varName,"".concat(t,"px")),p("barHeight",t)}),10)}))}catch(o){}})),a((()=>e.offsetTop),(()=>{l.divStyle.top=e.offsetTop})),a((()=>e.offsetBottom),(()=>{l.divStyle.bottom=e.offsetBottom})),()=>f("div",{style:[l.sectionStyle],"class":"sticky"===e.mode&&"_sticky_4d2w6_1"},[f("div",{ref:n,"class":["van-sticky","fixed"===e.mode?"van-sticky--fixed":""],style:[l.divStyle,l.sectionStyle]},[f("div",{ref:c},[d["default"]&&d["default"]()])])])}});export{d as O};
+========
+import{a as t}from"./index-ad5740fd.js";import{d as e,r as o,I as s,o as i,j as a,a as f}from"./index-0df642ea.js";const d=e({name:"m-sticky",props:{position:{type:String,"default":"top"},mode:{type:String,"default":"fixed"},offsetTop:{type:String,"default":"0px"},offsetBottom:{"default":"0px"},varName:{type:String,"default":"--header-height"}},emits:["barHeight"],setup(e,{slots:d,emit:p}){const l=o({divStyle:{},heightV:0,sectionStyle:{width:"100%",height:"auto",left:"0"}}),n=s(),c=s();return i((()=>{"top"===e.position?l.divStyle.top=e.offsetTop||"0px":l.divStyle.bottom=e.offsetBottom||"0px";try{t(c.value,(t=>{const o=t[0],{height:s}=o.contentRect;Math.abs(s-l.heightV)>1&&setTimeout((()=>{var t;t=s,l.sectionStyle.height="".concat(t,"px"),l.heightV=t,document.documentElement.style.setProperty(e.varName,"".concat(t,"px")),p("barHeight",t)}),10)}))}catch(o){}})),a((()=>e.offsetTop),(()=>{l.divStyle.top=e.offsetTop})),a((()=>e.offsetBottom),(()=>{l.divStyle.bottom=e.offsetBottom})),()=>f("div",{style:[l.sectionStyle],"class":"sticky"===e.mode&&"_sticky_4d2w6_1"},[f("div",{ref:n,"class":["van-sticky","fixed"===e.mode?"van-sticky--fixed":""],style:[l.divStyle,l.sectionStyle]},[f("div",{ref:c},[d["default"]&&d["default"]()])])])}});export{d as O};
+>>>>>>>> feature-tianyong:dist/assets/index-dd444708.js

dist/assets/index-e1bb1faf.js

@@ -0,0 +1 @@
+import{y as t,d as s,a as e,F as i,G as a,H as l,bp as r,ah as n,w as o}from"./index-0df642ea.js";const[d,p]=t("cell-group"),u=o(s({name:d,inheritAttrs:!1,props:{title:String,inset:Boolean,border:a},setup(t,{slots:s,attrs:a}){const o=()=>{var i;return e("div",l({"class":[p({inset:t.inset}),{[n]:t.border&&!t.inset}]},a,r()),[null==(i=s["default"])?void 0:i.call(s)])};return()=>t.title||s.title?e(i,null,[e("div",{"class":p("title",{inset:t.inset})},[s.title?s.title():t.title]),o()]):o()}}));export{u as C};

dist/assets/index-legacy-1794085d.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-21da0aaf.js
+System.register(["./index-legacy-7d035d74.js","./index-legacy-915252ee.js"],(function(t,e){"use strict";var o,i,s,d,n,a,f;return{setters:[t=>{o=t.a},t=>{i=t.d,s=t.r,d=t.I,n=t.o,a=t.j,f=t.a}],execute:function(){var e=document.createElement("style");e.textContent="._sticky_4d2w6_1{position:sticky;top:0;z-index:99}._white_4d2w6_6{background-color:#fff}._white_4d2w6_6>div{padding-top:.4rem;box-shadow:0 0 .26667rem rgba(216,216,216,.5)}\n",document.head.appendChild(e),t("O",i({name:"m-sticky",props:{position:{type:String,"default":"top"},mode:{type:String,"default":"fixed"},offsetTop:{type:String,"default":"0px"},offsetBottom:{"default":"0px"},varName:{type:String,"default":"--header-height"}},emits:["barHeight"],setup(t,{slots:e,emit:i}){const c=s({divStyle:{},heightV:0,sectionStyle:{width:"100%",height:"auto",left:"0"}}),l=d(),r=d();return n((()=>{"top"===t.position?c.divStyle.top=t.offsetTop||"0px":c.divStyle.bottom=t.offsetBottom||"0px";try{o(r.value,(e=>{const o=e[0],{height:s}=o.contentRect;Math.abs(s-c.heightV)>1&&setTimeout((()=>{(e=>{c.sectionStyle.height=`${e}px`,c.heightV=e,document.documentElement.style.setProperty(t.varName,`${e}px`),i("barHeight",e)})(s)}),10)}))}catch(e){}})),a((()=>t.offsetTop),(()=>{c.divStyle.top=t.offsetTop})),a((()=>t.offsetBottom),(()=>{c.divStyle.bottom=t.offsetBottom})),()=>f("div",{style:[c.sectionStyle],"class":"sticky"===t.mode&&"_sticky_4d2w6_1"},[f("div",{ref:l,"class":["van-sticky","fixed"===t.mode?"van-sticky--fixed":""],style:[c.divStyle,c.sectionStyle]},[f("div",{ref:r},[e["default"]&&e["default"]()])])])}}))}}}));
+========
+System.register(["./index-legacy-b5269942.js","./index-legacy-1d8f80b3.js"],(function(t,e){"use strict";var o,i,s,d,n,a,f;return{setters:[t=>{o=t.a},t=>{i=t.d,s=t.r,d=t.I,n=t.o,a=t.j,f=t.a}],execute:function(){var e=document.createElement("style");e.textContent="._sticky_4d2w6_1{position:sticky;top:0;z-index:99}._white_4d2w6_6{background-color:#fff}._white_4d2w6_6>div{padding-top:.4rem;box-shadow:0 0 .26667rem rgba(216,216,216,.5)}\n",document.head.appendChild(e),t("O",i({name:"m-sticky",props:{position:{type:String,"default":"top"},mode:{type:String,"default":"fixed"},offsetTop:{type:String,"default":"0px"},offsetBottom:{"default":"0px"},varName:{type:String,"default":"--header-height"}},emits:["barHeight"],setup(t,{slots:e,emit:i}){const c=s({divStyle:{},heightV:0,sectionStyle:{width:"100%",height:"auto",left:"0"}}),l=d(),r=d();return n((()=>{"top"===t.position?c.divStyle.top=t.offsetTop||"0px":c.divStyle.bottom=t.offsetBottom||"0px";try{o(r.value,(e=>{const o=e[0],{height:s}=o.contentRect;Math.abs(s-c.heightV)>1&&setTimeout((()=>{(e=>{c.sectionStyle.height=`${e}px`,c.heightV=e,document.documentElement.style.setProperty(t.varName,`${e}px`),i("barHeight",e)})(s)}),10)}))}catch(e){}})),a((()=>t.offsetTop),(()=>{c.divStyle.top=t.offsetTop})),a((()=>t.offsetBottom),(()=>{c.divStyle.bottom=t.offsetBottom})),()=>f("div",{style:[c.sectionStyle],"class":"sticky"===t.mode&&"_sticky_4d2w6_1"},[f("div",{ref:l,"class":["van-sticky","fixed"===t.mode?"van-sticky--fixed":""],style:[c.divStyle,c.sectionStyle]},[f("div",{ref:r},[e["default"]&&e["default"]()])])])}}))}}}));
+>>>>>>>> feature-tianyong:dist/assets/index-legacy-1794085d.js

dist/assets/index-legacy-21da0aaf.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-21da0aaf.js
 System.register(["./index-legacy-7d035d74.js","./index-legacy-915252ee.js"],(function(t,e){"use strict";var o,i,s,d,n,a,f;return{setters:[t=>{o=t.a},t=>{i=t.d,s=t.r,d=t.I,n=t.o,a=t.j,f=t.a}],execute:function(){var e=document.createElement("style");e.textContent="._sticky_4d2w6_1{position:sticky;top:0;z-index:99}._white_4d2w6_6{background-color:#fff}._white_4d2w6_6>div{padding-top:.4rem;box-shadow:0 0 .26667rem rgba(216,216,216,.5)}\n",document.head.appendChild(e),t("O",i({name:"m-sticky",props:{position:{type:String,"default":"top"},mode:{type:String,"default":"fixed"},offsetTop:{type:String,"default":"0px"},offsetBottom:{"default":"0px"},varName:{type:String,"default":"--header-height"}},emits:["barHeight"],setup(t,{slots:e,emit:i}){const c=s({divStyle:{},heightV:0,sectionStyle:{width:"100%",height:"auto",left:"0"}}),l=d(),r=d();return n((()=>{"top"===t.position?c.divStyle.top=t.offsetTop||"0px":c.divStyle.bottom=t.offsetBottom||"0px";try{o(r.value,(e=>{const o=e[0],{height:s}=o.contentRect;Math.abs(s-c.heightV)>1&&setTimeout((()=>{(e=>{c.sectionStyle.height=`${e}px`,c.heightV=e,document.documentElement.style.setProperty(t.varName,`${e}px`),i("barHeight",e)})(s)}),10)}))}catch(e){}})),a((()=>t.offsetTop),(()=>{c.divStyle.top=t.offsetTop})),a((()=>t.offsetBottom),(()=>{c.divStyle.bottom=t.offsetBottom})),()=>f("div",{style:[c.sectionStyle],"class":"sticky"===t.mode&&"_sticky_4d2w6_1"},[f("div",{ref:l,"class":["van-sticky","fixed"===t.mode?"van-sticky--fixed":""],style:[c.divStyle,c.sectionStyle]},[f("div",{ref:r},[e["default"]&&e["default"]()])])])}}))}}}));
+========
+System.register(["./index-legacy-b5269942.js","./index-legacy-1d8f80b3.js"],(function(t,e){"use strict";var o,i,s,d,n,a,f;return{setters:[t=>{o=t.a},t=>{i=t.d,s=t.r,d=t.I,n=t.o,a=t.j,f=t.a}],execute:function(){var e=document.createElement("style");e.textContent="._sticky_4d2w6_1{position:sticky;top:0;z-index:99}._white_4d2w6_6{background-color:#fff}._white_4d2w6_6>div{padding-top:.4rem;box-shadow:0 0 .26667rem rgba(216,216,216,.5)}\n",document.head.appendChild(e),t("O",i({name:"m-sticky",props:{position:{type:String,"default":"top"},mode:{type:String,"default":"fixed"},offsetTop:{type:String,"default":"0px"},offsetBottom:{"default":"0px"},varName:{type:String,"default":"--header-height"}},emits:["barHeight"],setup(t,{slots:e,emit:i}){const c=s({divStyle:{},heightV:0,sectionStyle:{width:"100%",height:"auto",left:"0"}}),l=d(),r=d();return n((()=>{"top"===t.position?c.divStyle.top=t.offsetTop||"0px":c.divStyle.bottom=t.offsetBottom||"0px";try{o(r.value,(e=>{const o=e[0],{height:s}=o.contentRect;Math.abs(s-c.heightV)>1&&setTimeout((()=>{(e=>{c.sectionStyle.height=`${e}px`,c.heightV=e,document.documentElement.style.setProperty(t.varName,`${e}px`),i("barHeight",e)})(s)}),10)}))}catch(e){}})),a((()=>t.offsetTop),(()=>{c.divStyle.top=t.offsetTop})),a((()=>t.offsetBottom),(()=>{c.divStyle.bottom=t.offsetBottom})),()=>f("div",{style:[c.sectionStyle],"class":"sticky"===t.mode&&"_sticky_4d2w6_1"},[f("div",{ref:l,"class":["van-sticky","fixed"===t.mode?"van-sticky--fixed":""],style:[c.divStyle,c.sectionStyle]},[f("div",{ref:r},[e["default"]&&e["default"]()])])])}}))}}}));
+>>>>>>>> feature-tianyong:dist/assets/index-legacy-1794085d.js

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

@@ -0,0 +1 @@
+System.register(["./index-legacy-1d8f80b3.js"],(function(t,e){"use strict";var s,i,r,n,l,a,o,u,c;return{setters:[t=>{s=t.y,i=t.d,r=t.a,n=t.F,l=t.G,a=t.H,o=t.bp,u=t.ah,c=t.w}],execute:function(){const[e,d]=s("cell-group"),v={title:String,inset:Boolean,border:l};var p=i({name:e,inheritAttrs:!1,props:v,setup(t,{slots:e,attrs:s}){const i=()=>{var i;return r("div",a({"class":[d({inset:t.inset}),{[u]:t.border&&!t.inset}]},s,o()),[null==(i=e["default"])?void 0:i.call(e)])};return()=>t.title||e.title?r(n,null,[r("div",{"class":d("title",{inset:t.inset})},[e.title?e.title():t.title]),i()]):i()}});t("C",c(p))}}}));

dist/assets/index-legacy-5069ff46.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-d782ed80.js
+System.register(["./index-legacy-915252ee.js"],(function(e,t){"use strict";var n,i;return{setters:[e=>{n=e.d,i=e.a}],execute:function(){var o=document.createElement("style");o.textContent="._loading_xbdvm_1{display:flex;align-items:center;flex-direction:column;justify-content:center;font-size:.37333rem;height:1.46667rem!important}._loading_xbdvm_1 img{height:.8rem;width:3.2rem;margin-top:.53333rem;-o-object-fit:contain;object-fit:contain}._loading_xbdvm_1 ._des_xbdvm_15{margin-top:.53333rem}\n",document.head.appendChild(o);const a=""+new URL("loading-9729222e.gif",t.meta.url).href,m="_loading_xbdvm_1";e("O",n({name:"o-loading",setup:()=>()=>i("div",{"class":m},[i("img",{"class":m,src:a},null)])}))}}}));
+========
+System.register(["./index-legacy-1d8f80b3.js"],(function(e,t){"use strict";var n,i;return{setters:[e=>{n=e.d,i=e.a}],execute:function(){var o=document.createElement("style");o.textContent="._loading_xbdvm_1{display:flex;align-items:center;flex-direction:column;justify-content:center;font-size:.37333rem;height:1.46667rem!important}._loading_xbdvm_1 img{height:.8rem;width:3.2rem;margin-top:.53333rem;-o-object-fit:contain;object-fit:contain}._loading_xbdvm_1 ._des_xbdvm_15{margin-top:.53333rem}\n",document.head.appendChild(o);const a=""+new URL("loading-9729222e.gif",t.meta.url).href,m="_loading_xbdvm_1";e("O",n({name:"o-loading",setup:()=>()=>i("div",{"class":m},[i("img",{"class":m,src:a},null)])}))}}}));
+>>>>>>>> feature-tianyong:dist/assets/index-legacy-5069ff46.js

dist/assets/index-legacy-760095d3.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-f91505b9.js
+System.register(["./index-legacy-915252ee.js"],(function(e,l){"use strict";var t,r,i,a,n,s,o,c,u,d,v,b,f;return{setters:[e=>{t=e.y,r=e.a4,i=e.an,a=e.d,n=e.aY,s=e.a,o=e.D,c=e.A,u=e.G,d=e.ao,v=e.ag,b=e.U,f=e.w}],execute:function(){const[l,g]=t("cell"),y=e("c",{tag:o("div"),icon:String,size:String,title:c,value:c,label:c,center:Boolean,isLink:Boolean,border:u,iconPrefix:String,valueClass:d,labelClass:d,titleClass:d,titleStyle:null,arrowDirection:String,required:{type:[Boolean,String],"default":null},clickable:{type:Boolean,"default":null}}),C=r({},y,i);var S=a({name:l,props:C,setup(e,{slots:l}){const t=n(),r=()=>{if(l.label||v(e.label))return s("div",{"class":[g("label"),e.labelClass]},[l.label?l.label():e.label])},i=()=>{var t;if(l.title||v(e.title)){const i=null==(t=l.title)?void 0:t.call(l);if(Array.isArray(i)&&0===i.length)return;return s("div",{"class":[g("title"),e.titleClass],style:e.titleStyle},[i||s("span",null,[e.title]),r()])}},a=()=>{const t=l.value||l["default"];if(t||v(e.value))return s("div",{"class":[g("value"),e.valueClass]},[t?t():s("span",null,[e.value])])},o=()=>{if(l["right-icon"])return l["right-icon"]();if(e.isLink){const l=e.arrowDirection&&"right"!==e.arrowDirection?`arrow-${e.arrowDirection}`:"arrow";return s(b,{name:l,"class":g("right-icon")},null)}};return()=>{var r;const{tag:n,size:c,center:u,border:d,isLink:v,required:f}=e,y=null!=(r=e.clickable)?r:v,C={center:u,required:!!f,clickable:y,borderless:!d};return c&&(C[c]=!!c),s(n,{"class":g(C),role:y?"button":void 0,tabindex:y?0:void 0,onClick:t},{"default":()=>{var t;return[l.icon?l.icon():e.icon?s(b,{name:e.icon,"class":g("left-icon"),classPrefix:e.iconPrefix},null):void 0,i(),a(),o(),null==(t=l.extra)?void 0:t.call(l)]}})}}});e("C",f(S))}}}));
+========
+System.register(["./index-legacy-1d8f80b3.js"],(function(e,l){"use strict";var t,r,i,a,n,s,o,c,u,d,v,b,f;return{setters:[e=>{t=e.y,r=e.a4,i=e.an,a=e.d,n=e.aY,s=e.a,o=e.D,c=e.A,u=e.G,d=e.ao,v=e.ag,b=e.U,f=e.w}],execute:function(){const[l,g]=t("cell"),y=e("c",{tag:o("div"),icon:String,size:String,title:c,value:c,label:c,center:Boolean,isLink:Boolean,border:u,iconPrefix:String,valueClass:d,labelClass:d,titleClass:d,titleStyle:null,arrowDirection:String,required:{type:[Boolean,String],"default":null},clickable:{type:Boolean,"default":null}}),C=r({},y,i);var S=a({name:l,props:C,setup(e,{slots:l}){const t=n(),r=()=>{if(l.label||v(e.label))return s("div",{"class":[g("label"),e.labelClass]},[l.label?l.label():e.label])},i=()=>{var t;if(l.title||v(e.title)){const i=null==(t=l.title)?void 0:t.call(l);if(Array.isArray(i)&&0===i.length)return;return s("div",{"class":[g("title"),e.titleClass],style:e.titleStyle},[i||s("span",null,[e.title]),r()])}},a=()=>{const t=l.value||l["default"];if(t||v(e.value))return s("div",{"class":[g("value"),e.valueClass]},[t?t():s("span",null,[e.value])])},o=()=>{if(l["right-icon"])return l["right-icon"]();if(e.isLink){const l=e.arrowDirection&&"right"!==e.arrowDirection?`arrow-${e.arrowDirection}`:"arrow";return s(b,{name:l,"class":g("right-icon")},null)}};return()=>{var r;const{tag:n,size:c,center:u,border:d,isLink:v,required:f}=e,y=null!=(r=e.clickable)?r:v,C={center:u,required:!!f,clickable:y,borderless:!d};return c&&(C[c]=!!c),s(n,{"class":g(C),role:y?"button":void 0,tabindex:y?0:void 0,onClick:t},{"default":()=>{var t;return[l.icon?l.icon():e.icon?s(b,{name:e.icon,"class":g("left-icon"),classPrefix:e.iconPrefix},null):void 0,i(),a(),o(),null==(t=l.extra)?void 0:t.call(l)]}})}}});e("C",f(S))}}}));
+>>>>>>>> feature-tianyong:dist/assets/index-legacy-760095d3.js

dist/assets/index-legacy-d782ed80.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-d782ed80.js
 System.register(["./index-legacy-915252ee.js"],(function(e,t){"use strict";var n,i;return{setters:[e=>{n=e.d,i=e.a}],execute:function(){var o=document.createElement("style");o.textContent="._loading_xbdvm_1{display:flex;align-items:center;flex-direction:column;justify-content:center;font-size:.37333rem;height:1.46667rem!important}._loading_xbdvm_1 img{height:.8rem;width:3.2rem;margin-top:.53333rem;-o-object-fit:contain;object-fit:contain}._loading_xbdvm_1 ._des_xbdvm_15{margin-top:.53333rem}\n",document.head.appendChild(o);const a=""+new URL("loading-9729222e.gif",t.meta.url).href,m="_loading_xbdvm_1";e("O",n({name:"o-loading",setup:()=>()=>i("div",{"class":m},[i("img",{"class":m,src:a},null)])}))}}}));
+========
+System.register(["./index-legacy-1d8f80b3.js"],(function(e,t){"use strict";var n,i;return{setters:[e=>{n=e.d,i=e.a}],execute:function(){var o=document.createElement("style");o.textContent="._loading_xbdvm_1{display:flex;align-items:center;flex-direction:column;justify-content:center;font-size:.37333rem;height:1.46667rem!important}._loading_xbdvm_1 img{height:.8rem;width:3.2rem;margin-top:.53333rem;-o-object-fit:contain;object-fit:contain}._loading_xbdvm_1 ._des_xbdvm_15{margin-top:.53333rem}\n",document.head.appendChild(o);const a=""+new URL("loading-9729222e.gif",t.meta.url).href,m="_loading_xbdvm_1";e("O",n({name:"o-loading",setup:()=>()=>i("div",{"class":m},[i("img",{"class":m,src:a},null)])}))}}}));
+>>>>>>>> feature-tianyong:dist/assets/index-legacy-5069ff46.js

dist/assets/index-legacy-f91505b9.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-f91505b9.js
 System.register(["./index-legacy-915252ee.js"],(function(e,l){"use strict";var t,r,i,a,n,s,o,c,u,d,v,b,f;return{setters:[e=>{t=e.y,r=e.a4,i=e.an,a=e.d,n=e.aY,s=e.a,o=e.D,c=e.A,u=e.G,d=e.ao,v=e.ag,b=e.U,f=e.w}],execute:function(){const[l,g]=t("cell"),y=e("c",{tag:o("div"),icon:String,size:String,title:c,value:c,label:c,center:Boolean,isLink:Boolean,border:u,iconPrefix:String,valueClass:d,labelClass:d,titleClass:d,titleStyle:null,arrowDirection:String,required:{type:[Boolean,String],"default":null},clickable:{type:Boolean,"default":null}}),C=r({},y,i);var S=a({name:l,props:C,setup(e,{slots:l}){const t=n(),r=()=>{if(l.label||v(e.label))return s("div",{"class":[g("label"),e.labelClass]},[l.label?l.label():e.label])},i=()=>{var t;if(l.title||v(e.title)){const i=null==(t=l.title)?void 0:t.call(l);if(Array.isArray(i)&&0===i.length)return;return s("div",{"class":[g("title"),e.titleClass],style:e.titleStyle},[i||s("span",null,[e.title]),r()])}},a=()=>{const t=l.value||l["default"];if(t||v(e.value))return s("div",{"class":[g("value"),e.valueClass]},[t?t():s("span",null,[e.value])])},o=()=>{if(l["right-icon"])return l["right-icon"]();if(e.isLink){const l=e.arrowDirection&&"right"!==e.arrowDirection?`arrow-${e.arrowDirection}`:"arrow";return s(b,{name:l,"class":g("right-icon")},null)}};return()=>{var r;const{tag:n,size:c,center:u,border:d,isLink:v,required:f}=e,y=null!=(r=e.clickable)?r:v,C={center:u,required:!!f,clickable:y,borderless:!d};return c&&(C[c]=!!c),s(n,{"class":g(C),role:y?"button":void 0,tabindex:y?0:void 0,onClick:t},{"default":()=>{var t;return[l.icon?l.icon():e.icon?s(b,{name:e.icon,"class":g("left-icon"),classPrefix:e.iconPrefix},null):void 0,i(),a(),o(),null==(t=l.extra)?void 0:t.call(l)]}})}}});e("C",f(S))}}}));
+========
+System.register(["./index-legacy-1d8f80b3.js"],(function(e,l){"use strict";var t,r,i,a,n,s,o,c,u,d,v,b,f;return{setters:[e=>{t=e.y,r=e.a4,i=e.an,a=e.d,n=e.aY,s=e.a,o=e.D,c=e.A,u=e.G,d=e.ao,v=e.ag,b=e.U,f=e.w}],execute:function(){const[l,g]=t("cell"),y=e("c",{tag:o("div"),icon:String,size:String,title:c,value:c,label:c,center:Boolean,isLink:Boolean,border:u,iconPrefix:String,valueClass:d,labelClass:d,titleClass:d,titleStyle:null,arrowDirection:String,required:{type:[Boolean,String],"default":null},clickable:{type:Boolean,"default":null}}),C=r({},y,i);var S=a({name:l,props:C,setup(e,{slots:l}){const t=n(),r=()=>{if(l.label||v(e.label))return s("div",{"class":[g("label"),e.labelClass]},[l.label?l.label():e.label])},i=()=>{var t;if(l.title||v(e.title)){const i=null==(t=l.title)?void 0:t.call(l);if(Array.isArray(i)&&0===i.length)return;return s("div",{"class":[g("title"),e.titleClass],style:e.titleStyle},[i||s("span",null,[e.title]),r()])}},a=()=>{const t=l.value||l["default"];if(t||v(e.value))return s("div",{"class":[g("value"),e.valueClass]},[t?t():s("span",null,[e.value])])},o=()=>{if(l["right-icon"])return l["right-icon"]();if(e.isLink){const l=e.arrowDirection&&"right"!==e.arrowDirection?`arrow-${e.arrowDirection}`:"arrow";return s(b,{name:l,"class":g("right-icon")},null)}};return()=>{var r;const{tag:n,size:c,center:u,border:d,isLink:v,required:f}=e,y=null!=(r=e.clickable)?r:v,C={center:u,required:!!f,clickable:y,borderless:!d};return c&&(C[c]=!!c),s(n,{"class":g(C),role:y?"button":void 0,tabindex:y?0:void 0,onClick:t},{"default":()=>{var t;return[l.icon?l.icon():e.icon?s(b,{name:e.icon,"class":g("left-icon"),classPrefix:e.iconPrefix},null):void 0,i(),a(),o(),null==(t=l.extra)?void 0:t.call(l)]}})}}});e("C",f(S))}}}));
+>>>>>>>> feature-tianyong:dist/assets/index-legacy-760095d3.js

dist/assets/use-tab-status-1789fd52.js

@@ -0,0 +1 @@
+import{aP as o}from"./index-0df642ea.js";const s=Symbol(),a=()=>o(s,null);export{s as T,a as u};

dist/assets/use-tab-status-legacy-0050c6f0.js

@@ -0,0 +1 @@
+System.register(["./index-legacy-1d8f80b3.js"],(function(e,t){"use strict";var n;return{setters:[e=>{n=e.aP}],execute:function(){const t=e("T",Symbol());e("u",(()=>n(t,null)))}}}));

dist/index.html

@@ -41,7 +41,11 @@
   <meta name="referrer" content="no-referrer" />
   <title>管乐迷</title>
   <script src="./flexible.js" charset="UTF-8"></script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index-c711d25e.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/index-0df642ea.js"></script>
+>>>>>>> feature-tianyong
   <link rel="stylesheet" href="./assets/index-9a796eeb.css">
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};if(location.protocol!="file:"){window.__vite_is_modern_browser=true}</script>
   <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
@@ -52,7 +56,11 @@
   
   <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
   <script nomodule crossorigin id="vite-legacy-polyfill" src="./assets/polyfills-legacy-9f17e47e.js"></script>
+<<<<<<< HEAD
   <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-915252ee.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-1d8f80b3.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> feature-tianyong
 </body>
 
 </html>

src/views/choose-homework/music-list/index.tsx

@@ -306,16 +306,24 @@ export default defineComponent({
       });
       const xmlParse = new DOMParser().parseFromString(res, 'text/xml');
       const parts = xmlParse.getElementsByTagName('part');
-      const firstMeasures = parts[0]?.getElementsByTagName('measure');
+      // 找到正确的part，妙极客的曲子有些无效的part需要过滤掉
+      const realPart = Array.from(parts).find((part: any) => part?.parentElement?.tagName !== 'system') || parts[0];
+      const firstMeasures = realPart?.getElementsByTagName('measure');
+      // 增加开始小节，结束小节数
+      const startMeasureNumber = firstMeasures[0]?.getAttribute('number') ? Number(firstMeasures[0]?.getAttribute('number')) : 0;
+      const endMeasureNumber = firstMeasures[firstMeasures.length-1]?.getAttribute('number') ? Number(firstMeasures[firstMeasures.length-1]?.getAttribute('number')) : firstMeasures.length;
       const body = {
         api: 'onAccompanySelectResult',
         content: {
           id: _id,
           name: row.name,
           noteLength: firstMeasures.length,
-          partIndex: this.selectedPartIndex + ''
+          partIndex: this.selectedPartIndex + '',
+          startMeasureNumber,
+          endMeasureNumber
         }
       };
+      // console.log('小节',body.content)
       postMessage(body);
       return;
       // }