Merge branch 'iteration-20241016-musicscoreUrl' of http://git.dayaedu.com/lex/lesson-course-play into jenkins

dist/assets/index-1122f646.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-54d269e9.js
+import{d as a,a as s}from"./index-50b118ba.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-232a7449.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};
+>>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb:dist/assets/index-1122f646.js

dist/assets/index-37eac641.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-81a3ecfb.js
+import{O as s}from"./index-c395054e.js";import{d as i,a as t,O as e,m as a}from"./index-50b118ba.js";import{I as o}from"./index-f903ad0d.js";import"./index-5a2af269.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-3a61b26a.js";import{d as i,a as t,O as e,m as a}from"./index-232a7449.js";import{I as o}from"./index-4d5d4bfb.js";import"./index-725b9e0a.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};
+>>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb:dist/assets/index-37eac641.js

dist/assets/index-3a61b26a.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-c395054e.js
+import{t,b as e,i as o}from"./index-5a2af269.js";import{c as s,S as i,Q as n,az as a,o as r,d as f,r as c,a as d}from"./index-50b118ba.js";function l(t){var o;const s=e(t);return null!=(o=null==s?void 0:s.$el)?o:s}const p=o?window:void 0;const u=f({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:o,emit:f}){const u=c({divStyle:{},heightV:0,sectionStyle:{width:"100%",height:"auto",left:"0"}}),m=n(),y=n();return r((()=>{"top"===e.position?u.divStyle.top=e.offsetTop||"0px":u.divStyle.bottom=e.offsetBottom||"0px";try{!function(e,o,f={}){const{window:c=p,...d}=f;let u;const m=function(t){const e=function(){const t=n(!1);return a()&&r((()=>{t.value=!0})),t}();return s((()=>(e.value,Boolean(t()))))}((()=>c&&"ResizeObserver"in c)),y=()=>{u&&(u.disconnect(),u=void 0)},v=s((()=>Array.isArray(e)?e.map((t=>l(t))):[l(e)])),h=i(v,(t=>{if(y(),m.value&&c){u=new ResizeObserver(o);for(const e of t)e&&u.observe(e,d)}}),{immediate:!0,flush:"post",deep:!0});t((()=>{y(),h()}))}(y.value,(t=>{const o=t[0],{height:s}=o.contentRect;Math.abs(s-u.heightV)>1&&setTimeout((()=>{var t;t=s,u.sectionStyle.height="".concat(t,"px"),u.heightV=t,document.documentElement.style.setProperty(e.varName,"".concat(t,"px")),f("barHeight",t)}),10)}))}catch(o){}})),i((()=>e.offsetTop),(()=>{u.divStyle.top=e.offsetTop})),i((()=>e.offsetBottom),(()=>{u.divStyle.bottom=e.offsetBottom})),()=>d("div",{style:[u.sectionStyle],"class":"sticky"===e.mode&&"_sticky_4d2w6_1"},[d("div",{ref:m,"class":["van-sticky","fixed"===e.mode?"van-sticky--fixed":""],style:[u.divStyle,u.sectionStyle]},[d("div",{ref:y},[o["default"]&&o["default"]()])])])}});export{u as O};
+========
+import{t,b as e,i as o}from"./index-725b9e0a.js";import{c as s,S as i,Q as n,az as a,o as r,d as f,r as c,a as d}from"./index-232a7449.js";function l(t){var o;const s=e(t);return null!=(o=null==s?void 0:s.$el)?o:s}const p=o?window:void 0;const u=f({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:o,emit:f}){const u=c({divStyle:{},heightV:0,sectionStyle:{width:"100%",height:"auto",left:"0"}}),m=n(),y=n();return r((()=>{"top"===e.position?u.divStyle.top=e.offsetTop||"0px":u.divStyle.bottom=e.offsetBottom||"0px";try{!function(e,o,f={}){const{window:c=p,...d}=f;let u;const m=function(t){const e=function(){const t=n(!1);return a()&&r((()=>{t.value=!0})),t}();return s((()=>(e.value,Boolean(t()))))}((()=>c&&"ResizeObserver"in c)),y=()=>{u&&(u.disconnect(),u=void 0)},v=s((()=>Array.isArray(e)?e.map((t=>l(t))):[l(e)])),h=i(v,(t=>{if(y(),m.value&&c){u=new ResizeObserver(o);for(const e of t)e&&u.observe(e,d)}}),{immediate:!0,flush:"post",deep:!0});t((()=>{y(),h()}))}(y.value,(t=>{const o=t[0],{height:s}=o.contentRect;Math.abs(s-u.heightV)>1&&setTimeout((()=>{var t;t=s,u.sectionStyle.height="".concat(t,"px"),u.heightV=t,document.documentElement.style.setProperty(e.varName,"".concat(t,"px")),f("barHeight",t)}),10)}))}catch(o){}})),i((()=>e.offsetTop),(()=>{u.divStyle.top=e.offsetTop})),i((()=>e.offsetBottom),(()=>{u.divStyle.bottom=e.offsetBottom})),()=>d("div",{style:[u.sectionStyle],"class":"sticky"===e.mode&&"_sticky_4d2w6_1"},[d("div",{ref:m,"class":["van-sticky","fixed"===e.mode?"van-sticky--fixed":""],style:[u.divStyle,u.sectionStyle]},[d("div",{ref:y},[o["default"]&&o["default"]()])])])}});export{u as O};
+>>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb:dist/assets/index-3a61b26a.js

dist/assets/index-4d5d4bfb.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-f903ad0d.js
+import{t as o,d as a,Q as r,az as e,c as l,z as s,ak as i,S as n,a4 as t,a6 as d,o as c,V as u,a as v,w as g,v as f,N as h,au as m,bc as p,J as w,L as z,C as b}from"./index-50b118ba.js";const[y,L]=o("image"),S=b(a({name:y,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:y}=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)},P=o=>{f.value=!0,h.value=!1,a("error",o)},$=(a,r,e)=>e?e():v(z,{name:a,size:o.iconSize,"class":r,classPrefix:o.iconPrefix},null),j=()=>{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",w({ref:b},a),null),[[p("lazy"),o.src]]):v("img",w({ref:b,src:o.src,onLoad:x,onError:P},a),null)},k=({el:o})=>{const a=()=>{o===b.value&&h.value&&I()};b.value?a():u(a)},E=({el:o})=>{o!==b.value||f.value||P()};return y&&t&&(y.$on("loaded",k),y.$on("error",E),d((()=>{y.$off("loaded",k),y.$off("error",E)}))),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},[j(),h.value&&o.showLoading?v("div",{"class":L("loading")},[$(o.loadingIcon,L("loading-icon"),g.loading)]):f.value&&o.showError?v("div",{"class":L("error")},[$(o.errorIcon,L("error-icon"),g.error)]):void 0,null==(a=g["default"])?void 0:a.call(g)])}}}));export{S as I};
+========
+import{t as o,d as a,Q as r,az as e,c as l,z as s,ak as i,S as n,a4 as t,a6 as d,o as c,V as u,a as v,w as g,v as f,N as h,au as m,bc as p,J as w,L as z,C as b}from"./index-232a7449.js";const[y,L]=o("image"),S=b(a({name:y,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:y}=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)},P=o=>{f.value=!0,h.value=!1,a("error",o)},$=(a,r,e)=>e?e():v(z,{name:a,size:o.iconSize,"class":r,classPrefix:o.iconPrefix},null),j=()=>{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",w({ref:b},a),null),[[p("lazy"),o.src]]):v("img",w({ref:b,src:o.src,onLoad:x,onError:P},a),null)},k=({el:o})=>{const a=()=>{o===b.value&&h.value&&I()};b.value?a():u(a)},E=({el:o})=>{o!==b.value||f.value||P()};return y&&t&&(y.$on("loaded",k),y.$on("error",E),d((()=>{y.$off("loaded",k),y.$off("error",E)}))),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},[j(),h.value&&o.showLoading?v("div",{"class":L("loading")},[$(o.loadingIcon,L("loading-icon"),g.loading)]):f.value&&o.showError?v("div",{"class":L("error")},[$(o.errorIcon,L("error-icon"),g.error)]):void 0,null==(a=g["default"])?void 0:a.call(g)])}}}));export{S as I};
+>>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb:dist/assets/index-4d5d4bfb.js

dist/assets/index-54d269e9.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-54d269e9.js
 import{d as a,a as s}from"./index-50b118ba.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-232a7449.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};
+>>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb:dist/assets/index-1122f646.js

dist/assets/index-5a2af269.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-5a2af269.js
 import{Q as e,b6 as n,S as t,b7 as a,b8 as u,b9 as o}from"./index-50b118ba.js";function i(e){return!!a()&&(u(e),!0)}function s(e){return"function"==typeof e?e():o(e)}const c="undefined"!=typeof window&&"undefined"!=typeof document;function l(a,u=1e3,o={}){const{immediate:l=!0,immediateCallback:r=!1}=o;let f=null;const m=e(!1);function d(){f&&(clearInterval(f),f=null)}function v(){m.value=!1,d()}function b(){const e=s(u);e<=0||(m.value=!0,r&&a(),d(),f=setInterval(a,e))}return l&&c&&b(),(n(u)||"function"==typeof u)&&i(t(u,(()=>{m.value&&c&&b()}))),i(v),{isActive:m,pause:v,resume:b}}function r(n=1e3,t={}){const{controls:a=!1,immediate:u=!0,callback:o}=t,i=e(0),s=()=>i.value+=1,c=l(o?()=>{s(),o(i.value)}:s,n,{immediate:u});return a?{counter:i,reset:()=>{i.value=0},...c}:i}export{l as a,s as b,c as i,i as t,r as u};
+========
+import{Q as e,b6 as n,S as t,b7 as a,b8 as u,b9 as o}from"./index-232a7449.js";function i(e){return!!a()&&(u(e),!0)}function s(e){return"function"==typeof e?e():o(e)}const c="undefined"!=typeof window&&"undefined"!=typeof document;function l(a,u=1e3,o={}){const{immediate:l=!0,immediateCallback:r=!1}=o;let f=null;const m=e(!1);function d(){f&&(clearInterval(f),f=null)}function v(){m.value=!1,d()}function b(){const e=s(u);e<=0||(m.value=!0,r&&a(),d(),f=setInterval(a,e))}return l&&c&&b(),(n(u)||"function"==typeof u)&&i(t(u,(()=>{m.value&&c&&b()}))),i(v),{isActive:m,pause:v,resume:b}}function r(n=1e3,t={}){const{controls:a=!1,immediate:u=!0,callback:o}=t,i=e(0),s=()=>i.value+=1,c=l(o?()=>{s(),o(i.value)}:s,n,{immediate:u});return a?{counter:i,reset:()=>{i.value=0},...c}:i}export{l as a,s as b,c as i,i as t,r as u};
+>>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb:dist/assets/index-725b9e0a.js

dist/assets/index-725b9e0a.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-5a2af269.js
+import{Q as e,b6 as n,S as t,b7 as a,b8 as u,b9 as o}from"./index-50b118ba.js";function i(e){return!!a()&&(u(e),!0)}function s(e){return"function"==typeof e?e():o(e)}const c="undefined"!=typeof window&&"undefined"!=typeof document;function l(a,u=1e3,o={}){const{immediate:l=!0,immediateCallback:r=!1}=o;let f=null;const m=e(!1);function d(){f&&(clearInterval(f),f=null)}function v(){m.value=!1,d()}function b(){const e=s(u);e<=0||(m.value=!0,r&&a(),d(),f=setInterval(a,e))}return l&&c&&b(),(n(u)||"function"==typeof u)&&i(t(u,(()=>{m.value&&c&&b()}))),i(v),{isActive:m,pause:v,resume:b}}function r(n=1e3,t={}){const{controls:a=!1,immediate:u=!0,callback:o}=t,i=e(0),s=()=>i.value+=1,c=l(o?()=>{s(),o(i.value)}:s,n,{immediate:u});return a?{counter:i,reset:()=>{i.value=0},...c}:i}export{l as a,s as b,c as i,i as t,r as u};
+========
+import{Q as e,b6 as n,S as t,b7 as a,b8 as u,b9 as o}from"./index-232a7449.js";function i(e){return!!a()&&(u(e),!0)}function s(e){return"function"==typeof e?e():o(e)}const c="undefined"!=typeof window&&"undefined"!=typeof document;function l(a,u=1e3,o={}){const{immediate:l=!0,immediateCallback:r=!1}=o;let f=null;const m=e(!1);function d(){f&&(clearInterval(f),f=null)}function v(){m.value=!1,d()}function b(){const e=s(u);e<=0||(m.value=!0,r&&a(),d(),f=setInterval(a,e))}return l&&c&&b(),(n(u)||"function"==typeof u)&&i(t(u,(()=>{m.value&&c&&b()}))),i(v),{isActive:m,pause:v,resume:b}}function r(n=1e3,t={}){const{controls:a=!1,immediate:u=!0,callback:o}=t,i=e(0),s=()=>i.value+=1,c=l(o?()=>{s(),o(i.value)}:s,n,{immediate:u});return a?{counter:i,reset:()=>{i.value=0},...c}:i}export{l as a,s as b,c as i,i as t,r as u};
+>>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb:dist/assets/index-725b9e0a.js

dist/assets/index-81a3ecfb.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-81a3ecfb.js
 import{O as s}from"./index-c395054e.js";import{d as i,a as t,O as e,m as a}from"./index-50b118ba.js";import{I as o}from"./index-f903ad0d.js";import"./index-5a2af269.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-3a61b26a.js";import{d as i,a as t,O as e,m as a}from"./index-232a7449.js";import{I as o}from"./index-4d5d4bfb.js";import"./index-725b9e0a.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};
+>>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb:dist/assets/index-37eac641.js

dist/assets/index-8e3c3e5a.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-8e3c3e5a.js
 import{t as l,D as e,E as a,d as i,H as r,a as t,N as n,w as s,v as o,aq as c,ak as u,L as d,C as v}from"./index-50b118ba.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,C={center:u,required:!!g,clickable:p,borderless:!v};return c&&(C[c]=!!c),t(r,{"class":f(C),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{t as l,D as e,E as a,d as i,H as r,a as t,N as n,w as s,v as o,aq as c,ak as u,L as d,C as v}from"./index-232a7449.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,C={center:u,required:!!g,clickable:p,borderless:!v};return c&&(C[c]=!!c),t(r,{"class":f(C),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};
+>>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb:dist/assets/index-b3c0f2c5.js

dist/assets/index-b026a759.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-dbe311bf.js
+import{t,d as s,a as e,F as i,v as l,J as a,bo as r,al as n,C as o}from"./index-50b118ba.js";const[d,u]=t("cell-group"),c=o(s({name:d,inheritAttrs:!1,props:{title:String,inset:Boolean,border:l},setup(t,{slots:s,attrs:l}){const o=()=>{var i;return e("div",a({"class":[u({inset:t.inset}),{[n]:t.border&&!t.inset}]},l,r()),[null==(i=s["default"])?void 0:i.call(s)])};return()=>t.title||s.title?e(i,null,[e("div",{"class":u("title",{inset:t.inset})},[s.title?s.title():t.title]),o()]):o()}}));export{c as C};
+========
+import{t,d as s,a as e,F as i,v as l,J as a,bo as r,al as n,C as o}from"./index-232a7449.js";const[d,u]=t("cell-group"),c=o(s({name:d,inheritAttrs:!1,props:{title:String,inset:Boolean,border:l},setup(t,{slots:s,attrs:l}){const o=()=>{var i;return e("div",a({"class":[u({inset:t.inset}),{[n]:t.border&&!t.inset}]},l,r()),[null==(i=s["default"])?void 0:i.call(s)])};return()=>t.title||s.title?e(i,null,[e("div",{"class":u("title",{inset:t.inset})},[s.title?s.title():t.title]),o()]):o()}}));export{c as C};
+>>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb:dist/assets/index-b026a759.js

dist/assets/index-b3c0f2c5.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-8e3c3e5a.js
+import{t as l,D as e,E as a,d as i,H as r,a as t,N as n,w as s,v as o,aq as c,ak as u,L as d,C as v}from"./index-50b118ba.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,C={center:u,required:!!g,clickable:p,borderless:!v};return c&&(C[c]=!!c),t(r,{"class":f(C),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{t as l,D as e,E as a,d as i,H as r,a as t,N as n,w as s,v as o,aq as c,ak as u,L as d,C as v}from"./index-232a7449.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,C={center:u,required:!!g,clickable:p,borderless:!v};return c&&(C[c]=!!c),t(r,{"class":f(C),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};
+>>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb:dist/assets/index-b3c0f2c5.js

dist/assets/index-c395054e.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-c395054e.js
 import{t,b as e,i as o}from"./index-5a2af269.js";import{c as s,S as i,Q as n,az as a,o as r,d as f,r as c,a as d}from"./index-50b118ba.js";function l(t){var o;const s=e(t);return null!=(o=null==s?void 0:s.$el)?o:s}const p=o?window:void 0;const u=f({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:o,emit:f}){const u=c({divStyle:{},heightV:0,sectionStyle:{width:"100%",height:"auto",left:"0"}}),m=n(),y=n();return r((()=>{"top"===e.position?u.divStyle.top=e.offsetTop||"0px":u.divStyle.bottom=e.offsetBottom||"0px";try{!function(e,o,f={}){const{window:c=p,...d}=f;let u;const m=function(t){const e=function(){const t=n(!1);return a()&&r((()=>{t.value=!0})),t}();return s((()=>(e.value,Boolean(t()))))}((()=>c&&"ResizeObserver"in c)),y=()=>{u&&(u.disconnect(),u=void 0)},v=s((()=>Array.isArray(e)?e.map((t=>l(t))):[l(e)])),h=i(v,(t=>{if(y(),m.value&&c){u=new ResizeObserver(o);for(const e of t)e&&u.observe(e,d)}}),{immediate:!0,flush:"post",deep:!0});t((()=>{y(),h()}))}(y.value,(t=>{const o=t[0],{height:s}=o.contentRect;Math.abs(s-u.heightV)>1&&setTimeout((()=>{var t;t=s,u.sectionStyle.height="".concat(t,"px"),u.heightV=t,document.documentElement.style.setProperty(e.varName,"".concat(t,"px")),f("barHeight",t)}),10)}))}catch(o){}})),i((()=>e.offsetTop),(()=>{u.divStyle.top=e.offsetTop})),i((()=>e.offsetBottom),(()=>{u.divStyle.bottom=e.offsetBottom})),()=>d("div",{style:[u.sectionStyle],"class":"sticky"===e.mode&&"_sticky_4d2w6_1"},[d("div",{ref:m,"class":["van-sticky","fixed"===e.mode?"van-sticky--fixed":""],style:[u.divStyle,u.sectionStyle]},[d("div",{ref:y},[o["default"]&&o["default"]()])])])}});export{u as O};
+========
+import{t,b as e,i as o}from"./index-725b9e0a.js";import{c as s,S as i,Q as n,az as a,o as r,d as f,r as c,a as d}from"./index-232a7449.js";function l(t){var o;const s=e(t);return null!=(o=null==s?void 0:s.$el)?o:s}const p=o?window:void 0;const u=f({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:o,emit:f}){const u=c({divStyle:{},heightV:0,sectionStyle:{width:"100%",height:"auto",left:"0"}}),m=n(),y=n();return r((()=>{"top"===e.position?u.divStyle.top=e.offsetTop||"0px":u.divStyle.bottom=e.offsetBottom||"0px";try{!function(e,o,f={}){const{window:c=p,...d}=f;let u;const m=function(t){const e=function(){const t=n(!1);return a()&&r((()=>{t.value=!0})),t}();return s((()=>(e.value,Boolean(t()))))}((()=>c&&"ResizeObserver"in c)),y=()=>{u&&(u.disconnect(),u=void 0)},v=s((()=>Array.isArray(e)?e.map((t=>l(t))):[l(e)])),h=i(v,(t=>{if(y(),m.value&&c){u=new ResizeObserver(o);for(const e of t)e&&u.observe(e,d)}}),{immediate:!0,flush:"post",deep:!0});t((()=>{y(),h()}))}(y.value,(t=>{const o=t[0],{height:s}=o.contentRect;Math.abs(s-u.heightV)>1&&setTimeout((()=>{var t;t=s,u.sectionStyle.height="".concat(t,"px"),u.heightV=t,document.documentElement.style.setProperty(e.varName,"".concat(t,"px")),f("barHeight",t)}),10)}))}catch(o){}})),i((()=>e.offsetTop),(()=>{u.divStyle.top=e.offsetTop})),i((()=>e.offsetBottom),(()=>{u.divStyle.bottom=e.offsetBottom})),()=>d("div",{style:[u.sectionStyle],"class":"sticky"===e.mode&&"_sticky_4d2w6_1"},[d("div",{ref:m,"class":["van-sticky","fixed"===e.mode?"van-sticky--fixed":""],style:[u.divStyle,u.sectionStyle]},[d("div",{ref:y},[o["default"]&&o["default"]()])])])}});export{u as O};
+>>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb:dist/assets/index-3a61b26a.js

dist/assets/index-dbe311bf.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-dbe311bf.js
 import{t,d as s,a as e,F as i,v as l,J as a,bo as r,al as n,C as o}from"./index-50b118ba.js";const[d,u]=t("cell-group"),c=o(s({name:d,inheritAttrs:!1,props:{title:String,inset:Boolean,border:l},setup(t,{slots:s,attrs:l}){const o=()=>{var i;return e("div",a({"class":[u({inset:t.inset}),{[n]:t.border&&!t.inset}]},l,r()),[null==(i=s["default"])?void 0:i.call(s)])};return()=>t.title||s.title?e(i,null,[e("div",{"class":u("title",{inset:t.inset})},[s.title?s.title():t.title]),o()]):o()}}));export{c as C};
+========
+import{t,d as s,a as e,F as i,v as l,J as a,bo as r,al as n,C as o}from"./index-232a7449.js";const[d,u]=t("cell-group"),c=o(s({name:d,inheritAttrs:!1,props:{title:String,inset:Boolean,border:l},setup(t,{slots:s,attrs:l}){const o=()=>{var i;return e("div",a({"class":[u({inset:t.inset}),{[n]:t.border&&!t.inset}]},l,r()),[null==(i=s["default"])?void 0:i.call(s)])};return()=>t.title||s.title?e(i,null,[e("div",{"class":u("title",{inset:t.inset})},[s.title?s.title():t.title]),o()]):o()}}));export{c as C};
+>>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb:dist/assets/index-b026a759.js

dist/assets/index-f903ad0d.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-f903ad0d.js
 import{t as o,d as a,Q as r,az as e,c as l,z as s,ak as i,S as n,a4 as t,a6 as d,o as c,V as u,a as v,w as g,v as f,N as h,au as m,bc as p,J as w,L as z,C as b}from"./index-50b118ba.js";const[y,L]=o("image"),S=b(a({name:y,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:y}=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)},P=o=>{f.value=!0,h.value=!1,a("error",o)},$=(a,r,e)=>e?e():v(z,{name:a,size:o.iconSize,"class":r,classPrefix:o.iconPrefix},null),j=()=>{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",w({ref:b},a),null),[[p("lazy"),o.src]]):v("img",w({ref:b,src:o.src,onLoad:x,onError:P},a),null)},k=({el:o})=>{const a=()=>{o===b.value&&h.value&&I()};b.value?a():u(a)},E=({el:o})=>{o!==b.value||f.value||P()};return y&&t&&(y.$on("loaded",k),y.$on("error",E),d((()=>{y.$off("loaded",k),y.$off("error",E)}))),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},[j(),h.value&&o.showLoading?v("div",{"class":L("loading")},[$(o.loadingIcon,L("loading-icon"),g.loading)]):f.value&&o.showError?v("div",{"class":L("error")},[$(o.errorIcon,L("error-icon"),g.error)]):void 0,null==(a=g["default"])?void 0:a.call(g)])}}}));export{S as I};
+========
+import{t as o,d as a,Q as r,az as e,c as l,z as s,ak as i,S as n,a4 as t,a6 as d,o as c,V as u,a as v,w as g,v as f,N as h,au as m,bc as p,J as w,L as z,C as b}from"./index-232a7449.js";const[y,L]=o("image"),S=b(a({name:y,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:y}=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)},P=o=>{f.value=!0,h.value=!1,a("error",o)},$=(a,r,e)=>e?e():v(z,{name:a,size:o.iconSize,"class":r,classPrefix:o.iconPrefix},null),j=()=>{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",w({ref:b},a),null),[[p("lazy"),o.src]]):v("img",w({ref:b,src:o.src,onLoad:x,onError:P},a),null)},k=({el:o})=>{const a=()=>{o===b.value&&h.value&&I()};b.value?a():u(a)},E=({el:o})=>{o!==b.value||f.value||P()};return y&&t&&(y.$on("loaded",k),y.$on("error",E),d((()=>{y.$off("loaded",k),y.$off("error",E)}))),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},[j(),h.value&&o.showLoading?v("div",{"class":L("loading")},[$(o.loadingIcon,L("loading-icon"),g.loading)]):f.value&&o.showError?v("div",{"class":L("error")},[$(o.errorIcon,L("error-icon"),g.error)]):void 0,null==(a=g["default"])?void 0:a.call(g)])}}}));export{S as I};
+>>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb:dist/assets/index-4d5d4bfb.js

dist/assets/index-legacy-1141706c.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-1141706c.js
 System.register(["./index-legacy-2b103ded.js"],(function(t,e){"use strict";var s,i,r,l,n,a,o,u,c;return{setters:[t=>{s=t.t,i=t.d,r=t.a,l=t.F,n=t.v,a=t.J,o=t.bo,u=t.al,c=t.C}],execute:function(){const[e,d]=s("cell-group"),v={title:String,inset:Boolean,border:n};var g=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(l,null,[r("div",{"class":d("title",{inset:t.inset})},[e.title?e.title():t.title]),i()]):i()}});t("C",c(g))}}}));
+========
+System.register(["./index-legacy-835c2a22.js"],(function(t,e){"use strict";var s,i,r,l,n,a,o,u,c;return{setters:[t=>{s=t.t,i=t.d,r=t.a,l=t.F,n=t.v,a=t.J,o=t.bo,u=t.al,c=t.C}],execute:function(){const[e,d]=s("cell-group"),v={title:String,inset:Boolean,border:n};var g=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(l,null,[r("div",{"class":d("title",{inset:t.inset})},[e.title?e.title():t.title]),i()]):i()}});t("C",c(g))}}}));
+>>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb:dist/assets/index-legacy-f8853d9e.js

dist/assets/index-legacy-546370c4.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-546370c4.js
 System.register(["./index-legacy-2b103ded.js"],(function(e,l){"use strict";var t,r,i,n,a,s,o,c,u,d,v,b,f;return{setters:[e=>{t=e.t,r=e.D,i=e.E,n=e.d,a=e.H,s=e.a,o=e.N,c=e.w,u=e.v,d=e.aq,v=e.ak,b=e.L,f=e.C}],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 k=n({name:l,props:C,setup(e,{slots:l}){const t=a(),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()])}},n=()=>{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:a,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(a,{"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(),n(),o(),null==(t=l.extra)?void 0:t.call(l)]}})}}});e("C",f(k))}}}));
+========
+System.register(["./index-legacy-835c2a22.js"],(function(e,l){"use strict";var t,r,i,n,a,s,o,c,u,d,v,b,f;return{setters:[e=>{t=e.t,r=e.D,i=e.E,n=e.d,a=e.H,s=e.a,o=e.N,c=e.w,u=e.v,d=e.aq,v=e.ak,b=e.L,f=e.C}],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 k=n({name:l,props:C,setup(e,{slots:l}){const t=a(),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()])}},n=()=>{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:a,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(a,{"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(),n(),o(),null==(t=l.extra)?void 0:t.call(l)]}})}}});e("C",f(k))}}}));
+>>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb:dist/assets/index-legacy-552d02c1.js

dist/assets/index-legacy-552d02c1.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-546370c4.js
+System.register(["./index-legacy-2b103ded.js"],(function(e,l){"use strict";var t,r,i,n,a,s,o,c,u,d,v,b,f;return{setters:[e=>{t=e.t,r=e.D,i=e.E,n=e.d,a=e.H,s=e.a,o=e.N,c=e.w,u=e.v,d=e.aq,v=e.ak,b=e.L,f=e.C}],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 k=n({name:l,props:C,setup(e,{slots:l}){const t=a(),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()])}},n=()=>{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:a,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(a,{"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(),n(),o(),null==(t=l.extra)?void 0:t.call(l)]}})}}});e("C",f(k))}}}));
+========
+System.register(["./index-legacy-835c2a22.js"],(function(e,l){"use strict";var t,r,i,n,a,s,o,c,u,d,v,b,f;return{setters:[e=>{t=e.t,r=e.D,i=e.E,n=e.d,a=e.H,s=e.a,o=e.N,c=e.w,u=e.v,d=e.aq,v=e.ak,b=e.L,f=e.C}],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 k=n({name:l,props:C,setup(e,{slots:l}){const t=a(),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()])}},n=()=>{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:a,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(a,{"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(),n(),o(),null==(t=l.extra)?void 0:t.call(l)]}})}}});e("C",f(k))}}}));
+>>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb:dist/assets/index-legacy-552d02c1.js

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

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-f60b3acc.js
+System.register(["./index-legacy-2b103ded.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-835c2a22.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)])}))}}}));
+>>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb:dist/assets/index-legacy-6fdf098d.js

dist/assets/index-legacy-8aae7957.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-d0875384.js
+!function(){function e(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function t(e,t,n){return(t=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e;var n=e[Symbol.toPrimitive];if(n!==undefined){var r=n.call(e,t||"default");if("object"!=typeof r)return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==typeof t?t:String(t)}(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}System.register(["./index-legacy-2b103ded.js"],(function(n,r){"use strict";var i,o,u,c,f,a;return{setters:[e=>{i=e.Q,o=e.b6,u=e.S,c=e.b7,f=e.b8,a=e.b9}],execute:function(){function r(e){return!!c()&&(f(e),!0)}function l(e){return"function"==typeof e?e():a(e)}n({a:b,b:l,t:r,u:function(n=1e3,r={}){const{controls:o=!1,immediate:u=!0,callback:c}=r,f=i(0),a=()=>f.value+=1,l=b(c?()=>{a(),c(f.value)}:a,n,{immediate:u});return o?function(n){for(var r=1;r<arguments.length;r++){var i=null!=arguments[r]?arguments[r]:{};r%2?e(Object(i),!0).forEach((function(e){t(n,e,i[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(n,Object.getOwnPropertyDescriptors(i)):e(Object(i)).forEach((function(e){Object.defineProperty(n,e,Object.getOwnPropertyDescriptor(i,e))}))}return n}({counter:f,reset:()=>{f.value=0}},l):f}});const s=n("i","undefined"!=typeof window&&"undefined"!=typeof document);function b(e,t=1e3,n={}){const{immediate:c=!0,immediateCallback:f=!1}=n;let a=null;const b=i(!1);function p(){a&&(clearInterval(a),a=null)}function y(){b.value=!1,p()}function m(){const n=l(t);n<=0||(b.value=!0,f&&e(),p(),a=setInterval(e,n))}return c&&s&&m(),(o(t)||"function"==typeof t)&&r(u(t,(()=>{b.value&&s&&m()}))),r(y),{isActive:b,pause:y,resume:m}}}}}))}();
+========
+!function(){function e(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function t(e,t,n){return(t=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e;var n=e[Symbol.toPrimitive];if(n!==undefined){var r=n.call(e,t||"default");if("object"!=typeof r)return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==typeof t?t:String(t)}(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}System.register(["./index-legacy-835c2a22.js"],(function(n,r){"use strict";var i,o,u,c,f,a;return{setters:[e=>{i=e.Q,o=e.b6,u=e.S,c=e.b7,f=e.b8,a=e.b9}],execute:function(){function r(e){return!!c()&&(f(e),!0)}function l(e){return"function"==typeof e?e():a(e)}n({a:b,b:l,t:r,u:function(n=1e3,r={}){const{controls:o=!1,immediate:u=!0,callback:c}=r,f=i(0),a=()=>f.value+=1,l=b(c?()=>{a(),c(f.value)}:a,n,{immediate:u});return o?function(n){for(var r=1;r<arguments.length;r++){var i=null!=arguments[r]?arguments[r]:{};r%2?e(Object(i),!0).forEach((function(e){t(n,e,i[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(n,Object.getOwnPropertyDescriptors(i)):e(Object(i)).forEach((function(e){Object.defineProperty(n,e,Object.getOwnPropertyDescriptor(i,e))}))}return n}({counter:f,reset:()=>{f.value=0}},l):f}});const s=n("i","undefined"!=typeof window&&"undefined"!=typeof document);function b(e,t=1e3,n={}){const{immediate:c=!0,immediateCallback:f=!1}=n;let a=null;const b=i(!1);function p(){a&&(clearInterval(a),a=null)}function y(){b.value=!1,p()}function m(){const n=l(t);n<=0||(b.value=!0,f&&e(),p(),a=setInterval(e,n))}return c&&s&&m(),(o(t)||"function"==typeof t)&&r(u(t,(()=>{b.value&&s&&m()}))),r(y),{isActive:b,pause:y,resume:m}}}}}))}();
+>>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb:dist/assets/index-legacy-8aae7957.js

dist/assets/index-legacy-d0875384.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-d0875384.js
 !function(){function e(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function t(e,t,n){return(t=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e;var n=e[Symbol.toPrimitive];if(n!==undefined){var r=n.call(e,t||"default");if("object"!=typeof r)return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==typeof t?t:String(t)}(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}System.register(["./index-legacy-2b103ded.js"],(function(n,r){"use strict";var i,o,u,c,f,a;return{setters:[e=>{i=e.Q,o=e.b6,u=e.S,c=e.b7,f=e.b8,a=e.b9}],execute:function(){function r(e){return!!c()&&(f(e),!0)}function l(e){return"function"==typeof e?e():a(e)}n({a:b,b:l,t:r,u:function(n=1e3,r={}){const{controls:o=!1,immediate:u=!0,callback:c}=r,f=i(0),a=()=>f.value+=1,l=b(c?()=>{a(),c(f.value)}:a,n,{immediate:u});return o?function(n){for(var r=1;r<arguments.length;r++){var i=null!=arguments[r]?arguments[r]:{};r%2?e(Object(i),!0).forEach((function(e){t(n,e,i[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(n,Object.getOwnPropertyDescriptors(i)):e(Object(i)).forEach((function(e){Object.defineProperty(n,e,Object.getOwnPropertyDescriptor(i,e))}))}return n}({counter:f,reset:()=>{f.value=0}},l):f}});const s=n("i","undefined"!=typeof window&&"undefined"!=typeof document);function b(e,t=1e3,n={}){const{immediate:c=!0,immediateCallback:f=!1}=n;let a=null;const b=i(!1);function p(){a&&(clearInterval(a),a=null)}function y(){b.value=!1,p()}function m(){const n=l(t);n<=0||(b.value=!0,f&&e(),p(),a=setInterval(e,n))}return c&&s&&m(),(o(t)||"function"==typeof t)&&r(u(t,(()=>{b.value&&s&&m()}))),r(y),{isActive:b,pause:y,resume:m}}}}}))}();
+========
+!function(){function e(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function t(e,t,n){return(t=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e;var n=e[Symbol.toPrimitive];if(n!==undefined){var r=n.call(e,t||"default");if("object"!=typeof r)return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string");return"symbol"==typeof t?t:String(t)}(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}System.register(["./index-legacy-835c2a22.js"],(function(n,r){"use strict";var i,o,u,c,f,a;return{setters:[e=>{i=e.Q,o=e.b6,u=e.S,c=e.b7,f=e.b8,a=e.b9}],execute:function(){function r(e){return!!c()&&(f(e),!0)}function l(e){return"function"==typeof e?e():a(e)}n({a:b,b:l,t:r,u:function(n=1e3,r={}){const{controls:o=!1,immediate:u=!0,callback:c}=r,f=i(0),a=()=>f.value+=1,l=b(c?()=>{a(),c(f.value)}:a,n,{immediate:u});return o?function(n){for(var r=1;r<arguments.length;r++){var i=null!=arguments[r]?arguments[r]:{};r%2?e(Object(i),!0).forEach((function(e){t(n,e,i[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(n,Object.getOwnPropertyDescriptors(i)):e(Object(i)).forEach((function(e){Object.defineProperty(n,e,Object.getOwnPropertyDescriptor(i,e))}))}return n}({counter:f,reset:()=>{f.value=0}},l):f}});const s=n("i","undefined"!=typeof window&&"undefined"!=typeof document);function b(e,t=1e3,n={}){const{immediate:c=!0,immediateCallback:f=!1}=n;let a=null;const b=i(!1);function p(){a&&(clearInterval(a),a=null)}function y(){b.value=!1,p()}function m(){const n=l(t);n<=0||(b.value=!0,f&&e(),p(),a=setInterval(e,n))}return c&&s&&m(),(o(t)||"function"==typeof t)&&r(u(t,(()=>{b.value&&s&&m()}))),r(y),{isActive:b,pause:y,resume:m}}}}}))}();
+>>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb:dist/assets/index-legacy-8aae7957.js

dist/assets/index-legacy-f60b3acc.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-f60b3acc.js
 System.register(["./index-legacy-2b103ded.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-835c2a22.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)])}))}}}));
+>>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb:dist/assets/index-legacy-6fdf098d.js

dist/assets/index-legacy-f8853d9e.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-1141706c.js
+System.register(["./index-legacy-2b103ded.js"],(function(t,e){"use strict";var s,i,r,l,n,a,o,u,c;return{setters:[t=>{s=t.t,i=t.d,r=t.a,l=t.F,n=t.v,a=t.J,o=t.bo,u=t.al,c=t.C}],execute:function(){const[e,d]=s("cell-group"),v={title:String,inset:Boolean,border:n};var g=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(l,null,[r("div",{"class":d("title",{inset:t.inset})},[e.title?e.title():t.title]),i()]):i()}});t("C",c(g))}}}));
+========
+System.register(["./index-legacy-835c2a22.js"],(function(t,e){"use strict";var s,i,r,l,n,a,o,u,c;return{setters:[t=>{s=t.t,i=t.d,r=t.a,l=t.F,n=t.v,a=t.J,o=t.bo,u=t.al,c=t.C}],execute:function(){const[e,d]=s("cell-group"),v={title:String,inset:Boolean,border:n};var g=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(l,null,[r("div",{"class":d("title",{inset:t.inset})},[e.title?e.title():t.title]),i()]):i()}});t("C",c(g))}}}));
+>>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb:dist/assets/index-legacy-f8853d9e.js

dist/assets/use-tab-status-ce3b98bb.js

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

dist/assets/use-tab-status-legacy-09b91c07.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/use-tab-status-legacy-09b91c07.js
 System.register(["./index-legacy-2b103ded.js"],(function(e,t){"use strict";var n;return{setters:[e=>{n=e.aQ}],execute:function(){const t=e("T",Symbol());e("u",(()=>n(t,null)))}}}));
+========
+System.register(["./index-legacy-835c2a22.js"],(function(e,t){"use strict";var n;return{setters:[e=>{n=e.aQ}],execute:function(){const t=e("T",Symbol());e("u",(()=>n(t,null)))}}}));
+>>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb:dist/assets/use-tab-status-legacy-485fedbe.js

dist/assets/use-tab-status-legacy-485fedbe.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/use-tab-status-legacy-09b91c07.js
+System.register(["./index-legacy-2b103ded.js"],(function(e,t){"use strict";var n;return{setters:[e=>{n=e.aQ}],execute:function(){const t=e("T",Symbol());e("u",(()=>n(t,null)))}}}));
+========
+System.register(["./index-legacy-835c2a22.js"],(function(e,t){"use strict";var n;return{setters:[e=>{n=e.aQ}],execute:function(){const t=e("T",Symbol());e("u",(()=>n(t,null)))}}}));
+>>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb:dist/assets/use-tab-status-legacy-485fedbe.js

dist/index.html

@@ -8,6 +8,13 @@
     content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover">
   <meta http-equiv="Cache-control" content="no-cache">
   <meta http-equiv="Cache" content="no-cache">
+<<<<<<< HEAD
+=======
+  <meta http-equiv="Content-Security-Policy" content="
+                                default-src * data: blob: ws: wss: gap://ready file://* customscheme://*;
+                                style-src * 'unsafe-inline';
+                                script-src * 'unsafe-inline' 'unsafe-eval';">
+>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb
   <meta name="apple-mobile-web-app-capable" content="yes" />
   <meta name="renderer" content="webkit" />
   <!-- 避免IE使用兼容模式 -->
@@ -15,7 +22,11 @@
   <meta name="HandheldFriendly" content="true" />
   <title>管乐迷</title>
   <script src="./flexible.js" charset="UTF-8"></script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index-50b118ba.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/index-232a7449.js"></script>
+>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb
   <link rel="stylesheet" href="./assets/index-a5076509.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>
@@ -26,7 +37,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-2b103ded.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-835c2a22.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb
 </body>
 
 </html>

index.html

@@ -8,6 +8,13 @@
     content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover">
   <meta http-equiv="Cache-control" content="no-cache">
   <meta http-equiv="Cache" content="no-cache">
+<<<<<<< HEAD
+=======
+  <meta http-equiv="Content-Security-Policy" content="
+                                default-src * data: blob: ws: wss: gap://ready file://* customscheme://*;
+                                style-src * 'unsafe-inline';
+                                script-src * 'unsafe-inline' 'unsafe-eval';">
+>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb
   <meta name="apple-mobile-web-app-capable" content="yes" />
   <meta name="renderer" content="webkit" />
   <!-- 避免IE使用兼容模式 -->

package-lock.json

@@ -4427,9 +4427,15 @@
       "dev": true
     },
     "node_modules/fast-xml-parser": {
+<<<<<<< HEAD
       "version": "4.4.1",
       "resolved": "https://registry.npmmirror.com/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz",
       "integrity": "sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==",
+=======
+      "version": "4.5.0",
+      "resolved": "https://registry.npmmirror.com/fast-xml-parser/-/fast-xml-parser-4.5.0.tgz",
+      "integrity": "sha512-/PlTQCI96+fZMAOLMZK4CWG1ItCbfZ/0jx7UIJFChPNrx7tcEgerUgWbeieCM9MfHInUDyK8DWYZ+YrywDJuTg==",
+>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb
       "funding": [
         {
           "type": "github",
@@ -11732,9 +11738,15 @@
       "dev": true
     },
     "fast-xml-parser": {
+<<<<<<< HEAD
       "version": "4.4.1",
       "resolved": "https://registry.npmmirror.com/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz",
       "integrity": "sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==",
+=======
+      "version": "4.5.0",
+      "resolved": "https://registry.npmmirror.com/fast-xml-parser/-/fast-xml-parser-4.5.0.tgz",
+      "integrity": "sha512-/PlTQCI96+fZMAOLMZK4CWG1ItCbfZ/0jx7UIJFChPNrx7tcEgerUgWbeieCM9MfHInUDyK8DWYZ+YrywDJuTg==",
+>>>>>>> f62f7377ffd12a332f147bc976ada16ab4da31cb
       "requires": {
         "strnum": "^1.0.5"
       }

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

@@ -394,11 +394,6 @@ export default defineComponent({
         content: {
           id: row.id,
           partIndex: this.selectedPartIndex
-          // url: location.origin + '/accompany/#/detail/' + row.examSongId + '?mode=homework',
-          // orientation: 0,
-          // isHideTitle: true,
-          // statusBarTextColor: false,
-          // isOpenLight: true,
         }
       });
     },

src/views/coursewarePlay/component/musicScore.tsx

@@ -38,14 +38,19 @@ export default defineComponent({
     const renderError = ref(false);
     const renderSuccess = ref(false);
     const Authorization = sessionStorage.getItem('Authorization') || '';
+    // const origin = /(localhost|192)/.test(location.host)
+    //   ? 'https://test.gym.lexiaoya.cn'
+    //   : location.origin;
+    // const src = `${origin}/${
+    //   state.platformType === 'TEACHER' ? 'accompany-teacher' : 'accompany'
+    // }/?Authorization=${Authorization}&liveConfig=1#/detail/${
+    //   props.music.content
+    // }?isHideBack=true`;
+
     const origin = /(localhost|192)/.test(location.host)
-      ? 'https://test.gym.lexiaoya.cn'
-      : location.origin;
-    const src = `${origin}/${
-      state.platformType === 'TEACHER' ? 'accompany-teacher' : 'accompany'
-    }/?Authorization=${Authorization}&liveConfig=1#/detail/${
-      props.music.content
-    }?isHideBack=true`;
+          ? 'https://test.gym.lexiaoya.cn/'
+          : location.origin;
+    const src = `${origin}/gym-music-score/?id=${props.music.content}&Authorization=${Authorization}&isHideBack=true&isHideMusicList=true&systemType=${ state.platformType === 'TEACHER' ? 'teacher' : 'student'}`
 
     const checkView = () => {
       fetch(src)

src/views/coursewarePlay/component/points.tsx

@@ -42,20 +42,20 @@ export default defineComponent({
       }
     );
 
-    console.log(
-      pointData.active,
-      'pointData.active',
-      props.data,
-      props.tabActive
-    );
+    // console.log(
+    //   pointData.active,
+    //   'pointData.active',
+    //   props.data,
+    //   props.tabActive
+    // );
 
     // 获取对应图片
     const getImage = (item: any) => {
-      if (item.type === 'VIDEO') {
+      if (item.typeCode === 'VIDEO') {
         return props.itemActive == item.id ? iconVideoActive : iconVideo;
-      } else if (['IMAGE', 'IMG'].includes(item.type)) {
+      } else if (['IMAGE', 'IMG'].includes(item.typeCode)) {
         return props.itemActive == item.id ? iconImageActive : iconImage;
-      } else if (item.type === 'SONG') {
+      } else if (item.typeCode === 'SONG') {
         return props.itemActive == item.id ? iconSongActive : iconSong;
       } else {
         return props.itemActive == item.id ? iconVideoActive : iconVideo;

src/views/coursewarePlay/component/video-play.tsx

@@ -324,14 +324,20 @@ export default defineComponent({
       // 去云练习完整版
       e.stopPropagation();
       const Authorization = sessionStorage.getItem('Authorization') || '';
-      const origin = /(localhost|192)/.test(location.host)
-        ? 'https://test.gym.lexiaoya.cn'
-        : location.origin;
-      const src = `${origin}/${
-        state.platformType === 'TEACHER' ? 'accompany-teacher' : 'accompany'
-      }/#/detail/${
-        item.value.materialMusicId
-      }?Authorization=${Authorization}&isHideTitle=true`;
+      // const origin = /(localhost|192)/.test(location.host)
+      //   ? 'https://test.gym.lexiaoya.cn'
+      //   : location.origin;
+      // const src = `${origin}/${
+      //   state.platformType === 'TEACHER' ? 'accompany-teacher' : 'accompany'
+      // }/#/detail/${
+      //   item.value.materialMusicId
+      // }?Authorization=${Authorization}&isHideTitle=true`;
+
+    const origin = /(localhost|192)/.test(location.host)
+          ? 'https://test.gym.lexiaoya.cn/'
+          : location.origin;
+    const src = `${origin}/gym-music-score/?id=${item.value.materialMusicId}&Authorization=${Authorization}&isHideMusicList=true&systemType=${ state.platformType === 'TEACHER' ? 'teacher' : 'student'}`
+
       postMessage({
         api: 'openAccompanyWebView',
         content: {