浏览代码

修改地址

lex 1 年之前
父节点
当前提交
0a4da7accd
共有 47 个文件被更改,包括 110 次插入26 次删除
  1. 1 0
      dist/assets/index-08ff64e2.js
  2. 1 0
      dist/assets/index-0d121321.js
  3. 5 0
      dist/assets/index-15e15102.js
  4. 4 0
      dist/assets/index-22c1dc5c.js
  5. 1 0
      dist/assets/index-3e086967.js
  6. 1 0
      dist/assets/index-6040cb73.js
  7. 1 0
      dist/assets/index-7aa278c8.js
  8. 0 0
      dist/assets/index-849353eb.js
  9. 1 0
      dist/assets/index-a51c1cfe.js
  10. 1 0
      dist/assets/index-ae1f6f5a.js
  11. 4 0
      dist/assets/index-b6a54401.js
  12. 1 0
      dist/assets/index-b80be51e.js
  13. 1 0
      dist/assets/index-c16627cd.js
  14. 5 0
      dist/assets/index-d0407123.js
  15. 5 0
      dist/assets/index-f09e0b4e.js
  16. 1 0
      dist/assets/index-fd71c37e.js
  17. 4 0
      dist/assets/index-ff497744.js
  18. 1 0
      dist/assets/index-legacy-1c916581.js
  19. 5 0
      dist/assets/index-legacy-1fea35b0.js
  20. 1 0
      dist/assets/index-legacy-3d3d0866.js
  21. 5 0
      dist/assets/index-legacy-42f1c880.js
  22. 4 0
      dist/assets/index-legacy-430c2214.js
  23. 1 0
      dist/assets/index-legacy-46d4ea2e.js
  24. 1 0
      dist/assets/index-legacy-5c6a8c51.js
  25. 0 0
      dist/assets/index-legacy-69c84825.js
  26. 1 0
      dist/assets/index-legacy-9b276c6a.js
  27. 1 0
      dist/assets/index-legacy-a660df29.js
  28. 1 0
      dist/assets/index-legacy-b521633f.js
  29. 0 0
      dist/assets/index-legacy-beeda3bc.js
  30. 1 0
      dist/assets/index-legacy-c6c73f34.js
  31. 1 0
      dist/assets/index-legacy-cdb43d7a.js
  32. 1 0
      dist/assets/index-legacy-deac61ac.js
  33. 1 0
      dist/assets/index-legacy-e23f4c84.js
  34. 4 0
      dist/assets/index-legacy-ec21f20e.js
  35. 1 0
      dist/assets/index-legacy-ee4df3fd.js
  36. 1 0
      dist/assets/login-084142e5.js
  37. 1 0
      dist/assets/login-e0937887.js
  38. 1 0
      dist/assets/login-legacy-92b2dc67.js
  39. 1 0
      dist/assets/login-legacy-d845d157.js
  40. 1 0
      dist/assets/useFee-3e06989c.js
  41. 1 0
      dist/assets/useFee-db3e3beb.js
  42. 1 0
      dist/assets/useFee-legacy-195a715d.js
  43. 1 0
      dist/assets/useFee-legacy-b7da2ed1.js
  44. 8 0
      dist/index.html
  45. 19 19
      src/helpers/validate.ts
  46. 1 1
      src/main.ts
  47. 7 6
      src/views/coursewarePlay/index.tsx

文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index-08ff64e2.js


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index-0d121321.js


+ 5 - 0
dist/assets/index-15e15102.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-ff497744.js
+import{A as t,d as s,c as e,F as i,G as l,S as a,be as r,E as n,H as o}from"./index-3a45ce8e.js";const[d,c]=t("cell-group"),u=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":[c({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":c("title",{inset:t.inset})},[s.title?s.title():t.title]),o()]):o()}}));export{u as C};
+========
+import{A as t,d as s,c as e,F as i,G as l,S as a,be as r,E as n,H as o}from"./index-849353eb.js";const[d,c]=t("cell-group"),u=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":[c({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":c("title",{inset:t.inset})},[s.title?s.title():t.title]),o()]):o()}}));export{u as C};
+>>>>>>>> iteration-tem-http:dist/assets/index-15e15102.js

+ 4 - 0
dist/assets/index-22c1dc5c.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-22c1dc5c.js
 import{A as l,I as e,Z as a,d as i,_ as r,c as t,a3 as n,J as s,G as o,aN as c,aI as u,a1 as d,H as v}from"./index-3a45ce8e.js";const[b,f]=l("cell"),g={tag:n("div"),icon:String,size:String,title:s,value:s,label:s,center:Boolean,isLink:Boolean,border:o,iconPrefix:String,valueClass:c,labelClass:c,titleClass:c,titleStyle:null,arrowDirection:String,required:{type:[Boolean,String],"default":null},clickable:{type:Boolean,"default":null}},p=v(i({name:b,props:e({},g,a),setup(l,{slots:e}){const a=r(),i=()=>{if(e.label||u(l.label))return t("div",{"class":[f("label"),l.labelClass]},[e.label?e.label():l.label])},n=()=>{var a;if(e.title||u(l.title)){const r=null==(a=e.title)?void 0:a.call(e);if(Array.isArray(r)&&0===r.length)return;return t("div",{"class":[f("title"),l.titleClass],style:l.titleStyle},[r||t("span",null,[l.title]),i()])}},s=()=>{const a=e.value||e["default"];if(a||u(l.value))return t("div",{"class":[f("value"),l.valueClass]},[a?a():t("span",null,[l.value])])},o=()=>{if(e["right-icon"])return e["right-icon"]();if(l.isLink){const e=l.arrowDirection&&"right"!==l.arrowDirection?"arrow-".concat(l.arrowDirection):"arrow";return t(d,{name:e,"class":f("right-icon")},null)}};return()=>{var i;const{tag:r,size:c,center:u,border:v,isLink:b,required:g}=l,p=null!=(i=l.clickable)?i:b,C={center:u,required:!!g,clickable:p,borderless:!v};return c&&(C[c]=!!c),t(r,{"class":f(C),role:p?"button":void 0,tabindex:p?0:void 0,onClick:a},{"default":()=>{var a;return[e.icon?e.icon():l.icon?t(d,{name:l.icon,"class":f("left-icon"),classPrefix:l.iconPrefix},null):void 0,n(),s(),o(),null==(a=e.extra)?void 0:a.call(e)]}})}}}));export{p as C,g as c};
+========
+import{A as l,I as e,Z as a,d as i,_ as r,c as t,a3 as n,J as s,G as o,aN as c,aI as u,a1 as d,H as v}from"./index-849353eb.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-tem-http:dist/assets/index-f09e0b4e.js

文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index-3e086967.js


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index-6040cb73.js


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index-7aa278c8.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-849353eb.js


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index-a51c1cfe.js


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index-ae1f6f5a.js


+ 4 - 0
dist/assets/index-b6a54401.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-b6a54401.js
 import{A as o,d as a,y as r,z as e,a as l,X as s,aI as i,x as n,au as t,aw as d,o as u,N as c,c as v,J as g,G as f,a3 as h,U as m,b9 as p,S as w,a1 as y,H as b}from"./index-3a45ce8e.js";const[z,S]=o("image"),x=b(a({name:z,props:{src:String,alt:String,fit:String,position:String,round:Boolean,block:Boolean,width:g,height:g,radius:g,lazyLoad:Boolean,iconSize:g,showError:f,errorIcon:h("photo-fail"),iconPrefix:String,showLoading:f,loadingIcon:h("photo")},emits:["load","error"],setup(o,{emit:a,slots:g}){const f=r(!1),h=r(!0),b=r(),{$Lazyload:z}=e().proxy,x=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 L=o=>{h.value&&(h.value=!1,a("load",o))},I=()=>{const o=new Event("load");Object.defineProperty(o,"target",{value:b.value,enumerable:!0}),L(o)},P=o=>{f.value=!0,h.value=!1,a("error",o)},$=(a,r,e)=>e?e():v(y,{name:a,size:o.iconSize,"class":r,classPrefix:o.iconPrefix},null),j=()=>{if(f.value||!o.src)return;const a={alt:o.alt,"class":S("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:L,onError:P},a),null)},E=({el:o})=>{const a=()=>{o===b.value&&h.value&&I()};b.value?a():c(a)},k=({el:o})=>{o!==b.value||f.value||P()};return z&&t&&(z.$on("loaded",E),z.$on("error",k),d((()=>{z.$off("loaded",E),z.$off("error",k)}))),u((()=>{c((()=>{var a;(null==(a=b.value)?void 0:a.complete)&&!o.lazyLoad&&I()}))})),()=>{var a;return v("div",{"class":S({round:o.round,block:o.block}),style:x.value},[j(),h.value&&o.showLoading?v("div",{"class":S("loading")},[$(o.loadingIcon,S("loading-icon"),g.loading)]):f.value&&o.showError?v("div",{"class":S("error")},[$(o.errorIcon,S("error-icon"),g.error)]):void 0,null==(a=g["default"])?void 0:a.call(g)])}}}));export{x as I};
+========
+import{A as o,d as a,y as r,z as e,a as l,X as s,aI as i,x as n,au as t,aw as d,o as u,N as c,c as v,J as g,G as f,a3 as h,U as m,b9 as p,S as w,a1 as y,H as b}from"./index-849353eb.js";const[z,S]=o("image"),x=b(a({name:z,props:{src:String,alt:String,fit:String,position:String,round:Boolean,block:Boolean,width:g,height:g,radius:g,lazyLoad:Boolean,iconSize:g,showError:f,errorIcon:h("photo-fail"),iconPrefix:String,showLoading:f,loadingIcon:h("photo")},emits:["load","error"],setup(o,{emit:a,slots:g}){const f=r(!1),h=r(!0),b=r(),{$Lazyload:z}=e().proxy,x=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 L=o=>{h.value&&(h.value=!1,a("load",o))},I=()=>{const o=new Event("load");Object.defineProperty(o,"target",{value:b.value,enumerable:!0}),L(o)},P=o=>{f.value=!0,h.value=!1,a("error",o)},$=(a,r,e)=>e?e():v(y,{name:a,size:o.iconSize,"class":r,classPrefix:o.iconPrefix},null),j=()=>{if(f.value||!o.src)return;const a={alt:o.alt,"class":S("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:L,onError:P},a),null)},E=({el:o})=>{const a=()=>{o===b.value&&h.value&&I()};b.value?a():c(a)},k=({el:o})=>{o!==b.value||f.value||P()};return z&&t&&(z.$on("loaded",E),z.$on("error",k),d((()=>{z.$off("loaded",E),z.$off("error",k)}))),u((()=>{c((()=>{var a;(null==(a=b.value)?void 0:a.complete)&&!o.lazyLoad&&I()}))})),()=>{var a;return v("div",{"class":S({round:o.round,block:o.block}),style:x.value},[j(),h.value&&o.showLoading?v("div",{"class":S("loading")},[$(o.loadingIcon,S("loading-icon"),g.loading)]):f.value&&o.showError?v("div",{"class":S("error")},[$(o.errorIcon,S("error-icon"),g.error)]):void 0,null==(a=g["default"])?void 0:a.call(g)])}}}));export{x as I};
+>>>>>>>> iteration-tem-http:dist/assets/index-d0407123.js

文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index-b80be51e.js


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index-c16627cd.js


+ 5 - 0
dist/assets/index-d0407123.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-b6a54401.js
+import{A as o,d as a,y as r,z as e,a as l,X as s,aI as i,x as n,au as t,aw as d,o as u,N as c,c as v,J as g,G as f,a3 as h,U as m,b9 as p,S as w,a1 as y,H as b}from"./index-3a45ce8e.js";const[z,S]=o("image"),x=b(a({name:z,props:{src:String,alt:String,fit:String,position:String,round:Boolean,block:Boolean,width:g,height:g,radius:g,lazyLoad:Boolean,iconSize:g,showError:f,errorIcon:h("photo-fail"),iconPrefix:String,showLoading:f,loadingIcon:h("photo")},emits:["load","error"],setup(o,{emit:a,slots:g}){const f=r(!1),h=r(!0),b=r(),{$Lazyload:z}=e().proxy,x=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 L=o=>{h.value&&(h.value=!1,a("load",o))},I=()=>{const o=new Event("load");Object.defineProperty(o,"target",{value:b.value,enumerable:!0}),L(o)},P=o=>{f.value=!0,h.value=!1,a("error",o)},$=(a,r,e)=>e?e():v(y,{name:a,size:o.iconSize,"class":r,classPrefix:o.iconPrefix},null),j=()=>{if(f.value||!o.src)return;const a={alt:o.alt,"class":S("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:L,onError:P},a),null)},E=({el:o})=>{const a=()=>{o===b.value&&h.value&&I()};b.value?a():c(a)},k=({el:o})=>{o!==b.value||f.value||P()};return z&&t&&(z.$on("loaded",E),z.$on("error",k),d((()=>{z.$off("loaded",E),z.$off("error",k)}))),u((()=>{c((()=>{var a;(null==(a=b.value)?void 0:a.complete)&&!o.lazyLoad&&I()}))})),()=>{var a;return v("div",{"class":S({round:o.round,block:o.block}),style:x.value},[j(),h.value&&o.showLoading?v("div",{"class":S("loading")},[$(o.loadingIcon,S("loading-icon"),g.loading)]):f.value&&o.showError?v("div",{"class":S("error")},[$(o.errorIcon,S("error-icon"),g.error)]):void 0,null==(a=g["default"])?void 0:a.call(g)])}}}));export{x as I};
+========
+import{A as o,d as a,y as r,z as e,a as l,X as s,aI as i,x as n,au as t,aw as d,o as u,N as c,c as v,J as g,G as f,a3 as h,U as m,b9 as p,S as w,a1 as y,H as b}from"./index-849353eb.js";const[z,S]=o("image"),x=b(a({name:z,props:{src:String,alt:String,fit:String,position:String,round:Boolean,block:Boolean,width:g,height:g,radius:g,lazyLoad:Boolean,iconSize:g,showError:f,errorIcon:h("photo-fail"),iconPrefix:String,showLoading:f,loadingIcon:h("photo")},emits:["load","error"],setup(o,{emit:a,slots:g}){const f=r(!1),h=r(!0),b=r(),{$Lazyload:z}=e().proxy,x=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 L=o=>{h.value&&(h.value=!1,a("load",o))},I=()=>{const o=new Event("load");Object.defineProperty(o,"target",{value:b.value,enumerable:!0}),L(o)},P=o=>{f.value=!0,h.value=!1,a("error",o)},$=(a,r,e)=>e?e():v(y,{name:a,size:o.iconSize,"class":r,classPrefix:o.iconPrefix},null),j=()=>{if(f.value||!o.src)return;const a={alt:o.alt,"class":S("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:L,onError:P},a),null)},E=({el:o})=>{const a=()=>{o===b.value&&h.value&&I()};b.value?a():c(a)},k=({el:o})=>{o!==b.value||f.value||P()};return z&&t&&(z.$on("loaded",E),z.$on("error",k),d((()=>{z.$off("loaded",E),z.$off("error",k)}))),u((()=>{c((()=>{var a;(null==(a=b.value)?void 0:a.complete)&&!o.lazyLoad&&I()}))})),()=>{var a;return v("div",{"class":S({round:o.round,block:o.block}),style:x.value},[j(),h.value&&o.showLoading?v("div",{"class":S("loading")},[$(o.loadingIcon,S("loading-icon"),g.loading)]):f.value&&o.showError?v("div",{"class":S("error")},[$(o.errorIcon,S("error-icon"),g.error)]):void 0,null==(a=g["default"])?void 0:a.call(g)])}}}));export{x as I};
+>>>>>>>> iteration-tem-http:dist/assets/index-d0407123.js

+ 5 - 0
dist/assets/index-f09e0b4e.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-22c1dc5c.js
+import{A as l,I as e,Z as a,d as i,_ as r,c as t,a3 as n,J as s,G as o,aN as c,aI as u,a1 as d,H as v}from"./index-3a45ce8e.js";const[b,f]=l("cell"),g={tag:n("div"),icon:String,size:String,title:s,value:s,label:s,center:Boolean,isLink:Boolean,border:o,iconPrefix:String,valueClass:c,labelClass:c,titleClass:c,titleStyle:null,arrowDirection:String,required:{type:[Boolean,String],"default":null},clickable:{type:Boolean,"default":null}},p=v(i({name:b,props:e({},g,a),setup(l,{slots:e}){const a=r(),i=()=>{if(e.label||u(l.label))return t("div",{"class":[f("label"),l.labelClass]},[e.label?e.label():l.label])},n=()=>{var a;if(e.title||u(l.title)){const r=null==(a=e.title)?void 0:a.call(e);if(Array.isArray(r)&&0===r.length)return;return t("div",{"class":[f("title"),l.titleClass],style:l.titleStyle},[r||t("span",null,[l.title]),i()])}},s=()=>{const a=e.value||e["default"];if(a||u(l.value))return t("div",{"class":[f("value"),l.valueClass]},[a?a():t("span",null,[l.value])])},o=()=>{if(e["right-icon"])return e["right-icon"]();if(l.isLink){const e=l.arrowDirection&&"right"!==l.arrowDirection?"arrow-".concat(l.arrowDirection):"arrow";return t(d,{name:e,"class":f("right-icon")},null)}};return()=>{var i;const{tag:r,size:c,center:u,border:v,isLink:b,required:g}=l,p=null!=(i=l.clickable)?i:b,C={center:u,required:!!g,clickable:p,borderless:!v};return c&&(C[c]=!!c),t(r,{"class":f(C),role:p?"button":void 0,tabindex:p?0:void 0,onClick:a},{"default":()=>{var a;return[e.icon?e.icon():l.icon?t(d,{name:l.icon,"class":f("left-icon"),classPrefix:l.iconPrefix},null):void 0,n(),s(),o(),null==(a=e.extra)?void 0:a.call(e)]}})}}}));export{p as C,g as c};
+========
+import{A as l,I as e,Z as a,d as i,_ as r,c as t,a3 as n,J as s,G as o,aN as c,aI as u,a1 as d,H as v}from"./index-849353eb.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-tem-http:dist/assets/index-f09e0b4e.js

文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index-fd71c37e.js


+ 4 - 0
dist/assets/index-ff497744.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-ff497744.js
 import{A as t,d as s,c as e,F as i,G as l,S as a,be as r,E as n,H as o}from"./index-3a45ce8e.js";const[d,c]=t("cell-group"),u=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":[c({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":c("title",{inset:t.inset})},[s.title?s.title():t.title]),o()]):o()}}));export{u as C};
+========
+import{A as t,d as s,c as e,F as i,G as l,S as a,be as r,E as n,H as o}from"./index-849353eb.js";const[d,c]=t("cell-group"),u=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":[c({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":c("title",{inset:t.inset})},[s.title?s.title():t.title]),o()]):o()}}));export{u as C};
+>>>>>>>> iteration-tem-http:dist/assets/index-15e15102.js

文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index-legacy-1c916581.js


+ 5 - 0
dist/assets/index-legacy-1fea35b0.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-ec21f20e.js
+System.register(["./index-legacy-69c84825.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.A,r=e.I,i=e.Z,n=e.d,a=e._,s=e.c,o=e.a3,c=e.J,u=e.G,d=e.aN,v=e.aI,b=e.a1,f=e.H}],execute:function(){const[l,g]=t("cell"),y=e("c",{tag:o("div"),icon:String,size:String,title:c,value:c,label:c,center:Boolean,isLink:Boolean,border:u,iconPrefix:String,valueClass:d,labelClass:d,titleClass:d,titleStyle:null,arrowDirection:String,required:{type:[Boolean,String],"default":null},clickable:{type:Boolean,"default":null}}),C=r({},y,i);var S=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(S))}}}));
+========
+System.register(["./index-legacy-beeda3bc.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.A,r=e.I,i=e.Z,n=e.d,a=e._,s=e.c,o=e.a3,c=e.J,u=e.G,d=e.aN,v=e.aI,b=e.a1,f=e.H}],execute:function(){const[l,g]=t("cell"),y=e("c",{tag:o("div"),icon:String,size:String,title:c,value:c,label:c,center:Boolean,isLink:Boolean,border:u,iconPrefix:String,valueClass:d,labelClass:d,titleClass:d,titleStyle:null,arrowDirection:String,required:{type:[Boolean,String],"default":null},clickable:{type:Boolean,"default":null}}),C=r({},y,i);var S=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(S))}}}));
+>>>>>>>> iteration-tem-http:dist/assets/index-legacy-1fea35b0.js

文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index-legacy-3d3d0866.js


+ 5 - 0
dist/assets/index-legacy-42f1c880.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-430c2214.js
+System.register(["./index-legacy-69c84825.js"],(function(t,e){"use strict";var s,i,r,n,l,c,o,u,a;return{setters:[t=>{s=t.A,i=t.d,r=t.c,n=t.F,l=t.G,c=t.S,o=t.be,u=t.E,a=t.H}],execute:function(){const[e,d]=s("cell-group"),v={title:String,inset:Boolean,border:l};var g=i({name:e,inheritAttrs:!1,props:v,setup(t,{slots:e,attrs:s}){const i=()=>{var i;return r("div",c({"class":[d({inset:t.inset}),{[u]:t.border&&!t.inset}]},s,o()),[null==(i=e["default"])?void 0:i.call(e)])};return()=>t.title||e.title?r(n,null,[r("div",{"class":d("title",{inset:t.inset})},[e.title?e.title():t.title]),i()]):i()}});t("C",a(g))}}}));
+========
+System.register(["./index-legacy-beeda3bc.js"],(function(t,e){"use strict";var s,i,r,n,l,c,o,u,a;return{setters:[t=>{s=t.A,i=t.d,r=t.c,n=t.F,l=t.G,c=t.S,o=t.be,u=t.E,a=t.H}],execute:function(){const[e,d]=s("cell-group"),v={title:String,inset:Boolean,border:l};var g=i({name:e,inheritAttrs:!1,props:v,setup(t,{slots:e,attrs:s}){const i=()=>{var i;return r("div",c({"class":[d({inset:t.inset}),{[u]:t.border&&!t.inset}]},s,o()),[null==(i=e["default"])?void 0:i.call(e)])};return()=>t.title||e.title?r(n,null,[r("div",{"class":d("title",{inset:t.inset})},[e.title?e.title():t.title]),i()]):i()}});t("C",a(g))}}}));
+>>>>>>>> iteration-tem-http:dist/assets/index-legacy-42f1c880.js

+ 4 - 0
dist/assets/index-legacy-430c2214.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-430c2214.js
 System.register(["./index-legacy-69c84825.js"],(function(t,e){"use strict";var s,i,r,n,l,c,o,u,a;return{setters:[t=>{s=t.A,i=t.d,r=t.c,n=t.F,l=t.G,c=t.S,o=t.be,u=t.E,a=t.H}],execute:function(){const[e,d]=s("cell-group"),v={title:String,inset:Boolean,border:l};var g=i({name:e,inheritAttrs:!1,props:v,setup(t,{slots:e,attrs:s}){const i=()=>{var i;return r("div",c({"class":[d({inset:t.inset}),{[u]:t.border&&!t.inset}]},s,o()),[null==(i=e["default"])?void 0:i.call(e)])};return()=>t.title||e.title?r(n,null,[r("div",{"class":d("title",{inset:t.inset})},[e.title?e.title():t.title]),i()]):i()}});t("C",a(g))}}}));
+========
+System.register(["./index-legacy-beeda3bc.js"],(function(t,e){"use strict";var s,i,r,n,l,c,o,u,a;return{setters:[t=>{s=t.A,i=t.d,r=t.c,n=t.F,l=t.G,c=t.S,o=t.be,u=t.E,a=t.H}],execute:function(){const[e,d]=s("cell-group"),v={title:String,inset:Boolean,border:l};var g=i({name:e,inheritAttrs:!1,props:v,setup(t,{slots:e,attrs:s}){const i=()=>{var i;return r("div",c({"class":[d({inset:t.inset}),{[u]:t.border&&!t.inset}]},s,o()),[null==(i=e["default"])?void 0:i.call(e)])};return()=>t.title||e.title?r(n,null,[r("div",{"class":d("title",{inset:t.inset})},[e.title?e.title():t.title]),i()]):i()}});t("C",a(g))}}}));
+>>>>>>>> iteration-tem-http:dist/assets/index-legacy-42f1c880.js

文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index-legacy-46d4ea2e.js


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index-legacy-5c6a8c51.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-legacy-69c84825.js


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index-legacy-9b276c6a.js


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index-legacy-a660df29.js


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index-legacy-b521633f.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-legacy-beeda3bc.js


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index-legacy-c6c73f34.js


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index-legacy-cdb43d7a.js


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index-legacy-deac61ac.js


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index-legacy-e23f4c84.js


+ 4 - 0
dist/assets/index-legacy-ec21f20e.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-legacy-ec21f20e.js
 System.register(["./index-legacy-69c84825.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.A,r=e.I,i=e.Z,n=e.d,a=e._,s=e.c,o=e.a3,c=e.J,u=e.G,d=e.aN,v=e.aI,b=e.a1,f=e.H}],execute:function(){const[l,g]=t("cell"),y=e("c",{tag:o("div"),icon:String,size:String,title:c,value:c,label:c,center:Boolean,isLink:Boolean,border:u,iconPrefix:String,valueClass:d,labelClass:d,titleClass:d,titleStyle:null,arrowDirection:String,required:{type:[Boolean,String],"default":null},clickable:{type:Boolean,"default":null}}),C=r({},y,i);var S=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(S))}}}));
+========
+System.register(["./index-legacy-beeda3bc.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.A,r=e.I,i=e.Z,n=e.d,a=e._,s=e.c,o=e.a3,c=e.J,u=e.G,d=e.aN,v=e.aI,b=e.a1,f=e.H}],execute:function(){const[l,g]=t("cell"),y=e("c",{tag:o("div"),icon:String,size:String,title:c,value:c,label:c,center:Boolean,isLink:Boolean,border:u,iconPrefix:String,valueClass:d,labelClass:d,titleClass:d,titleStyle:null,arrowDirection:String,required:{type:[Boolean,String],"default":null},clickable:{type:Boolean,"default":null}}),C=r({},y,i);var S=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(S))}}}));
+>>>>>>>> iteration-tem-http:dist/assets/index-legacy-1fea35b0.js

文件差异内容过多而无法显示
+ 1 - 0
dist/assets/index-legacy-ee4df3fd.js


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/login-084142e5.js


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/login-e0937887.js


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/login-legacy-92b2dc67.js


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/login-legacy-d845d157.js


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/useFee-3e06989c.js


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/useFee-db3e3beb.js


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/useFee-legacy-195a715d.js


文件差异内容过多而无法显示
+ 1 - 0
dist/assets/useFee-legacy-b7da2ed1.js


+ 8 - 0
dist/index.html

@@ -15,7 +15,11 @@
   <meta name="HandheldFriendly" content="true" />
   <title>管乐迷</title>
   <script src="./flexible.js" charset="UTF-8"></script>
+<<<<<<< HEAD
   <script type="module" crossorigin src="./assets/index-3a45ce8e.js"></script>
+=======
+  <script type="module" crossorigin src="./assets/index-849353eb.js"></script>
+>>>>>>> iteration-tem-http
   <link rel="stylesheet" href="./assets/index-a5076509.css">
   <script type="module">import.meta.url;import("_").catch(()=>1);async function* g(){};if(location.protocol!="file:"){window.__vite_is_modern_browser=true}</script>
   <script type="module">!function(){if(window.__vite_is_modern_browser)return;console.warn("vite: loading legacy chunks, syntax error above and the same error below should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}();</script>
@@ -26,7 +30,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-69c84825.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+  <script nomodule crossorigin id="vite-legacy-entry" data-src="./assets/index-legacy-beeda3bc.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> iteration-tem-http
 </body>
 
 </html>

+ 19 - 19
src/helpers/validate.ts

@@ -1,22 +1,22 @@
-// 学员地址
-export function vaildStudentUrl() {
-  const url = window.location.href;
-  let returnUrl = '';
-  if (/online/.test(url)) {
-    //线上
-    returnUrl = 'https://mstuonline.dayaedu.com';
-  } else if (/dev/.test(url)) {
-    // dev 环境
-    returnUrl = 'http://mstudev.dayaedu.com';
-  } else if (/test/.test(url)) {
-    // dev 环境
-    returnUrl = 'http://mstutest.dayaedu.com';
-  } else {
-    // 默认dev环境
-    returnUrl = 'http://mstudev.dayaedu.com';
-  }
-  return returnUrl;
-}
+// // 学员地址
+// export function vaildStudentUrl() {
+//   const url = window.location.hostname;
+//   let returnUrl = '';
+//   if (/online/.test(url)) {
+//     //线上
+//     returnUrl = 'https://gym.lexiaoya.cn/mdaya/';
+//   } else if (/dev.gym/.test(url)) {
+//     // dev 环境
+//     returnUrl = 'https://dev.gym.lexiaoya.cn/mdaya/';
+//   } else if (/test.gym/.test(url)) {
+//     // dev 环境
+//     returnUrl = 'https://test.gym.lexiaoya.cn/mdaya/';
+//   } else {
+//     // 默认dev环境
+//     returnUrl = 'https://dev.gym.lexiaoya.cn/mdaya/';
+//   }
+//   return returnUrl;
+// }
 
 export function checkPhone(phone: string) {
   const phoneRule = /^((13[0-9])|(14(0|[5-7]|9))|(15([0-3]|[5-9]))|(16(2|[5-7]))|(17[0-8])|(18[0-9])|(19([0-3]|[5-9])))\d{8}$/;

+ 1 - 1
src/main.ts

@@ -34,7 +34,7 @@ postMessage({ api: 'getNavHeight' }, (res: any) => {
 
 const url = window.location.href;
 const urlIsTeacher =
-  /mteaonline.dayaedu.com/.test(url) || /mteatest.dayaedu.com/.test(url)
+  /mteaonline.dayaedu.com/.test(url) || /mteatest.dayaedu.com/.test(url) || /gym.lexiaoya.cn\/lessonPlayTeacher/.test(url) || /test.gym.lexiaoya.cn\/lessonPlayTeacher/.test(url)
     ? true
     : false;
 // const paymentType = (window as any).paymentType; // 浏览器设置

+ 7 - 6
src/views/coursewarePlay/index.tsx

@@ -234,12 +234,13 @@ export default defineComponent({
 
       // console.log(list, 'list')
 
-      let _firstIndex = list.findIndex(
-        (n: any) =>
-          n.knowledgePointMaterialRelationId == route.query.kId ||
-          n.materialId == route.query.kId
-      );
-      _firstIndex = _firstIndex > -1 ? _firstIndex : 0;
+      const _firstIndex = 0;
+      // list.findIndex(
+      //   (n: any) =>
+      //     n.knowledgePointMaterialRelationId == route.query.kId ||
+      //     n.materialId == route.query.kId
+      // );
+      // _firstIndex = _firstIndex > -1 ? _firstIndex : 0;
       const item = list[_firstIndex];
 
       // console.log(_firstIndex, '_firstIndex', route.query.kId, 'route.query.kId', item)

部分文件因为文件数量过多而无法显示