Merge branch 'iteration-20241030-crouseware' into dev

components.d.ts

@@ -9,9 +9,9 @@ export {}
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    HelloWorld: typeof import('./src/components/HelloWorld.vue')['default']
+    GlobalTools: typeof import('./src/components/globalTools/globalTools.vue')['default']
+    GlobalTools1: typeof import('./src/components/globalTools/globalTools-1.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
-    VanButton: typeof import('vant/es')['Button']
   }
 }

dist/assets/index-075ea1c3.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-075ea1c3.js
 import{w as l,G as e,H as a,d as i,J as r,a as t,R as n,y as s,x as o,at as c,an as u,N as d,E as v}from"./index-ed417473.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,x={center:u,required:!!g,clickable:p,borderless:!v};return c&&(x[c]=!!c),t(r,{"class":f(x),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-fc0cdbb1.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};
+>>>>>>>> iteration-20241030-crouseware:dist/assets/index-29fdb1cd.js

dist/assets/index-0c72231d.js

@@ -0,0 +1 @@
+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-fc0cdbb1.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};

dist/assets/index-2953b857.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-af2d05f0.js
+import{O as s}from"./index-ebb6c356.js";import{d as i,a as t,O as e,m as a}from"./index-ed417473.js";import{I as o}from"./index-ec77e08e.js";import"./index-9269f47e.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-55eef941.js";import{d as i,a as t,O as e,m as a}from"./index-fc0cdbb1.js";import{I as o}from"./index-0c72231d.js";import"./index-3194b0ff.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};
+>>>>>>>> iteration-20241030-crouseware:dist/assets/index-2953b857.js

dist/assets/index-29fdb1cd.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-075ea1c3.js
+import{w as l,G as e,H as a,d as i,J as r,a as t,R as n,y as s,x as o,at as c,an as u,N as d,E as v}from"./index-ed417473.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,x={center:u,required:!!g,clickable:p,borderless:!v};return c&&(x[c]=!!c),t(r,{"class":f(x),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-fc0cdbb1.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};
+>>>>>>>> iteration-20241030-crouseware:dist/assets/index-29fdb1cd.js

dist/assets/index-3194b0ff.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-9269f47e.js
+import{S as e,b1 as n,V as t,b2 as a,b3 as u,b4 as o}from"./index-ed417473.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-fc0cdbb1.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};
+>>>>>>>> iteration-20241030-crouseware:dist/assets/index-3194b0ff.js

dist/assets/index-34ae94e1.js

@@ -0,0 +1 @@
+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-fc0cdbb1.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};

dist/assets/index-55eef941.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-ebb6c356.js
+import{t,b as e,i as o}from"./index-9269f47e.js";import{c as s,V as i,S as n,aC as a,o as r,d as f,r as c,a as d}from"./index-ed417473.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-3194b0ff.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-fc0cdbb1.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};
+>>>>>>>> iteration-20241030-crouseware:dist/assets/index-55eef941.js

dist/assets/index-7e7387bc.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-7e7387bc.js
 import{d as a,a as s}from"./index-ed417473.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-fc0cdbb1.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};
+>>>>>>>> iteration-20241030-crouseware:dist/assets/index-984407b1.js

dist/assets/index-9269f47e.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-9269f47e.js
 import{S as e,b1 as n,V as t,b2 as a,b3 as u,b4 as o}from"./index-ed417473.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-fc0cdbb1.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};
+>>>>>>>> iteration-20241030-crouseware:dist/assets/index-3194b0ff.js

dist/assets/index-984407b1.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-7e7387bc.js
+import{d as a,a as s}from"./index-ed417473.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-fc0cdbb1.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};
+>>>>>>>> iteration-20241030-crouseware:dist/assets/index-984407b1.js

dist/assets/index-af2d05f0.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-af2d05f0.js
 import{O as s}from"./index-ebb6c356.js";import{d as i,a as t,O as e,m as a}from"./index-ed417473.js";import{I as o}from"./index-ec77e08e.js";import"./index-9269f47e.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-55eef941.js";import{d as i,a as t,O as e,m as a}from"./index-fc0cdbb1.js";import{I as o}from"./index-0c72231d.js";import"./index-3194b0ff.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};
+>>>>>>>> iteration-20241030-crouseware:dist/assets/index-2953b857.js

dist/assets/index-ebb6c356.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-ebb6c356.js
 import{t,b as e,i as o}from"./index-9269f47e.js";import{c as s,V as i,S as n,aC as a,o as r,d as f,r as c,a as d}from"./index-ed417473.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-3194b0ff.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-fc0cdbb1.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};
+>>>>>>>> iteration-20241030-crouseware:dist/assets/index-55eef941.js

dist/assets/index-legacy-0c666d94.js

@@ -0,0 +1 @@
+System.register(["./index-legacy-e74bb2df.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))}}}));

dist/assets/index-legacy-41ec5554.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-41ec5554.js
 System.register(["./index-legacy-df184a5a.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-e74bb2df.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)])}))}}}));
+>>>>>>>> iteration-20241030-crouseware:dist/assets/index-legacy-760e106a.js

dist/assets/index-legacy-760e106a.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-41ec5554.js
+System.register(["./index-legacy-df184a5a.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-e74bb2df.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)])}))}}}));
+>>>>>>>> iteration-20241030-crouseware:dist/assets/index-legacy-760e106a.js

dist/assets/index-legacy-9c3e309c.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-f9c35ef8.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-df184a5a.js"],(function(n,r){"use strict";var i,o,u,c,f,a;return{setters:[e=>{i=e.S,o=e.b1,u=e.V,c=e.b2,f=e.b3,a=e.b4}],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-e74bb2df.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}}}}}))}();
+>>>>>>>> iteration-20241030-crouseware:dist/assets/index-legacy-9c3e309c.js

dist/assets/index-legacy-bc9fa413.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-bc9fa413.js
 System.register(["./index-legacy-df184a5a.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.w,r=e.G,i=e.H,n=e.d,a=e.J,s=e.a,o=e.R,c=e.y,u=e.x,d=e.at,v=e.an,b=e.N,f=e.E}],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}}),x=r({},y,i);var C=n({name:l,props:x,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,x={center:u,required:!!f,clickable:y,borderless:!d};return c&&(x[c]=!!c),s(a,{"class":g(x),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(C))}}}));
+========
+System.register(["./index-legacy-e74bb2df.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))}}}));
+>>>>>>>> iteration-20241030-crouseware:dist/assets/index-legacy-c5f8b760.js

dist/assets/index-legacy-c5f8b760.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-bc9fa413.js
+System.register(["./index-legacy-df184a5a.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.w,r=e.G,i=e.H,n=e.d,a=e.J,s=e.a,o=e.R,c=e.y,u=e.x,d=e.at,v=e.an,b=e.N,f=e.E}],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}}),x=r({},y,i);var C=n({name:l,props:x,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,x={center:u,required:!!f,clickable:y,borderless:!d};return c&&(x[c]=!!c),s(a,{"class":g(x),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(C))}}}));
+========
+System.register(["./index-legacy-e74bb2df.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))}}}));
+>>>>>>>> iteration-20241030-crouseware:dist/assets/index-legacy-c5f8b760.js

dist/assets/index-legacy-f9c35ef8.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-f9c35ef8.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-df184a5a.js"],(function(n,r){"use strict";var i,o,u,c,f,a;return{setters:[e=>{i=e.S,o=e.b1,u=e.V,c=e.b2,f=e.b3,a=e.b4}],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-e74bb2df.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}}}}}))}();
+>>>>>>>> iteration-20241030-crouseware:dist/assets/index-legacy-9c3e309c.js

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

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

dist/assets/use-tab-status-legacy-a03b0820.js

@@ -0,0 +1 @@
+System.register(["./index-legacy-e74bb2df.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)))}}}));

dist/index.html

@@ -41,8 +41,13 @@
   <meta name="referrer" content="no-referrer" />
   <title>管乐迷</title>
   <script src="./flexible.js" charset="UTF-8"></script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index-ed417473.js"></script>
   <link rel="stylesheet" href="./assets/index-7b43a5c2.css">
+=======
+  <script type="module" crossorigin src="./assets/index-fc0cdbb1.js"></script>
+  <link rel="stylesheet" href="./assets/index-a5076509.css">
+>>>>>>> iteration-20241030-crouseware
   <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>
 </head>
@@ -52,7 +57,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-df184a5a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-e74bb2df.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20241030-crouseware
 </body>
 
 </html>

src/components/globalTools/globalTools.ts

@@ -0,0 +1,17 @@
+import { ref } from "vue"
+
+/** 工具栏状态 */
+export const toolOpen = ref(false)
+// 批注
+export const penShow = ref(false)
+// 白板
+export const whitePenShow = ref(false)
+// 是否正在播放
+export const isPlay = ref(false)
+// 是否隐藏
+export const isHidden = ref(true)
+
+/** 是否隐藏工具栏 */
+export const handleHidden = (status = true) => {
+   isHidden.value = status
+}

src/components/globalTools/index.module.less

@@ -0,0 +1,102 @@
+.globalTools {
+  &.isPlay {
+     .iconTools,
+     .expendTools {
+        opacity: 0.4;
+     }
+  }
+  &.isHidden {
+     .iconTools,
+     .expendTools {
+        opacity: 0;
+        display: none;
+     }
+  }
+
+  .mask {
+     position: fixed;
+     left: 0;
+     right: 0;
+     top: 0;
+     bottom: 0;
+     background-color: transparent;
+     z-index: 2998;
+  }
+  .iconTools,
+  .expendTools {
+     position: fixed;
+     right: -2px;
+     top: 0;
+     transform: translateY(var(--toolTranslateY));
+     // margin-top: -29px;
+     z-index: 2999;
+     // padding: 0 5px;
+     background: rgba(0, 0, 0, 0.4);
+     border-radius: 200px 0px 0px 200px;
+     border: 2px solid rgba(255, 255, 255, 0.3);
+     border-right-width: 0;
+     cursor: pointer;
+     font-size: 0;
+     // transition: transform 0.2s ease;
+     img {
+        padding: 5px 8px;
+        width: 24px;
+        height: 24px;
+        box-sizing: content-box;
+        -moz-user-select: none;
+        /* 火狐浏览器 */
+        -webkit-user-drag: none;
+        /* 谷歌、Safari和Opera浏览器 */
+        -webkit-user-select: none;
+        /* 谷歌、Safari和Opera浏览器 */
+        -ms-user-select: none;
+        /* IE10+浏览器 */
+        user-select: none;
+        /* 通用 */
+        -webkit-touch-callout: none;
+        /* iOS Safari */
+
+        &:hover {
+           opacity: 0.8;
+        }
+     }
+  }
+
+  .iconTools {
+     // transition-delay: 0.2s;
+  }
+
+  .expendTools {
+     // transform: translateX(100%);
+     display: none;
+     img {
+        cursor: pointer;
+        padding-left: 12px;
+        padding-right: 12px;
+     }
+     .iconWhiteboard {
+        // margin: 0 30px;
+        padding-left: 8px;
+        padding-right: 8px;
+     }
+     .iconArrow {
+        padding: 7px 12px;
+        width: 18px;
+        height: 18px;
+     }
+  }
+
+  .hideTools {
+     // transition: transform 0.2s ease;
+     transform: translateY(var(--toolTranslateY));
+     display: none;
+  }
+
+  .showTools {
+     // transition: transform 0.2s ease;
+     // transition-delay: 0.2s;
+     transform: translateY(var(--toolTranslateY));
+     display: flex;
+     align-items: center;
+  }
+}

src/components/globalTools/index.tsx

@@ -0,0 +1,223 @@
+import {
+  toolOpen,
+  whitePenShow,
+  penShow,
+  isPlay,
+  isHidden
+} from './globalTools';
+import { defineComponent, onMounted, onUnmounted, ref, watch } from 'vue';
+import { useRoute } from 'vue-router';
+import styles from './index.module.less';
+import iconTool from './images/icon-tool.png';
+import iconNote from './images/icon-note.png';
+import iconWhiteboard from './images/icon-whiteboard.png';
+import gArrowRight from './images/g-arrow-right.png';
+import Pen from '@/views/coursewarePlay/component/tools/pen';
+import { nextTick } from 'process';
+
+export default defineComponent({
+  name: 'globalTools',
+  setup() {
+    const isMask = ref(false); // 是否显示遮罩层，为了处理云教练里面拖动不了的问题
+    const route = useRoute();
+    // watch(
+    //   () => route.path,
+    //   () => {
+    //     handleStatus();
+    //   }
+    // );
+    const iconToolsDom = ref<HTMLDivElement>();
+    const expendToolsDom = ref<HTMLDivElement>();
+
+    function openTool() {
+      if (isLock) return;
+      isPlay.value = false
+      toolOpen.value = !toolOpen.value;
+    }
+
+    function openType(type: 'note' | 'whiteboard') {
+      if (isLock) return;
+      if (type === 'note') {
+        penShow.value = true;
+
+        isHidden.value = true;
+      } else if (type === 'whiteboard') {
+        whitePenShow.value = true;
+        isHidden.value = true;
+      }
+    }
+
+    function handleStatus() {
+      isHidden.value = route.path === '/login' ? true : false;
+    }
+
+    function computePos(type: 'width' | 'height', value: number) {
+      const clientNum =
+        type == 'width'
+          ? document.documentElement.clientWidth
+          : document.documentElement.clientHeight;
+      console.log(value, clientNum)
+      return {
+        pos: ((clientNum - value) / 2).toFixed(5)
+      };
+    }
+
+    /* 拖拽还没有兼容rem */
+    let isLock = false;
+    let toolMoveY = 0; // 移动的距离
+    function drag(el: HTMLElement) {
+      function mousedown(e: MouseEvent | TouchEvent) {
+        const isTouchEv = isTouchEvent(e);
+        const event = isTouchEv ? e.touches[0] : e;
+        isLock = false;
+        isMask.value = true;
+        const parentElement = el;
+        const parentElementRect = parentElement.getBoundingClientRect();
+        const downX = event.clientX;
+        const downY = event.clientY;
+        // const clientWidth = document.documentElement.clientWidth
+        const clientHeight = document.documentElement.clientHeight;
+        // const minLeft = 0
+        const minTop = 0;
+        // const maxLeft = clientWidth - parentElementRect.width
+        const maxTop = clientHeight - parentElementRect.height;
+        function onMousemove(e: MouseEvent | TouchEvent) {
+          const event = isTouchEvent(e) ? e.touches[0] : e;
+          // let moveX = parentElementRect.left + (e.clientX - downX)
+          let moveY = parentElementRect.top + (event.clientY - downY);
+          // let moveY = e.clientY - downY
+          // moveX = moveX < minLeft ? minLeft : moveX > maxLeft ? maxLeft : moveX
+          moveY = moveY < minTop ? minTop : moveY > maxTop ? maxTop : moveY;
+          toolMoveY = moveY;
+          document.documentElement.style.setProperty(
+            '--toolTranslateY',
+            `${moveY}px`
+          );
+
+          // 计算移动的距离
+          const cX = event.clientX - downX;
+          const cY = event.clientY - downY;
+
+          // 如果移动距离超过一定阈值，则认为是拖动
+          if (Math.abs(cX) > 3 || Math.abs(cY) > 3) {
+            isLock = true; // 设置为拖动状态
+          }
+        }
+        function onMouseup() {
+          document.removeEventListener(
+            isTouchEv ? 'touchmove' : 'mousemove',
+            onMousemove
+          );
+          document.removeEventListener(
+            isTouchEv ? 'touchend' : 'mouseup',
+            onMouseup
+          );
+          isMask.value = false;
+        }
+        document.addEventListener(
+          isTouchEv ? 'touchmove' : 'mousemove',
+          onMousemove
+        );
+        document.addEventListener(
+          isTouchEv ? 'touchend' : 'mouseup',
+          onMouseup
+        );
+      }
+      el.addEventListener('mousedown', mousedown);
+      el.addEventListener('touchstart', mousedown);
+    }
+    function isTouchEvent(e: MouseEvent | TouchEvent): e is TouchEvent {
+      return window.TouchEvent && e instanceof window.TouchEvent;
+    }
+    //重新计算位置 居中
+    function refreshPos() {
+      // computePos("height", iconToolsDom.value?.clientHeight ||
+      console.log(iconToolsDom.value?.clientHeight);
+      const posHeight = computePos(
+        'height',
+        iconToolsDom.value?.clientHeight || 0
+      );
+      if (iconToolsDom.value) {
+        document.documentElement.style.setProperty(
+          '--toolTranslateY',
+          `${posHeight.pos}px`
+        );
+      }
+    }
+    let rect: any;
+    function onResize() {
+      rect = rect ? rect : iconToolsDom.value?.getBoundingClientRect();
+      const clientHeight = document.documentElement.clientHeight;
+      const maxTop = clientHeight - rect.height;
+      if (toolMoveY >= maxTop) {
+        document.documentElement.style.setProperty(
+          '--toolTranslateY',
+          `${maxTop}px`
+        );
+      }
+    }
+    onMounted(() => {
+      handleStatus();
+      drag(iconToolsDom.value!);
+      drag(expendToolsDom.value!);
+      nextTick(() => {
+        refreshPos();
+      })
+      window.addEventListener('resize', onResize);
+    });
+
+    onUnmounted(() => {
+      window.removeEventListener('resize', onResize);
+    });
+    return () => (
+      <div>
+        <div
+          class={[
+            styles.globalTools,
+            isPlay.value ? styles.isPlay : '',
+            isHidden.value ? styles.isHidden : ''
+          ]}>
+          {isMask.value && <div class={styles.mask}></div>}
+
+          <div
+            class={[[styles.iconTools, toolOpen.value ? styles.hideTools : '']]}
+            ref={iconToolsDom}>
+            <img onClick={openTool} src={iconTool} />
+          </div>
+          <div
+            class={[styles.expendTools, toolOpen.value ? styles.showTools : '']}
+            ref={expendToolsDom}>
+            <img onClick={() => openType('note')} src={iconNote} />
+            <img
+              onClick={() => openType('whiteboard')}
+              class={styles.iconWhiteboard}
+              src={iconWhiteboard}
+            />
+            <img
+              onClick={openTool}
+              class={styles.iconArrow}
+              src={gArrowRight}
+            />
+          </div>
+        </div>
+        <Pen
+          show={penShow.value}
+          tip="请确认是否退出批注？"
+          close={() => {
+            penShow.value = false;
+            isHidden.value = false;
+          }}
+        />
+        <Pen
+          show={whitePenShow.value}
+          isWhite
+          tip="请确认是否退出白板？"
+          close={() => {
+            whitePenShow.value = false;
+            isHidden.value = false;
+          }}
+        />
+      </div>
+    );
+  }
+});

src/components/o-guide/index.module.less

@@ -4,9 +4,14 @@
   :global {
     .van-tabs__nav {
       background-color: transparent;
+      --van-tabs-bottom-bar-width: 16px;
       .van-tab {
-        color: #fff;
+        color: rgba(255,255,255,.5);
         font-size: 16px;
+        font-weight: 500;
+      }
+      .van-tab--active {
+        color: #fff;
       }
     }
     .van-tab__panel {
@@ -20,6 +25,7 @@
     }
     .van-tabs__line{
       bottom: .5rem;
+      background: linear-gradient( 135deg, #79FECA 0%, #06CEC1 100%);
     }
   }
   .content {

src/views/coursewarePlay/component/courseware-tips/index.module.less

@@ -0,0 +1,32 @@
+.container {
+  width: 453px;
+  height: 302px;
+  background: url('../../image/tips-bg.png') top center no-repeat #fff;
+  background-size: contain;
+  border-radius: 20px;
+  display: flex;
+  flex-direction: column;
+
+  .title {
+    font-weight: 600;
+    font-size: 16px;
+    color: #131415;
+    line-height: 22px;
+    text-align: center;
+    padding: 12px 0;
+    flex-shrink: 0;
+  }
+
+  .content {
+    flex: 1;
+    overflow-x: hidden;
+    overflow-y: auto;
+    padding: 0 20px;
+    margin-bottom: 16px;
+    font-size: 14px;
+
+    &::-webkit-scrollbar {
+      display: none;
+    }
+  }
+}

src/views/coursewarePlay/component/courseware-tips/index.tsx

@@ -0,0 +1,24 @@
+import { defineComponent, PropType } from "vue";
+import styles from './index.module.less'
+
+export default defineComponent({
+  name: 'coruseware-tips',
+  props: {
+    titleName: {
+      type: String,
+      default: '阶段目标'
+    },
+    content: {
+      type: String,
+      default: ''
+    }
+  },
+  setup(props) {
+    return () => <div class={styles.container}>
+      <div class={styles.title}>
+        {props.titleName}
+      </div>
+      <div class={styles.content} v-html={props.content}></div>
+    </div>
+  }
+})

src/views/coursewarePlay/component/courseware-type/index.module.less

@@ -0,0 +1,146 @@
+.container {
+  display: flex;
+  flex-direction: column;
+  min-width: 300px;
+  max-width: 300px;
+  height: 100vh;
+  color: #fff;
+  font-size: 12px;
+  box-sizing: border-box;
+}
+
+.pointHead {
+  display: flex;
+  align-items: center;
+  padding: 13px 10px 15px 15px;
+  flex-shrink: 0;
+  font-size: 16px;
+  font-weight: 500;
+
+  img {
+    width: 20px;
+    height: 20px;
+    margin-right: 6px;
+  }
+}
+
+.content {
+  flex: 1;
+  overflow-y: auto;
+  padding: 0 8px;
+}
+
+
+.item {
+  display: inline-block;
+  margin: 0 0 18px;
+  padding: 0 8px;
+  width: calc(33.333% - 16px);
+  box-sizing: content-box;
+
+  .cover {
+    position: relative;
+    border-radius: 2px;
+    overflow: hidden;
+    margin-bottom: 8px;
+    box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.2);
+  }
+
+  .currentText {
+    width: 28px;
+    height: 13px;
+    position: absolute;
+    top: 2px;
+    left: 2px;
+    background: url('../../image/icon-current.png') no-repeat center center;
+    background-size: contain;
+  }
+
+  .model {
+    position: absolute;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    background-color: rgba(0, 0, 0, 0.4);
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    color: #fff;
+    font-size: 12px;
+    line-height: 18px;
+
+    img {
+      width: 12px;
+      height: 12px;
+      margin-right: 4px;
+    }
+  }
+
+  .coverNum {
+    position: absolute;
+    bottom: 12px;
+    left: 50%;
+    transform: translateX(-50%);
+    border-radius: 20px;
+    color: rgba(116, 44, 0, 1);
+    background-color: #fff;
+    padding: 4px 6px;
+    line-height: 1;
+    font-size: 12px;
+    z-index: 1;
+    white-space: nowrap;
+    word-break: break-all;
+    min-width: 50px;
+    text-align: center;
+  }
+
+  .coverImg {
+    width: 100%;
+    background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFoAAABaCAMAAAAPdrEwAAABOFBMVEUAAAC0tLTT09PU1NTt7e3////T09P////T09P////T09P////X19f////U1NTU1NTT09PT09PU1NTU1NTV1dXT09PU1NTU1NTV1dXZ2dn+/v7R0dH////////KysrIyMjT09O0tLTU1NS0tLTU1NS0tLTT09PT09PT09PU1NTU1NTU1NTT09O2trbU1NTV1dXV1dXW1tbV1dXW1tbV1dXJycm4uLj///+0tLT///+0tLT////p6em0tLT4+Pj///+2trb///+1tbX///+0tLT////T09P5+fn+/v63t7e8vLz8/Pzl5eXW1tbBwcH39/fw8PDs7Ozb29v7+/vg4ODOzs65ubny8vLJycnp6enGxsbFxcW+vr62trb09PTY2NjLy8vCwsLn5+fi4uLS0tLu7u7Q0NDd3d02Mu/gAAAARHRSTlMAnPwvBfv07ODdw5AbGezmyrirl5B4aT0kDZyclTwsIPj48+Ta1tPS0LGhiIaEcGJgV05FNhMS7++8vKyslZRzc1ZWJRSpe/cAAALfSURBVFjD7djXcuIwGAVg1pTQAiT0Ekiy6b1v7whsA6b3EGAJu+//BstaiWNiCYGlXGTG55KBDzH6j2xjMmJET5ZdDivQFavDtTxLXlsCFFlam7HmiUxl49ftApRxYWkHLe3A0lZa2oqlAXUMGk/fHG9vpCnSk/pZNJ18m6aOWELRN1CmtbMI+jjNJH0Evc2GlhD0Bhu6h6DTjPIq6Pqonb8XXoCWmjKSHTCnpccp5ges6bHCZAW2dBc8JcOWLqjoPFu6oqLLr2bVQxX9h/GElBWmKDCmxSKAyXWYt1GE677rLtLGejsLcuOCQMI7lVFlsMjxJJUeW3bP+OSTskBJqcuSFppAFT4vsqMrYDrVAitazMHV8kBJs8WGzsPmNoRCFSj5fcuA7vJKvcQ8UJKrCNT0WH0mdEpASbFOSdfhyClvzagGsSzR0D14LHTSSho1/mkQaw39dB9u2vThCU8KQj1JtFiVt+z5ONSLmnoSaeszuia/+lfzAaGS09STQDum6SH/cOXX5rY9Xz0Rj6Sqy0YmjUzrbp56ah6kIT2AH8Pe4M5TT83jP6ThsnALmq+eiD8tlIt/G8POWU8FVNMNuXc8rnH4epJpOHg1jIivJ5mWcvLg4ZqMryeZhnOLm1hyPfF0C95R9PAcvp4jcSYNL7UDHEWuJ56GO46FyPXE0+/+/7Lhgs+ffU093yPoDwCAEcki1/Mjgv4BQFUkSeR6/jQh8gn0SQy5np9NqFi+CgSDWE9rwmJCJ/X9yxt9iSdisVji2y+TESNGXjiW6LU7FYkkzQ9JRiIp93XUoodyX12cBg/9qyvOHbvXxmUw4Wxe+45zZdV/GDy9uHJbZqPhk7jTjrTI4ezO+EkY8wUBW4Y6tgCSPvNxtDLnOzOhEw2HAvt7Hj2oZ28/EApHyRtpvjwPBY/8B5Ot9O1u2b2eTds6x8nr4tZtmx6vfWvXN9nCA/9RMHR+aZ5sohEji+YfnN0/51L6d+cAAAAASUVORK5CYII=');
+    background-repeat: no-repeat;
+    background-position: center;
+    background-size: 50%;
+    border-radius: 2px;
+    overflow: hidden;
+
+    &>img {
+      display: block;
+      width: 100%;
+      height: 95px;
+      opacity: 0;
+      transition: opacity .3s;
+    }
+
+    :global {
+      .van-image__loading {
+        position: relative;
+        height: 95px;
+        animation: van-skeleton-blink var(--van-skeleton-duration) ease-in-out infinite;
+      }
+    }
+
+    &::before {
+      content: '';
+      position: absolute;
+      left: 5px;
+      width: 5px;
+      height: 100%;
+      background: linear-gradient(270deg, rgba(0, 0, 0, 0.25) 0%, rgba(0, 0, 0, 0.03) 100%);
+      box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.2);
+      z-index: 1;
+    }
+  }
+
+  .name {
+    width: 109%;
+    font-size: 12px;
+    font-weight: 600;
+    color: rgba(255,255,255,0.5);
+    line-height: 20px;
+
+    &.active {
+      color: #FFFFFF;
+    }
+  }
+}

src/views/coursewarePlay/component/musicScore.tsx

@@ -50,7 +50,7 @@ export default defineComponent({
     const origin = /(localhost|192)/.test(location.host)
           ? '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 src = `${origin}/gym-music-score/?id=${props.music.content}&hideMode=1&Authorization=${Authorization}&isHideBack=true&isHideMusicList=true&systemType=${ state.platformType === 'TEACHER' ? 'teacher' : 'student'}`
 
     const checkView = () => {
       fetch(src)

src/views/coursewarePlay/component/point.module.less

@@ -1,8 +1,8 @@
 .container {
   display: flex;
   flex-direction: column;
-  min-width: 288px;
-  max-width: 288px;
+  min-width: 300px;
+  max-width: 300px;
   height: 100vh;
   color: #fff;
   font-size: 12px;
@@ -14,12 +14,13 @@
   align-items: center;
   padding: 13px 10px 15px 15px;
   flex-shrink: 0;
-  font-size: 14px;
+  font-size: 16px;
+  font-weight: 500;
 
   img {
-    width: 16px;
-    height: 16px;
-    margin-right: 7px;
+    width: 20px;
+    height: 20px;
+    margin-right: 6px;
   }
 }
 
@@ -127,6 +128,7 @@
   padding: 5px 5px 5px 0;
   border-radius: 6px;
   font-size: 12px;
+  font-weight: 500;
   position: relative;
 
   :global {
@@ -146,7 +148,7 @@
 
 .itemActive {
   background: rgba(0, 255, 224, 0.15);
-  color: var(--van-primary);
+  color: #00FFE8;
 
   :global {
     .van-icon {

src/views/coursewarePlay/component/points.tsx

@@ -65,7 +65,7 @@ export default defineComponent({
       <div class={styles.container}>
         <div class={styles.pointHead}>
           <img src={iconMulv} />
-          课程目录
+          知识点目录
         </div>
         <div class={styles.content}>
           <Collapse

src/views/coursewarePlay/component/tips/index.module.less

@@ -0,0 +1,56 @@
+
+.courseDialog {
+  padding: 20px !important;
+  max-width: 310px !important;
+  min-width: 295px !important;
+  background: url('./top-bg.png') no-repeat top center #fff !important;
+  background-size: contain !important;
+  overflow: hidden;
+
+  .iconClose {
+    width: 18px;
+    height: 19px;
+    position: absolute;
+    top: 23px;
+    right: 20px;
+    z-index: 9;
+    background: url('./icon-close.png') no-repeat center;
+    background-size: contain;
+  }
+
+  .title {
+    position: relative;
+    font-size: 18px;
+    font-weight: 600;
+    color: #1A1A1A;
+    line-height: 25px;
+    text-align: center;
+  }
+
+  .content {
+    padding: 20px 0 25px;
+    font-size: 16px;
+    color: #666666;
+    line-height: 24px;
+    text-align: center;
+  }
+
+  .popupBtnGroup {
+    display: flex;
+    align-items: center;
+
+    &>button {
+      flex: 1;
+      font-weight: 500;
+      font-size: 16px !important;
+
+      &:last-child {
+        margin-left: 15px;
+      }
+    }
+
+    :global {
+      --van-button-default-height: 40px;
+    }
+  }
+}

src/views/coursewarePlay/component/tips/index.tsx

@@ -0,0 +1,37 @@
+import { Button, Popup } from 'vant';
+import { defineComponent, reactive } from 'vue';
+import styles from './index.module.less';
+
+export const tipState = reactive({
+  show: false,
+  title: '温馨提示',
+  content: '退出后将清空批注内容',
+  cancelText: '取消',
+  confirmText: '确认退出'
+})
+
+export default defineComponent({
+  name: 'tips-popup',
+  emits: ['confirm'],
+  setup(props, { emit }) {
+    return () => (
+      <Popup v-model:show={tipState.show} round class={styles.courseDialog}>
+        <i
+          class={styles.iconClose}
+          onClick={() => (tipState.show = false)}></i>
+        <div class={styles.title}>{tipState.title}</div>
+
+        <div class={styles.content}>
+          {tipState.content}
+        </div>
+
+        <div class={styles.popupBtnGroup}>
+          <Button round onClick={() => tipState.show = false}>{tipState.cancelText}</Button>
+          <Button round type="primary" onClick={() => emit("confirm")}>
+            {tipState.confirmText}
+          </Button>
+        </div>
+      </Popup>
+    );
+  }
+});

src/views/coursewarePlay/component/tools/pen.module.less

@@ -4,7 +4,7 @@
     right: 0;
     bottom: 0;
     top: 0;
-    z-index: 11;
+    z-index: 2999;
 }
 .open{
     display: block;

src/views/coursewarePlay/component/tools/pen.tsx

@@ -16,10 +16,19 @@ import {
   nextTick
 } from 'vue';
 import styles from './pen.module.less';
+import Tips, { tipState } from '../tips';
 
 export default defineComponent({
   name: 'tools-pen',
   props: {
+    isWhite: {
+      type: Boolean,
+      default: false
+    },
+    tip: {
+      type: String,
+      default: '请确认是否退出？'
+    },
     show: {
       type: Boolean,
       default: false
@@ -122,6 +131,9 @@ export default defineComponent({
         ]}>
         <iframe
           class={styles.iframe}
+          style={{
+            background: props.isWhite ? '#fff' : 'transparent'
+          }}
           frameborder="0"
           width="100vw"
           height="100vh"
@@ -132,7 +144,10 @@ export default defineComponent({
         {imgs.exported ? (
           <img crossorigin="anonymous" class={styles.img} src={imgs.base64} />
         ) : (
-          <div class={styles.rightItem} onClick={() => props.close()}>
+          <div class={styles.rightItem} onClick={() => {
+            tipState.content = props.tip
+            tipState.show = true
+          }}>
             <svg width="22px" height="20px" viewBox="0 0 22 20">
               <path
                 transform="translate(-1.000000, -2.000000)"
@@ -141,6 +156,8 @@ export default defineComponent({
             </svg>
           </div>
         )}
+
+        <Tips onConfirm={() => props.close()} />
       </div>
     );
   }

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

@@ -25,7 +25,7 @@ import {
 
 import TCPlayer from 'tcplayer.js';
 import 'tcplayer.js/dist/tcplayer.min.css';
-import { Slider } from 'vant';
+import { showToast, Slider } from 'vant';
 import { handleShowVip, state } from '@/state';
 
 // 秒转分
@@ -98,6 +98,22 @@ export default defineComponent({
     });
     const speedBtnId = 'speed' + Date.now() + Math.floor(Math.random() * 100);
 
+    /** 设置播放容器 16:9 */
+    const parentContainer = reactive({
+      width: '100%'
+    });
+    const setContainer = () => {
+      const min = Math.min(screen.width, screen.height);
+      const max = Math.max(screen.width, screen.height);
+      const width = min * (16 / 9);
+      if (width > max) {
+        parentContainer.width = '100%';
+        return;
+      } else {
+        parentContainer.width = width + 'px';
+      }
+    };
+
     // const forms = reactive({
     //   subjectIds: [],
     //   orgainIds: []
@@ -136,8 +152,10 @@ export default defineComponent({
       if (!videoItem.value) return;
       if (data.loop) {
         videoItem.value.loop(false);
+        showToast("已关闭循环播放")
       } else {
         videoItem.value.loop(true);
+        showToast("已打开循环播放")
       }
       data.loop = !data.loop;
     };
@@ -289,6 +307,7 @@ export default defineComponent({
     };
 
     onMounted(() => {
+      setContainer()
       videoItem.value = TCPlayer(videoID, {
         appID: '',
         controls: false,
@@ -319,6 +338,8 @@ export default defineComponent({
       }
     );
 
+    
+
     // 去云练习完整版
     const gotoAccomany = (e: any) => {
       // 去云练习完整版
@@ -343,7 +364,7 @@ export default defineComponent({
     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'}`
+    const src = `${origin}/gym-music-score/?id=${item.value.materialMusicId}&isHideMusicList=true&systemType=${ state.platformType === 'TEACHER' ? 'teacher' : 'student'}`
 
       postMessage({
         api: 'openAccompanyWebView',
@@ -388,15 +409,17 @@ export default defineComponent({
         onClick={() => {
           data.speedControl = false;
         }}>
-        <video
-          style={{ width: '100%', height: '100%' }}
-          src={item.value.content}
-          ref={videoRef}
-          id={videoID}
-          preload="auto"
-          playsinline
-          webkit-playsinline></video>
-        <div class={styles.videoSection}></div>
+        <div style={{ width: parentContainer.width, height: '100%', margin: '0 auto' }}>
+          <video
+            style={{ width: '100%', height: '100%' }}
+            src={item.value.content}
+            ref={videoRef}
+            id={videoID}
+            preload="auto"
+            playsinline
+            webkit-playsinline></video>
+          <div class={styles.videoSection}></div>
+        </div>
 
         <div
           class={[styles.controls, data.showBar ? '' : styles.hide]}
@@ -407,11 +430,11 @@ export default defineComponent({
           //   emit('close')
           // }}
         >
-          <div class={styles.time}>
-            <div>{getSecondRPM(data.currentTime)}</div>/
-            <div>{getSecondRPM(data.duration)}</div>
-          </div>
           <div class={styles.slider}>
+            <div class={styles.time}>
+              <div>{getSecondRPM(data.currentTime)}</div>/
+              <div>{getSecondRPM(data.duration)}</div>
+            </div>
             <Slider
               step={0.01}
               class={styles.timeProgress}
@@ -432,22 +455,24 @@ export default defineComponent({
                 }}>
                 <img src={data.playState === 'pause' ? iconPlay : iconPause} />
               </div>
-              <div class={styles.actionBtn} onClick={toggleLoop}>
+              <div class={[styles.actionBtn, styles.btnLoop]} onClick={toggleLoop}>
                 <img src={data.loop ? iconLoopActive : iconLoop} />
               </div>
               <div class={styles.actionBtn} id={speedBtnId}>
                 <img src={iconSpeed} />
               </div>
             </div>
-            <div class={styles.name}>{item.value.name}</div>
+            {/* <div class={styles.name}>{item.value.name}</div> */}
+
+            {item.value.materialMusicId && (
+              <div
+                class={[styles.goPractice]}
+                onClick={gotoAccomany}></div>
+            )}
           </div>
         </div>
 
-        {item.value.materialMusicId && (
-          <div
-            class={[styles.goPractice, data.showBar ? '' : styles.hide]}
-            onClick={gotoAccomany}></div>
-        )}
+        
 
         <div
           style={{

src/views/coursewarePlay/component/video.module.less

@@ -166,7 +166,6 @@
   left: 0;
   bottom: 0;
   right: 0;
-  height: 80px;
   background: linear-gradient(0deg, rgba(0, 0, 0, 0.5), transparent);
   display: flex;
   flex-direction: column;
@@ -185,12 +184,16 @@
     // width: 100%;
     color: #fff;
     font-size: 14px;
-    padding: 4px 20px;
+    font-weight: 600;
+    padding: 4px 20px 4px 0;
   }
 
   .slider {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
     // width: 100%;
-    padding: 0 16px 0 20px;
+    padding: 0 40px 0;
     --van-slider-button-width: 13px !important;
     --van-slider-button-height: 13px !important;
 
@@ -205,6 +208,9 @@
         width: 100%;
         height: 100%;
       }
+      .van-slider__button {
+        box-shadow: none;
+      }
     }
   }
 
@@ -212,7 +218,7 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
-    padding: 0 16px 8px 15px;
+    padding: 8px 40px 12px 36px;
 
     .name {
       font-size: 14px;
@@ -235,19 +241,20 @@
 
     .actionBtn {
       display: flex;
-      width: 30px;
-      height: 30px;
-      padding: 4px 0;
+      width: 28px;
+      height: 28px;
+      margin-right: 20px;
       background: transparent;
+      box-sizing: content-box;
 
-      &+.actionBtn {
-        // margin-left: 12px;
+      &.btnLoop {
+        width: 33px;
+        height: 28px;
+      }
+      >img {
+        width: 100%;
+        height: 100%;
       }
-    }
-
-    .actionBtn>img {
-      width: 100%;
-      height: 100%;
     }
 
     :global {
@@ -308,7 +315,7 @@
 .sliderPopup {
   position: absolute;
   z-index: 9999;
-  left: 68px;
+  left: 128px;
   bottom: 46px;
   display: flex;
   align-items: center;
@@ -356,19 +363,19 @@
 
   :global {
     .van-slider {
-      margin: 7px 0;
+      margin: 13px 0;
     }
   }
 }
 
 .goPractice {
-  width: 89px;
-  height: 32px;
+  width: 86px;
+  height: 30px;
   background: url('./../image/btn_go_practice.png') no-repeat center;
   background-size: contain;
-  position: absolute;
-  right: 16px;
-  bottom: 60px;
+  // position: absolute;
+  // right: 16px;
+  // bottom: 60px;
   z-index: 11;
   transition: all .5s ease;