修改

dist/assets/deep-clone-4d7acb28.js

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

dist/assets/index-079ac1de.js

@@ -0,0 +1 @@
+import{t,d as s,a as e,F as i,C as l,D as a,bn as n,af as r,x as o}from"./index-610f082f.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}),{[r]:t.border&&!t.inset}]},l,n()),[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-0f6c3945.js

@@ -0,0 +1 @@
+import{t as l,a2 as e,al as a,d as i,aW as r,a as t,z as n,w as s,C as o,am as c,ae as u,R as d,x as v}from"./index-610f082f.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};

dist/assets/index-2534f557.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-2534f557.js
 import{d as a,a as s}from"./index-41325bbb.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-610f082f.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-20241028-member:dist/assets/index-cac64223.js

dist/assets/index-2fa510e0.js

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

dist/assets/index-49a81ce5.js

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

dist/assets/index-660aa124.js

@@ -0,0 +1 @@
+import{O as s}from"./index-8a0dc5d5.js";import{d as i,a as t,O as e,m as a}from"./index-610f082f.js";import{I as o}from"./index-2fa510e0.js";import"./index-49a81ce5.js";import"./index-fbb5c47d.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};

dist/assets/index-8a0dc5d5.js

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

dist/assets/index-cac64223.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-2534f557.js
+import{d as a,a as s}from"./index-41325bbb.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-610f082f.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-20241028-member:dist/assets/index-cac64223.js

dist/assets/index-fbb5c47d.js

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

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

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-3f26b483.js
+System.register(["./index-legacy-deb6a2b4.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-7adbd613.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-20241028-member:dist/assets/index-legacy-2c7d9a2f.js

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

@@ -0,0 +1 @@
+System.register(["./index-legacy-7adbd613.js"],(function(t,e){"use strict";var s,i,n,r,l,a,o,u,c;return{setters:[t=>{s=t.t,i=t.d,n=t.a,r=t.F,l=t.C,a=t.D,o=t.bn,u=t.af,c=t.x}],execute:function(){const[e,d]=s("cell-group"),v={title:String,inset:Boolean,border:l};var f=i({name:e,inheritAttrs:!1,props:v,setup(t,{slots:e,attrs:s}){const i=()=>{var i;return n("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?n(r,null,[n("div",{"class":d("title",{inset:t.inset})},[e.title?e.title():t.title]),i()]):i()}});t("C",c(f))}}}));

dist/assets/index-legacy-3f26b483.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-3f26b483.js
 System.register(["./index-legacy-deb6a2b4.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-7adbd613.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-20241028-member:dist/assets/index-legacy-2c7d9a2f.js

dist/assets/index-legacy-7798198f.js

@@ -0,0 +1 @@
+System.register(["./index-legacy-7adbd613.js"],(function(e,l){"use strict";var t,r,i,a,n,s,o,c,u,d,v,b,f;return{setters:[e=>{t=e.t,r=e.a2,i=e.al,a=e.d,n=e.aW,s=e.a,o=e.z,c=e.w,u=e.C,d=e.am,v=e.ae,b=e.R,f=e.x}],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 x=a({name:l,props:C,setup(e,{slots:l}){const t=n(),r=()=>{if(l.label||v(e.label))return s("div",{"class":[g("label"),e.labelClass]},[l.label?l.label():e.label])},i=()=>{var t;if(l.title||v(e.title)){const i=null==(t=l.title)?void 0:t.call(l);if(Array.isArray(i)&&0===i.length)return;return s("div",{"class":[g("title"),e.titleClass],style:e.titleStyle},[i||s("span",null,[e.title]),r()])}},a=()=>{const t=l.value||l["default"];if(t||v(e.value))return s("div",{"class":[g("value"),e.valueClass]},[t?t():s("span",null,[e.value])])},o=()=>{if(l["right-icon"])return l["right-icon"]();if(e.isLink){const l=e.arrowDirection&&"right"!==e.arrowDirection?`arrow-${e.arrowDirection}`:"arrow";return s(b,{name:l,"class":g("right-icon")},null)}};return()=>{var r;const{tag:n,size:c,center:u,border:d,isLink:v,required:f}=e,y=null!=(r=e.clickable)?r:v,C={center:u,required:!!f,clickable:y,borderless:!d};return c&&(C[c]=!!c),s(n,{"class":g(C),role:y?"button":void 0,tabindex:y?0:void 0,onClick:t},{"default":()=>{var t;return[l.icon?l.icon():e.icon?s(b,{name:e.icon,"class":g("left-icon"),classPrefix:e.iconPrefix},null):void 0,i(),a(),o(),null==(t=l.extra)?void 0:t.call(l)]}})}}});e("C",f(x))}}}));

dist/assets/index-legacy-f4406496.js

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

dist/assets/use-tab-status-3d782c9b.js

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

dist/assets/use-tab-status-legacy-973b34b3.js

@@ -0,0 +1 @@
+System.register(["./index-legacy-7adbd613.js"],(function(e,t){"use strict";var n;return{setters:[e=>{n=e.aN}],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-41325bbb.js"></script>
   <link rel="stylesheet" href="./assets/index-9a796eeb.css">
+=======
+  <script type="module" crossorigin src="./assets/index-610f082f.js"></script>
+  <link rel="stylesheet" href="./assets/index-a5076509.css">
+>>>>>>> iteration-20241028-member
   <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-deb6a2b4.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-7adbd613.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-20241028-member
 </body>
 
 </html>

src/components/globalTools/index.tsx

@@ -5,7 +5,7 @@ import {
   isPlay,
   isHidden
 } from './globalTools';
-import { defineComponent, onMounted, onUnmounted, ref, watch } from 'vue';
+import { defineComponent, onMounted, onUnmounted, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import styles from './index.module.less';
 import iconTool from './images/icon-tool.png';
@@ -14,10 +14,13 @@ 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';
+import { useNetwork } from '@vueuse/core';
+import { showToast } from 'vant';
 
 export default defineComponent({
   name: 'globalTools',
   setup() {
+    const { isOnline } = useNetwork()
     const isMask = ref(false); // 是否显示遮罩层，为了处理云教练里面拖动不了的问题
     const route = useRoute();
     // watch(
@@ -37,6 +40,10 @@ export default defineComponent({
 
     function openType(type: 'note' | 'whiteboard') {
       if (isLock) return;
+      if(!isOnline.value) {
+        showToast('网络异常')
+        return
+      }
       if (type === 'note') {
         penShow.value = true;
 

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

@@ -56,6 +56,7 @@
     padding: 0 20px;
     margin-bottom: 16px;
     font-size: 14px;
+    line-height: 1.6;
 
     &::-webkit-scrollbar {
       display: none;

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

@@ -23,7 +23,7 @@
 }
 .rightItem{
     position: absolute;
-    right: 15Px;
+    right: 8Px;
     bottom: 0;
     bottom: constant(safe-area-inset-bottom);
     bottom: env(safe-area-inset-bottom);

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

@@ -173,6 +173,7 @@
   transition: all 0.5s;
   width: 100%;
   z-index: 9;
+  padding-top: 10px;
 
   &.hide {
     transform: translateY(100%);
@@ -318,7 +319,7 @@
 .sliderPopup {
   position: absolute;
   z-index: 9999;
-  left: 128px;
+  left: 119px;
   bottom: 46px;
   display: flex;
   align-items: center;

src/views/coursewarePlay/index.tsx

@@ -45,7 +45,7 @@ import { isHidden, isPlay, penShow, toolOpen, whitePenShow } from '@/components/
 export default defineComponent({
   name: 'CoursewarePlay',
   setup() {
-    const { isSupported, isOnline } = useNetwork()
+    const { isOnline } = useNetwork()
     const pageVisibility = usePageVisibility();
     /** 页面显示和隐藏 */
     watch(
@@ -294,7 +294,9 @@ export default defineComponent({
             hideLoading: true
           }
         );
-        data.detail = res.data;
+        const result = res.data || {}
+        result.lessonTargetDesc = result.lessonTargetDesc ? result.lessonTargetDesc.replace(/\n/g, "<br />") : ""
+        data.detail = result;
         if (res?.data?.lockFlag) {
           postMessage({
             api: 'courseLoading',
@@ -843,6 +845,7 @@ export default defineComponent({
       () => [whitePenShow.value, penShow.value],
       () => {
         if (whitePenShow.value || penShow.value) {
+          clearTimeout(activeData.timer);
           handleStop()
         }
       }
@@ -992,7 +995,6 @@ export default defineComponent({
                 }}
                 onPause={() => {
                   clearTimeout(activeData.timer);
-                  activeData.model = true;
                   videoIntervalRef.pause();
                 }}
                 onEnded={async () => {
@@ -1210,17 +1212,18 @@ export default defineComponent({
               if(data.currentId === item.id) {
                 return
               }
-              data.currentId = item.id;
               const n = await getDetail("", item.id);
               const s = await getRefLevel(item.id);
+              
               if(n && s) {
+                data.currentId = item.id;
                 popupData.coursewareOpen = false;
                 popupData.activeIndex = 0;
                 nextTick(() => {
                   popupData.open = true
                 })
               } else {
-                if(isSupported.value && !isOnline.value) {
+                if(!isOnline.value) {
                   showToast('网络异常')
                 }
               }
@@ -1238,7 +1241,7 @@ export default defineComponent({
         </Popup>
 
         <Popup
-          class={[styles.popup, styles.popupCoursewarePlay, styles.popupPoint]}
+          class={[styles.popup, styles.popupPoint]}
           round
           style={{ background: 'transparent !important' }}
           v-model:show={popupData.pointOpen}

src/views/exercise-after-class/index.tsx

@@ -115,15 +115,8 @@ export default defineComponent({
             }
           }
         );
-        // data.expireTimeFlag = res.data?.expireTimeFlag || false;
         if (Array.isArray(res?.data)) {
           const trainings = res?.data || [];
-          //   const tempLessonTraining: any = [];
-          //   trainings.forEach((item: any) => {
-          //     tempLessonTraining.push(
-          //       ...(item.studentLessonTrainingDetails || [])
-          //     );
-          //   });
           // 没有播放完
           trainings.forEach((item: any) => {
             if (item.times > item.trainingTimes) {
@@ -143,9 +136,6 @@ export default defineComponent({
     const setRecord = async (trainings: any[], materialId?: any) => {
       if (Array.isArray(trainings)) {
         data.trainings = trainings.map((n: any) => {
-          // const materialRefs = n.materialRefs ? n.materialRefs : [];
-          // const materialMusicId =
-          //   materialRefs.length > 0 ? materialRefs[0].resourceId : null;
           return {
             ...n,
             // materialMusicId,
@@ -155,13 +145,13 @@ export default defineComponent({
             loop: false,
             videoEle: null,
             timer: null,
-            muted: n.useStatus === "LOCK" ? false : true, // 静音
-            // muted: true,
-            autoplay: n.useStatus === "LOCK" ? true : false //自动播放
+            muted: n.useStatus === "UNLOCK" ? false : true, // 静音
+            autoplay: n.useStatus === "UNLOCK" ? true : false //自动播放
           };
         });
+        
         data.itemList = data.trainings.filter(
-          (n: any) => n.id == materialId || route.query.materialId
+          (n: any) => n.id == (materialId || route.query.materialId)
         );
         data.videoData = data.itemList[0];
         if (data.disableScreenRecordingFlag === '1') {

src/views/exercise-after-class/video-class.tsx

@@ -177,7 +177,7 @@ export default defineComponent({
             playsinline="false"
             preload="auto"
             class="player"
-            poster={iconVideobg}
+            // poster={iconVideobg}
             data-vid={item.value.id}
             src={item.value.content}
             // loop={item.value.loop}

vite.config.ts

@@ -14,7 +14,7 @@ function resolve(dir: string) {
 }
 // https://vitejs.dev/config/
 // https://github.com/vitejs/vite/issues/1930 .env
-const proxyUrl = 'https://dev.gym.lexiaoya.cn';
+const proxyUrl = 'https://test.gym.lexiaoya.cn';
 export default defineConfig({
   base: './',
   plugins: [