Browse Source

合并更新

lex 1 year ago
parent
commit
b5e6c2e89a
100 changed files with 110 additions and 33 deletions
  1. 4 0
      dist/assets/Checker-59a4d8fb.js
  2. 4 0
      dist/assets/Checker-legacy-2b9b0a68.js
  3. 1 0
      dist/assets/Image-03916501.js
  4. 1 0
      dist/assets/Image-legacy-ef9c4459.js
  5. 1 0
      dist/assets/address-operation-9da81a3a.js
  6. 1 0
      dist/assets/address-operation-legacy-852460d1.js
  7. 4 0
      dist/assets/api-4bf59dee.js
  8. 4 0
      dist/assets/api-530dbdfe.js
  9. 1 1
      dist/assets/api-eee3f4a4.js
  10. 4 0
      dist/assets/api-legacy-1265a2fb.js
  11. 1 1
      dist/assets/api-legacy-30e4f6b1.js
  12. 4 0
      dist/assets/api-legacy-78b715e1.js
  13. 0 0
      dist/assets/back-249c7158.svg
  14. 1 0
      dist/assets/baseIndex-57d2631a.js
  15. 0 0
      dist/assets/baseIndex-fb222763.css
  16. 1 0
      dist/assets/baseIndex-legacy-fcb0c87b.js
  17. 0 0
      dist/assets/chapter-default-arrow-339bcb73.svg
  18. 0 0
      dist/assets/chapter-down-arrow-8e77ebfb.svg
  19. 0 0
      dist/assets/chapter-video-cdcb47b9.svg
  20. 4 0
      dist/assets/detail-fe921c1f.js
  21. 4 0
      dist/assets/detail-legacy-79c0f6fe.js
  22. 1 0
      dist/assets/exercis-detail-7b42fca7.js
  23. 1 0
      dist/assets/exercis-detail-legacy-b650308a.js
  24. 1 0
      dist/assets/guide-f5f0abc5.js
  25. 1 0
      dist/assets/guide-legacy-4087bf91.js
  26. 4 0
      dist/assets/howler-739b921f.js
  27. 4 0
      dist/assets/howler-legacy-8f3d7126.js
  28. 0 0
      dist/assets/icon-9-3c684c12.js
  29. 1 0
      dist/assets/icon-9-legacy-e774af01.js
  30. 0 0
      dist/assets/icon-change-22c20f9c.svg
  31. 0 0
      dist/assets/icon-down-e4497e2d.svg
  32. 0 0
      dist/assets/icon-image-84be0190.svg
  33. 0 0
      dist/assets/icon-image-active-562ca69e.svg
  34. 0 14
      dist/assets/icon-loop-50586604.svg
  35. 0 15
      dist/assets/icon-loop-active-894621ab.svg
  36. 0 0
      dist/assets/icon-menu-chapter-99a82c09.svg
  37. 0 0
      dist/assets/icon-menu-da91160c.svg
  38. 0 0
      dist/assets/icon-mulv-c192bcd6.svg
  39. 0 0
      dist/assets/icon-pause-7c9eee52.svg
  40. 0 0
      dist/assets/icon-play-e9875d7d.svg
  41. 0 0
      dist/assets/icon-search-1762116d.svg
  42. 0 0
      dist/assets/icon-song-3148e728.svg
  43. 0 0
      dist/assets/icon-song-active-44d556ae.svg
  44. 0 0
      dist/assets/icon-start-79121c66.svg
  45. 0 0
      dist/assets/icon-up-19f22308.svg
  46. 0 0
      dist/assets/icon-video-004a5067.svg
  47. 0 0
      dist/assets/icon-video-active-eaed6594.svg
  48. 1 0
      dist/assets/icon_back-0f8fa846.js
  49. 0 0
      dist/assets/icon_back-5e4a9810.svg
  50. 0 1
      dist/assets/icon_back-6f7c496c.js
  51. 1 1
      dist/assets/icon_back-legacy-fc4602e2.js
  52. BIN
      dist/assets/icon_bg-8e6656ee.png
  53. BIN
      dist/assets/icon_bg-e6ef420c.png
  54. 0 0
      dist/assets/icon_close-7cbd75e8.svg
  55. 0 0
      dist/assets/icon_default-486fe3d3.svg
  56. 0 0
      dist/assets/icon_down-dbb42185.svg
  57. 0 0
      dist/assets/icon_hot-0c8bef2b.svg
  58. 0 0
      dist/assets/icon_jianpuActive-1d89770a.svg
  59. 0 0
      dist/assets/icon_order-6c4dbe83.svg
  60. 0 0
      dist/assets/icon_refunding-47c3a880.svg
  61. 0 0
      dist/assets/icon_success-ddfa806c.svg
  62. BIN
      dist/assets/icon_title-f0bb26d9.png
  63. 0 0
      dist/assets/icon_tradeing-f589a525.svg
  64. 4 0
      dist/assets/index-00aa7b6e.js
  65. 0 0
      dist/assets/index-0291b85e.css
  66. 1 0
      dist/assets/index-05a53229.js
  67. 0 0
      dist/assets/index-069dd57e.css
  68. 4 0
      dist/assets/index-09e10f8a.js
  69. 0 0
      dist/assets/index-0f62613a.css
  70. 1 0
      dist/assets/index-12e9e4e4.js
  71. 4 0
      dist/assets/index-1546f2f7.js
  72. 0 0
      dist/assets/index-17be8058.js
  73. 1 0
      dist/assets/index-1d224bb3.js
  74. 1 0
      dist/assets/index-1f47153c.js
  75. 1 0
      dist/assets/index-1f649a3e.js
  76. 1 0
      dist/assets/index-22bed470.js
  77. 0 0
      dist/assets/index-25a415ce.css
  78. 4 0
      dist/assets/index-27d94e28.js
  79. 1 0
      dist/assets/index-291cdf48.js
  80. 1 0
      dist/assets/index-2a04d291.js
  81. 0 0
      dist/assets/index-2b482806.css
  82. 1 0
      dist/assets/index-2bbbe5a7.js
  83. 0 0
      dist/assets/index-2bff8e0a.js
  84. 4 0
      dist/assets/index-31dbe0c6.js
  85. 4 0
      dist/assets/index-31eda692.js
  86. 4 0
      dist/assets/index-3326b4d7.js
  87. 0 0
      dist/assets/index-3505fc03.css
  88. 1 0
      dist/assets/index-3556fcde.js
  89. 0 0
      dist/assets/index-36b42407.js
  90. 0 0
      dist/assets/index-3a4f63ac.js
  91. 1 0
      dist/assets/index-3c42cd67.js
  92. 1 0
      dist/assets/index-3c485ae4.js
  93. 4 0
      dist/assets/index-3d76eec6.js
  94. 1 0
      dist/assets/index-3dd0dc40.js
  95. 4 0
      dist/assets/index-3dec1df0.js
  96. 4 0
      dist/assets/index-3f28b475.js
  97. 1 0
      dist/assets/index-407a8095.js
  98. 0 0
      dist/assets/index-407bfd9c.js
  99. 0 0
      dist/assets/index-42c0cdbc.css
  100. 1 0
      dist/assets/index-43536e92.js

+ 4 - 0
dist/assets/Checker-a5b65281.js → dist/assets/Checker-59a4d8fb.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD:dist/assets/Checker-a5b65281.js
 <<<<<<< HEAD:dist/assets/Checker-9c3dd2b3.js
 <<<<<<< HEAD:dist/assets/Checker-7a96fa3f.js
 <<<<<<<< HEAD:dist/assets/Checker-445022d2.js
@@ -11,3 +12,6 @@ import{ab as m,m as g,n as C,d as P,ai as S,b9 as x,t as z,r as y,e as r,a as d,
 =======
 import{ab as m,m as g,n as C,d as P,ai as S,b9 as x,t as z,r as y,e as r,a as d,I as B,o as D}from"./index-434359ae.js";const G={name:m,shape:g("round"),disabled:Boolean,iconSize:C,modelValue:m,checkedColor:String,labelPosition:String,labelDisabled:Boolean};var V=P({props:S({},G,{bem:x(Function),role:String,parent:Object,checked:Boolean,bindGroup:z}),emits:["click","toggle"],setup(e,{emit:s,slots:t}){const u=y(),o=n=>{if(e.parent&&e.bindGroup)return e.parent.props[n]},c=r(()=>{if(e.parent&&e.bindGroup){const n=o("disabled")||e.disabled;if(e.role==="checkbox"){const l=o("modelValue").length,a=o("max"),i=a&&l>=+a;return n||i&&!e.checked}return n}return e.disabled}),h=r(()=>o("direction")),f=r(()=>{const n=e.checkedColor||o("checkedColor");if(n&&e.checked&&!c.value)return{borderColor:n,backgroundColor:n}}),v=n=>{const{target:l}=n,a=u.value,i=a===l||(a==null?void 0:a.contains(l));!c.value&&(i||!e.labelDisabled)&&s("toggle"),s("click",n)},b=()=>{const{bem:n,shape:l,checked:a}=e,i=e.iconSize||o("iconSize");return d("div",{ref:u,class:n("icon",[l,{disabled:c.value,checked:a}]),style:{fontSize:D(i)}},[t.icon?t.icon({checked:a,disabled:c.value}):d(B,{name:"success",style:f.value},null)])},k=()=>{if(t.default)return d("span",{class:e.bem("label",[e.labelPosition,{disabled:c.value}])},[t.default()])};return()=>{const n=e.labelPosition==="left"?[k(),b()]:[b(),k()];return d("div",{role:e.role,class:e.bem([{disabled:c.value,"label-disabled":e.labelDisabled},h.value]),tabindex:c.value?void 0:0,"aria-checked":e.checked,onClick:v},[n])}}});export{G as c,V as s};
 >>>>>>> iteration-20240516-member:dist/assets/Checker-a5b65281.js
+=======
+import{ab as m,m as g,n as C,d as P,ai as S,b9 as x,t as z,r as y,e as r,a as d,I as B,o as D}from"./index-5d38e327.js";const G={name:m,shape:g("round"),disabled:Boolean,iconSize:C,modelValue:m,checkedColor:String,labelPosition:String,labelDisabled:Boolean};var V=P({props:S({},G,{bem:x(Function),role:String,parent:Object,checked:Boolean,bindGroup:z}),emits:["click","toggle"],setup(e,{emit:s,slots:t}){const u=y(),o=n=>{if(e.parent&&e.bindGroup)return e.parent.props[n]},c=r(()=>{if(e.parent&&e.bindGroup){const n=o("disabled")||e.disabled;if(e.role==="checkbox"){const l=o("modelValue").length,a=o("max"),i=a&&l>=+a;return n||i&&!e.checked}return n}return e.disabled}),h=r(()=>o("direction")),f=r(()=>{const n=e.checkedColor||o("checkedColor");if(n&&e.checked&&!c.value)return{borderColor:n,backgroundColor:n}}),v=n=>{const{target:l}=n,a=u.value,i=a===l||(a==null?void 0:a.contains(l));!c.value&&(i||!e.labelDisabled)&&s("toggle"),s("click",n)},b=()=>{const{bem:n,shape:l,checked:a}=e,i=e.iconSize||o("iconSize");return d("div",{ref:u,class:n("icon",[l,{disabled:c.value,checked:a}]),style:{fontSize:D(i)}},[t.icon?t.icon({checked:a,disabled:c.value}):d(B,{name:"success",style:f.value},null)])},k=()=>{if(t.default)return d("span",{class:e.bem("label",[e.labelPosition,{disabled:c.value}])},[t.default()])};return()=>{const n=e.labelPosition==="left"?[k(),b()]:[b(),k()];return d("div",{role:e.role,class:e.bem([{disabled:c.value,"label-disabled":e.labelDisabled},h.value]),tabindex:c.value?void 0:0,"aria-checked":e.checked,onClick:v},[n])}}});export{G as c,V as s};
+>>>>>>> online:dist/assets/Checker-59a4d8fb.js

+ 4 - 0
dist/assets/Checker-legacy-1d9abb22.js → dist/assets/Checker-legacy-2b9b0a68.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD:dist/assets/Checker-legacy-1d9abb22.js
 <<<<<<< HEAD:dist/assets/Checker-legacy-713302ad.js
 <<<<<<< HEAD:dist/assets/Checker-legacy-bed2a94d.js
 <<<<<<<< HEAD:dist/assets/Checker-legacy-ffb0a6ce.js
@@ -11,3 +12,6 @@ System.register(["./index-legacy-36a658ea.js"],(function(e,l){"use strict";var o
 =======
 System.register(["./index-legacy-a4c4a61f.js"],(function(e,l){"use strict";var o,n,a,i,c,t,r,s,d,u,b,k;return{setters:[e=>{o=e.ab,n=e.m,a=e.n,i=e.d,c=e.ai,t=e.b9,r=e.t,s=e.r,d=e.e,u=e.a,b=e.I,k=e.o}],execute:function(){const l=e("c",{name:o,shape:n("round"),disabled:Boolean,iconSize:a,modelValue:o,checkedColor:String,labelPosition:String,labelDisabled:Boolean});e("s",i({props:c({},l,{bem:t(Function),role:String,parent:Object,checked:Boolean,bindGroup:r}),emits:["click","toggle"],setup(e,{emit:l,slots:o}){const n=s(),a=l=>{if(e.parent&&e.bindGroup)return e.parent.props[l]},i=d((()=>{if(e.parent&&e.bindGroup){const l=a("disabled")||e.disabled;if("checkbox"===e.role){const o=a("modelValue").length,n=a("max");return l||n&&o>=+n&&!e.checked}return l}return e.disabled})),c=d((()=>a("direction"))),t=d((()=>{const l=e.checkedColor||a("checkedColor");if(l&&e.checked&&!i.value)return{borderColor:l,backgroundColor:l}})),r=o=>{const{target:a}=o,c=n.value,t=c===a||(null==c?void 0:c.contains(a));i.value||!t&&e.labelDisabled||l("toggle"),l("click",o)},h=()=>{const{bem:l,shape:c,checked:r}=e,s=e.iconSize||a("iconSize");return u("div",{ref:n,class:l("icon",[c,{disabled:i.value,checked:r}]),style:{fontSize:k(s)}},[o.icon?o.icon({checked:r,disabled:i.value}):u(b,{name:"success",style:t.value},null)])},p=()=>{if(o.default)return u("span",{class:e.bem("label",[e.labelPosition,{disabled:i.value}])},[o.default()])};return()=>{const l="left"===e.labelPosition?[p(),h()]:[h(),p()];return u("div",{role:e.role,class:e.bem([{disabled:i.value,"label-disabled":e.labelDisabled},c.value]),tabindex:i.value?void 0:0,"aria-checked":e.checked,onClick:r},[l])}}}))}}}));
 >>>>>>> iteration-20240516-member:dist/assets/Checker-legacy-1d9abb22.js
+=======
+System.register(["./index-legacy-eadeea60.js"],(function(e,l){"use strict";var o,n,a,i,c,t,r,s,d,u,b,k;return{setters:[e=>{o=e.ab,n=e.m,a=e.n,i=e.d,c=e.ai,t=e.b9,r=e.t,s=e.r,d=e.e,u=e.a,b=e.I,k=e.o}],execute:function(){const l=e("c",{name:o,shape:n("round"),disabled:Boolean,iconSize:a,modelValue:o,checkedColor:String,labelPosition:String,labelDisabled:Boolean});e("s",i({props:c({},l,{bem:t(Function),role:String,parent:Object,checked:Boolean,bindGroup:r}),emits:["click","toggle"],setup(e,{emit:l,slots:o}){const n=s(),a=l=>{if(e.parent&&e.bindGroup)return e.parent.props[l]},i=d((()=>{if(e.parent&&e.bindGroup){const l=a("disabled")||e.disabled;if("checkbox"===e.role){const o=a("modelValue").length,n=a("max");return l||n&&o>=+n&&!e.checked}return l}return e.disabled})),c=d((()=>a("direction"))),t=d((()=>{const l=e.checkedColor||a("checkedColor");if(l&&e.checked&&!i.value)return{borderColor:l,backgroundColor:l}})),r=o=>{const{target:a}=o,c=n.value,t=c===a||(null==c?void 0:c.contains(a));i.value||!t&&e.labelDisabled||l("toggle"),l("click",o)},h=()=>{const{bem:l,shape:c,checked:r}=e,s=e.iconSize||a("iconSize");return u("div",{ref:n,class:l("icon",[c,{disabled:i.value,checked:r}]),style:{fontSize:k(s)}},[o.icon?o.icon({checked:r,disabled:i.value}):u(b,{name:"success",style:t.value},null)])},p=()=>{if(o.default)return u("span",{class:e.bem("label",[e.labelPosition,{disabled:i.value}])},[o.default()])};return()=>{const l="left"===e.labelPosition?[p(),h()]:[h(),p()];return u("div",{role:e.role,class:e.bem([{disabled:i.value,"label-disabled":e.labelDisabled},c.value]),tabindex:i.value?void 0:0,"aria-checked":e.checked,onClick:r},[l])}}}))}}}));
+>>>>>>> online:dist/assets/Checker-legacy-2b9b0a68.js

File diff suppressed because it is too large
+ 1 - 0
dist/assets/Image-03916501.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/Image-legacy-ef9c4459.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/address-operation-9da81a3a.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/address-operation-legacy-852460d1.js


+ 4 - 0
dist/assets/api-e3ff3f19.js → dist/assets/api-4bf59dee.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD:dist/assets/api-e3ff3f19.js
 <<<<<<< HEAD:dist/assets/api-19476eea.js
 <<<<<<< HEAD:dist/assets/api-a16e15a2.js
 <<<<<<<< HEAD:dist/assets/api-bb05a915.js
@@ -11,3 +12,6 @@ import{D as t}from"./index-86432905.js";const n=e=>t.post("/edu-app/functionGuid
 =======
 import{D as t}from"./index-434359ae.js";const n=e=>t.post("/edu-app/functionGuidance/save",{data:e}),u=e=>t.get("/edu-app/functionGuidance/queryTagDetail",{data:e,params:e});export{u as g,n as s};
 >>>>>>> iteration-20240516-member:dist/assets/api-e3ff3f19.js
+=======
+import{D as t}from"./index-5d38e327.js";const n=e=>t.post("/edu-app/functionGuidance/save",{data:e}),u=e=>t.get("/edu-app/functionGuidance/queryTagDetail",{data:e,params:e});export{u as g,n as s};
+>>>>>>> online:dist/assets/api-4bf59dee.js

+ 4 - 0
dist/assets/api-1f7eca9b.js → dist/assets/api-530dbdfe.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD:dist/assets/api-1f7eca9b.js
 <<<<<<< HEAD:dist/assets/api-63d4d024.js
 <<<<<<< HEAD:dist/assets/api-3f37fafe.js
 <<<<<<<< HEAD:dist/assets/api-15c80f15.js
@@ -11,3 +12,6 @@ import{D as t}from"./index-86432905.js";const s=e=>t.post("/edu-app/musicSheetCa
 =======
 import{D as t}from"./index-434359ae.js";const s=e=>t.post("/edu-app/musicSheetCategories/page",{data:e}),p=e=>t.post("/edu-app/musicSheet/page",{data:e}),u=()=>t.get("/edu-app/musicTag/tree"),r=e=>t.post("/edu-app/subject/list",{data:e});export{u as a,s as b,p as c,r as d};
 >>>>>>> iteration-20240516-member:dist/assets/api-1f7eca9b.js
+=======
+import{D as t}from"./index-5d38e327.js";const s=e=>t.post("/edu-app/musicSheetCategories/page",{data:e}),p=e=>t.post("/edu-app/musicSheet/page",{data:e}),u=()=>t.get("/edu-app/musicTag/tree"),r=e=>t.post("/edu-app/subject/list",{data:e});export{u as a,s as b,p as c,r as d};
+>>>>>>> online:dist/assets/api-530dbdfe.js

+ 1 - 1
dist/assets/api-f7bc68d8.js → dist/assets/api-eee3f4a4.js

@@ -1 +1 @@
-import{D as r}from"./index-434359ae.js";const t={VIP:"数字化乐器AI学练工具",SCHOOL_REGISTER:"学生报名"},n=e=>r.post("/edu-app/userPaymentOrder/studentOrderPage",{data:e}),d=e=>r.post("/edu-app/userPaymentOrder/studentRefundOrderPage",{data:e}),u=e=>r.get(`/edu-app/userPaymentOrder/detail/${e}`),s=e=>r.get(`/edu-app/userPaymentOrder/refundDetail/${e}`),p=e=>r.post(`/edu-app/userPaymentOrder/cancelRefund/${e}`),P=e=>r.post("/edu-app/userPaymentOrder/refundPayment",{data:e}),m=e=>r.get("/edu-app/userPaymentOrder/unpaid",{params:e}),y=e=>r.post("/edu-app/userPaymentOrder/cancelPayment/"+e);export{u as a,P as b,m as c,y as d,d as e,n as f,s as g,p as h,t};
+import{D as r}from"./index-5d38e327.js";const t={VIP:"数字化乐器AI学练工具",SCHOOL_REGISTER:"学生报名"},n=e=>r.post("/edu-app/userPaymentOrder/studentOrderPage",{data:e}),d=e=>r.post("/edu-app/userPaymentOrder/studentRefundOrderPage",{data:e}),u=e=>r.get(`/edu-app/userPaymentOrder/detail/${e}`),s=e=>r.get(`/edu-app/userPaymentOrder/refundDetail/${e}`),p=e=>r.post(`/edu-app/userPaymentOrder/cancelRefund/${e}`),P=e=>r.post("/edu-app/userPaymentOrder/refundPayment",{data:e}),m=e=>r.get("/edu-app/userPaymentOrder/unpaid",{params:e}),y=e=>r.post("/edu-app/userPaymentOrder/cancelPayment/"+e);export{u as a,P as b,m as c,y as d,d as e,n as f,s as g,p as h,t};

+ 4 - 0
dist/assets/api-legacy-bfc384e0.js → dist/assets/api-legacy-1265a2fb.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD:dist/assets/api-legacy-bfc384e0.js
 <<<<<<< HEAD:dist/assets/api-legacy-9f76bc4c.js
 <<<<<<< HEAD:dist/assets/api-legacy-6b888e98.js
 <<<<<<<< HEAD:dist/assets/api-legacy-b47de2fc.js
@@ -11,3 +12,6 @@ System.register(["./index-legacy-36a658ea.js"],(function(e,t){"use strict";var a
 =======
 System.register(["./index-legacy-a4c4a61f.js"],(function(e,t){"use strict";var a;return{setters:[e=>{a=e.D}],execute:function(){e("b",(e=>a.post("/edu-app/musicSheetCategories/page",{data:e}))),e("c",(e=>a.post("/edu-app/musicSheet/page",{data:e}))),e("a",(()=>a.get("/edu-app/musicTag/tree"))),e("d",(e=>a.post("/edu-app/subject/list",{data:e})))}}}));
 >>>>>>> iteration-20240516-member:dist/assets/api-legacy-bfc384e0.js
+=======
+System.register(["./index-legacy-eadeea60.js"],(function(e,t){"use strict";var a;return{setters:[e=>{a=e.D}],execute:function(){e("b",(e=>a.post("/edu-app/musicSheetCategories/page",{data:e}))),e("c",(e=>a.post("/edu-app/musicSheet/page",{data:e}))),e("a",(()=>a.get("/edu-app/musicTag/tree"))),e("d",(e=>a.post("/edu-app/subject/list",{data:e})))}}}));
+>>>>>>> online:dist/assets/api-legacy-1265a2fb.js

+ 1 - 1
dist/assets/api-legacy-b6ae8302.js → dist/assets/api-legacy-30e4f6b1.js

@@ -1 +1 @@
-System.register(["./index-legacy-a4c4a61f.js"],(function(e,r){"use strict";var t;return{setters:[e=>{t=e.D}],execute:function(){e("t",{VIP:"数字化乐器AI学练工具",SCHOOL_REGISTER:"学生报名"}),e("f",(e=>t.post("/edu-app/userPaymentOrder/studentOrderPage",{data:e}))),e("e",(e=>t.post("/edu-app/userPaymentOrder/studentRefundOrderPage",{data:e}))),e("a",(e=>t.get(`/edu-app/userPaymentOrder/detail/${e}`))),e("g",(e=>t.get(`/edu-app/userPaymentOrder/refundDetail/${e}`))),e("h",(e=>t.post(`/edu-app/userPaymentOrder/cancelRefund/${e}`))),e("b",(e=>t.post("/edu-app/userPaymentOrder/refundPayment",{data:e}))),e("c",(e=>t.get("/edu-app/userPaymentOrder/unpaid",{params:e}))),e("d",(e=>t.post("/edu-app/userPaymentOrder/cancelPayment/"+e)))}}}));
+System.register(["./index-legacy-eadeea60.js"],(function(e,r){"use strict";var t;return{setters:[e=>{t=e.D}],execute:function(){e("t",{VIP:"数字化乐器AI学练工具",SCHOOL_REGISTER:"学生报名"}),e("f",(e=>t.post("/edu-app/userPaymentOrder/studentOrderPage",{data:e}))),e("e",(e=>t.post("/edu-app/userPaymentOrder/studentRefundOrderPage",{data:e}))),e("a",(e=>t.get(`/edu-app/userPaymentOrder/detail/${e}`))),e("g",(e=>t.get(`/edu-app/userPaymentOrder/refundDetail/${e}`))),e("h",(e=>t.post(`/edu-app/userPaymentOrder/cancelRefund/${e}`))),e("b",(e=>t.post("/edu-app/userPaymentOrder/refundPayment",{data:e}))),e("c",(e=>t.get("/edu-app/userPaymentOrder/unpaid",{params:e}))),e("d",(e=>t.post("/edu-app/userPaymentOrder/cancelPayment/"+e)))}}}));

+ 4 - 0
dist/assets/api-legacy-72eb00c6.js → dist/assets/api-legacy-78b715e1.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD:dist/assets/api-legacy-72eb00c6.js
 <<<<<<< HEAD:dist/assets/api-legacy-a188d23c.js
 <<<<<<< HEAD:dist/assets/api-legacy-0c7dc632.js
 <<<<<<<< HEAD:dist/assets/api-legacy-25ab4342.js
@@ -11,3 +12,6 @@ System.register(["./index-legacy-36a658ea.js"],(function(e,t){"use strict";var a
 =======
 System.register(["./index-legacy-a4c4a61f.js"],(function(e,t){"use strict";var a;return{setters:[e=>{a=e.D}],execute:function(){e("s",(e=>a.post("/edu-app/functionGuidance/save",{data:e}))),e("g",(e=>a.get("/edu-app/functionGuidance/queryTagDetail",{data:e,params:e})))}}}));
 >>>>>>> iteration-20240516-member:dist/assets/api-legacy-72eb00c6.js
+=======
+System.register(["./index-legacy-eadeea60.js"],(function(e,t){"use strict";var a;return{setters:[e=>{a=e.D}],execute:function(){e("s",(e=>a.post("/edu-app/functionGuidance/save",{data:e}))),e("g",(e=>a.get("/edu-app/functionGuidance/queryTagDetail",{data:e,params:e})))}}}));
+>>>>>>> online:dist/assets/api-legacy-78b715e1.js

+ 0 - 0
dist/assets/back-137ab198.svg → dist/assets/back-249c7158.svg


File diff suppressed because it is too large
+ 1 - 0
dist/assets/baseIndex-57d2631a.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/baseIndex-fb222763.css


File diff suppressed because it is too large
+ 1 - 0
dist/assets/baseIndex-legacy-fcb0c87b.js


+ 0 - 0
dist/assets/chapter-default-arrow-de63989d.svg → dist/assets/chapter-default-arrow-339bcb73.svg


+ 0 - 0
dist/assets/chapter-down-arrow-568e9ee5.svg → dist/assets/chapter-down-arrow-8e77ebfb.svg


+ 0 - 0
dist/assets/chapter-video-91c7709a.svg → dist/assets/chapter-video-cdcb47b9.svg


+ 4 - 0
dist/assets/detail-62313e08.js → dist/assets/detail-fe921c1f.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD:dist/assets/detail-62313e08.js
 <<<<<<< HEAD:dist/assets/detail-3353b2f8.js
 <<<<<<< HEAD:dist/assets/detail-f9d10c68.js
 <<<<<<<< HEAD:dist/assets/detail-60180163.js
@@ -11,3 +12,6 @@ import{d as o,P as r,q as c,r as i,y as d,a as e,c0 as p,W as v,A as f,F as m,D
 =======
 import{d as o,P as r,q as c,r as i,y as d,a as e,c0 as p,W as v,A as f,F as m,D as y}from"./index-434359ae.js";import{s as t}from"./information-detail.module-dbcf7f73.js";const q=o({name:"notice-detail",setup(){const s=r(),n=c(),a=i({}),u=async()=>{try{const{data:l}=await y.get("/edu-app/open/helpCenterContent/detail/"+s.query.id);a.value=l}catch(l){}};return d(()=>{u()}),()=>e(m,null,[s.query.source=="music"?e(p,{leftArrow:!0,leftText:"返回",border:!1,onClickLeft:()=>n.back()},null):e(v,null,null),e("div",{class:[t.detail]},[e("div",{class:t.detailContent},[e("div",{class:t.title},[a.value.title]),e("div",{class:t.who},[e("span",null,[f("音乐数字课堂")]),a.value.updateTime]),e("div",{class:t.content,innerHTML:a.value.content},null)])])])}});export{q as default};
 >>>>>>> iteration-20240516-member:dist/assets/detail-62313e08.js
+=======
+import{d as o,P as r,q as c,r as i,y as d,a as e,c0 as p,W as v,A as f,F as m,D as y}from"./index-5d38e327.js";import{s as t}from"./information-detail.module-dbcf7f73.js";const q=o({name:"notice-detail",setup(){const s=r(),n=c(),a=i({}),u=async()=>{try{const{data:l}=await y.get("/edu-app/open/helpCenterContent/detail/"+s.query.id);a.value=l}catch(l){}};return d(()=>{u()}),()=>e(m,null,[s.query.source=="music"?e(p,{leftArrow:!0,leftText:"返回",border:!1,onClickLeft:()=>n.back()},null):e(v,null,null),e("div",{class:[t.detail]},[e("div",{class:t.detailContent},[e("div",{class:t.title},[a.value.title]),e("div",{class:t.who},[e("span",null,[f("音乐数字课堂")]),a.value.updateTime]),e("div",{class:t.content,innerHTML:a.value.content},null)])])])}});export{q as default};
+>>>>>>> online:dist/assets/detail-fe921c1f.js

+ 4 - 0
dist/assets/detail-legacy-321c10fa.js → dist/assets/detail-legacy-79c0f6fe.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD:dist/assets/detail-legacy-321c10fa.js
 <<<<<<< HEAD:dist/assets/detail-legacy-745ac8d8.js
 <<<<<<< HEAD:dist/assets/detail-legacy-98cff3d1.js
 <<<<<<<< HEAD:dist/assets/detail-legacy-585ec5c5.js
@@ -11,3 +12,6 @@
 =======
 !function(){function e(e,t,n,i,l,u,r){try{var a=e[u](r),c=a.value}catch(o){return void n(o)}a.done?t(c):Promise.resolve(c).then(i,l)}System.register(["./index-legacy-a4c4a61f.js","./information-detail.module-legacy-e4898241.js"],(function(t,n){"use strict";var i,l,u,r,a,c,o,s,d,v,f,p;return{setters:[e=>{i=e.d,l=e.P,u=e.q,r=e.r,a=e.y,c=e.a,o=e.c0,s=e.W,d=e.A,v=e.F,f=e.D},e=>{p=e.s}],execute:function(){t("default",i({name:"notice-detail",setup(){const t=l(),n=u(),i=r({}),y=function(){var n,l=(n=function*(){try{const{data:e}=yield f.get("/edu-app/open/helpCenterContent/detail/"+t.query.id);i.value=e}catch(e){}},function(){var t=this,i=arguments;return new Promise((function(l,u){var r=n.apply(t,i);function a(t){e(r,l,u,a,c,"next",t)}function c(t){e(r,l,u,a,c,"throw",t)}a(void 0)}))});return function(){return l.apply(this,arguments)}}();return a((()=>{y()})),()=>c(v,null,["music"==t.query.source?c(o,{leftArrow:!0,leftText:"返回",border:!1,onClickLeft:()=>n.back()},null):c(s,null,null),c("div",{class:[p.detail]},[c("div",{class:p.detailContent},[c("div",{class:p.title},[i.value.title]),c("div",{class:p.who},[c("span",null,[d("音乐数字课堂")]),i.value.updateTime]),c("div",{class:p.content,innerHTML:i.value.content},null)])])])}}))}}}))}();
 >>>>>>> iteration-20240516-member:dist/assets/detail-legacy-321c10fa.js
+=======
+!function(){function e(e,t,n,i,l,u,r){try{var a=e[u](r),c=a.value}catch(o){return void n(o)}a.done?t(c):Promise.resolve(c).then(i,l)}System.register(["./index-legacy-eadeea60.js","./information-detail.module-legacy-e4898241.js"],(function(t,n){"use strict";var i,l,u,r,a,c,o,s,d,v,f,p;return{setters:[e=>{i=e.d,l=e.P,u=e.q,r=e.r,a=e.y,c=e.a,o=e.c0,s=e.W,d=e.A,v=e.F,f=e.D},e=>{p=e.s}],execute:function(){t("default",i({name:"notice-detail",setup(){const t=l(),n=u(),i=r({}),y=function(){var n,l=(n=function*(){try{const{data:e}=yield f.get("/edu-app/open/helpCenterContent/detail/"+t.query.id);i.value=e}catch(e){}},function(){var t=this,i=arguments;return new Promise((function(l,u){var r=n.apply(t,i);function a(t){e(r,l,u,a,c,"next",t)}function c(t){e(r,l,u,a,c,"throw",t)}a(void 0)}))});return function(){return l.apply(this,arguments)}}();return a((()=>{y()})),()=>c(v,null,["music"==t.query.source?c(o,{leftArrow:!0,leftText:"返回",border:!1,onClickLeft:()=>n.back()},null):c(s,null,null),c("div",{class:[p.detail]},[c("div",{class:p.detailContent},[c("div",{class:p.title},[i.value.title]),c("div",{class:p.who},[c("span",null,[d("音乐数字课堂")]),i.value.updateTime]),c("div",{class:p.content,innerHTML:i.value.content},null)])])])}}))}}}))}();
+>>>>>>> online:dist/assets/detail-legacy-79c0f6fe.js

File diff suppressed because it is too large
+ 1 - 0
dist/assets/exercis-detail-7b42fca7.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/exercis-detail-legacy-b650308a.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/guide-f5f0abc5.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/guide-legacy-4087bf91.js


+ 4 - 0
dist/assets/howler-f148787a.js → dist/assets/howler-739b921f.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD:dist/assets/howler-f148787a.js
 <<<<<<< HEAD:dist/assets/howler-fec793b2.js
 <<<<<<< HEAD:dist/assets/howler-d794fb29.js
 <<<<<<<< HEAD:dist/assets/howler-792bbd33.js
@@ -11,6 +12,9 @@ import{ar as x}from"./index-86432905.js";var B={};/*!
 =======
 import{ar as x}from"./index-434359ae.js";var B={};/*!
 >>>>>>> iteration-20240516-member:dist/assets/howler-f148787a.js
+=======
+import{ar as x}from"./index-5d38e327.js";var B={};/*!
+>>>>>>> online:dist/assets/howler-739b921f.js
  *  howler.js v2.2.3
  *  howlerjs.com
  *

+ 4 - 0
dist/assets/howler-legacy-a4590765.js → dist/assets/howler-legacy-8f3d7126.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD:dist/assets/howler-legacy-a4590765.js
 <<<<<<< HEAD:dist/assets/howler-legacy-69927790.js
 <<<<<<< HEAD:dist/assets/howler-legacy-26757460.js
 <<<<<<<< HEAD:dist/assets/howler-legacy-c53a582b.js
@@ -11,6 +12,9 @@ System.register(["./index-legacy-36a658ea.js"],(function(e,n){"use strict";var t
 =======
 System.register(["./index-legacy-a4c4a61f.js"],(function(e,n){"use strict";var t;return{setters:[e=>{t=e.ar}],execute:function(){
 >>>>>>> iteration-20240516-member:dist/assets/howler-legacy-a4590765.js
+=======
+System.register(["./index-legacy-eadeea60.js"],(function(e,n){"use strict";var t;return{setters:[e=>{t=e.ar}],execute:function(){
+>>>>>>> online:dist/assets/howler-legacy-8f3d7126.js
 /*!
        *  howler.js v2.2.3
        *  howlerjs.com

File diff suppressed because it is too large
+ 0 - 0
dist/assets/icon-9-3c684c12.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/icon-9-legacy-e774af01.js


+ 0 - 0
dist/assets/icon-change-4e3ae26f.svg → dist/assets/icon-change-22c20f9c.svg


+ 0 - 0
dist/assets/icon-down-254707d8.svg → dist/assets/icon-down-e4497e2d.svg


+ 0 - 0
dist/assets/icon-image-a42bef16.svg → dist/assets/icon-image-84be0190.svg


+ 0 - 0
dist/assets/icon-image-active-505521ea.svg → dist/assets/icon-image-active-562ca69e.svg


+ 0 - 14
dist/assets/icon-loop-50586604.svg

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="26px" height="24px" viewBox="0 0 26 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>切片</title>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="学生端-音频备份" transform="translate(-128.000000, -338.000000)" fill="#F7FEFF" fill-rule="nonzero">
-            <g id="循环播放" transform="translate(128.000000, 338.000000)">
-                <g id="编组备份-14" transform="translate(2.000000, 2.000000)">
-                    <path d="M8.64864728,13.4626168 L13.1296674,10.4664639 C13.452315,10.2510886 13.6363714,9.91469979 13.6363714,9.54544296 C13.6363714,9.17610614 13.4504259,8.84195824 13.1296674,8.6265829 L8.64864728,5.62818903 C8.47408728,5.51381841 8.29756162,5.45453883 8.12300161,5.45453883 C7.63135916,5.45453883 7.27274276,5.91620986 7.27274276,6.54929008 L7.27274276,12.5415959 C7.27274276,13.1769171 7.62949561,13.6363471 8.12300161,13.6363471 C8.29753609,13.6363471 8.47408728,13.5792284 8.64864728,13.4626168 L8.64864728,13.4626168 Z" id="路径"></path>
-                    <path d="M10.0001024,0 C4.49998597,0 -6.54210493e-16,4.49994259 -6.54210493e-16,9.99998786 C-0.0039420922,11.7698614 0.477594551,13.5069262 1.3922533,15.0221376 C1.45677262,15.1300855 2.99336628,13.6411004 6.00006023,10.5554936 L2.10001781,9.39993668 C2.40001708,5.20001966 5.80000876,2.00002355 10.1000242,2.00002355 C14.5000395,2.00002355 18.1000567,5.59996723 18.1000567,9.99998786 C18.1000567,14.4000085 14.5000395,18.0000301 10.1000242,18.0000301 C8.60005387,18.0000301 7.20008326,17.5999786 6.00003425,16.8999276 L4.49995999,18.2998999 C6.09995609,19.3000026 7.99997742,19.9999757 10.0001024,19.9999757 C15.500063,19.9999757 20,15.4999552 20,9.99998786 C20,4.49994259 15.6000627,0 10.0001024,0 L10.0001024,0 Z" id="路径"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

+ 0 - 15
dist/assets/icon-loop-active-894621ab.svg

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="26px" height="24px" viewBox="0 0 26 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>切片</title>
-    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="学生端-音频备份" transform="translate(-128.000000, -289.000000)" fill-rule="nonzero">
-            <g id="循环播放备份" transform="translate(128.000000, 289.000000)">
-                <g id="编组备份-14" transform="translate(1.999976, 2.000000)">
-                    <path d="M8.64867129,13.4626168 L13.1296914,10.4664639 C13.452339,10.2510886 13.6363954,9.91469979 13.6363954,9.54544296 C13.6363954,9.17610614 13.45045,8.84195824 13.1296914,8.6265829 L8.64867129,5.62818903 C8.47411129,5.51381841 8.29758563,5.45453883 8.12302563,5.45453883 C7.63138317,5.45453883 7.27276677,5.91620986 7.27276677,6.54929008 L7.27276677,12.5415959 C7.27276677,13.1769171 7.62951962,13.6363471 8.12302563,13.6363471 C8.2975601,13.6363471 8.47411129,13.5792284 8.64867129,13.4626168 L8.64867129,13.4626168 Z" id="路径" fill="#F7FEFF"></path>
-                    <path d="M6.00005827,16.8999276 C7.20010727,17.5999786 8.60007788,18.0000301 10.1000482,18.0000301 C11.2915485,18.0000301 12.4243852,17.7360416 13.4429574,17.2636654 C13.6926511,17.8790811 14.04255,18.4431596 14.4717229,18.9364407 L14.4215338,18.9628995 C13.0865712,19.6263745 11.5848608,19.9999757 10.0001264,19.9999757 C8.00000143,19.9999757 6.0999801,19.3000026 4.499984,18.2998999 L4.499984,18.2998999 Z M10.0001264,0 C15.2833571,0 19.4984708,4.00531084 19.9583774,9.07698346 C19.6459544,9.02599941 19.3260254,9 19.000024,9 C18.6750686,9 18.3561468,9.02583284 18.0452001,9.07555692 C17.5850777,5.10713496 14.1878021,2.00002355 10.1000482,2.00002355 C5.80003277,2.00002355 2.40004109,5.20001966 2.10004182,9.39993668 L2.10004182,9.39993668 L6.00008424,10.5554936 C5.16489147,11.4126066 4.44313237,12.1465235 3.83484925,12.7572376 L3.3180341,13.2736153 C2.07558851,14.5082365 1.43349799,15.0911043 1.39227731,15.0221376 C0.477618562,13.5069262 -0.00391808132,11.7698614 2.40108761e-05,9.99998786 C2.40108761e-05,4.49994259 4.50000998,0 10.0001264,0 Z" id="形状结合" fill="#F7FEFF"></path>
-                    <path d="M19.000024,10 C21.7614478,10 24.000024,12.2385763 24.000024,15 C24.000024,17.7614237 21.7614478,20 19.000024,20 C16.2386003,20 14.000024,17.7614237 14.000024,15 C14.000024,12.2385763 16.2386003,10 19.000024,10 Z M21.9553514,13.1420886 C21.7524348,12.9832858 21.4506576,13.0042922 21.2548375,13.2001122 L21.2548375,13.2001122 L18.5815144,15.87328 L17.1273543,14.4183562 L17.0823755,14.3785153 C16.879459,14.2197125 16.5776817,14.2407189 16.3818617,14.436539 C16.1709786,14.6474221 16.1628379,14.9811905 16.3636789,15.1820315 L16.3636789,15.1820315 L18.1819535,17.0003061 L18.2269323,17.0401471 C18.4298488,17.1989498 18.731626,17.1779434 18.9274461,16.9821234 L18.9274461,16.9821234 L21.9821474,13.9274221 L22.0242311,13.8804452 C22.1931272,13.669536 22.1868254,13.3684248 22.0003301,13.1819295 L22.0003301,13.1819295 Z" id="形状结合" fill="#1CACF1"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

+ 0 - 0
dist/assets/icon-menu-chapter-bd664df8.svg → dist/assets/icon-menu-chapter-99a82c09.svg


+ 0 - 0
dist/assets/icon-menu-107c1ebd.svg → dist/assets/icon-menu-da91160c.svg


+ 0 - 0
dist/assets/icon-mulv-62ebfce7.svg → dist/assets/icon-mulv-c192bcd6.svg


+ 0 - 0
dist/assets/icon-pause-fe805220.svg → dist/assets/icon-pause-7c9eee52.svg


+ 0 - 0
dist/assets/icon-play-6bc42262.svg → dist/assets/icon-play-e9875d7d.svg


+ 0 - 0
dist/assets/icon-search-d43eb2c3.svg → dist/assets/icon-search-1762116d.svg


+ 0 - 0
dist/assets/icon-song-99d8d3cc.svg → dist/assets/icon-song-3148e728.svg


+ 0 - 0
dist/assets/icon-song-active-eebbc734.svg → dist/assets/icon-song-active-44d556ae.svg


+ 0 - 0
dist/assets/icon-start-4118ae28.svg → dist/assets/icon-start-79121c66.svg


+ 0 - 0
dist/assets/icon-up-44f779eb.svg → dist/assets/icon-up-19f22308.svg


+ 0 - 0
dist/assets/icon-video-3cccb687.svg → dist/assets/icon-video-004a5067.svg


+ 0 - 0
dist/assets/icon-video-active-97b7eb07.svg → dist/assets/icon-video-active-eaed6594.svg


+ 1 - 0
dist/assets/icon_back-0f8fa846.js

@@ -0,0 +1 @@
+const a=""+new URL("icon_back-5e4a9810.svg",import.meta.url).href;export{a as i};

+ 0 - 0
dist/assets/icon_back-b80c2fc2.svg → dist/assets/icon_back-5e4a9810.svg


+ 0 - 1
dist/assets/icon_back-6f7c496c.js

@@ -1 +0,0 @@
-const c=""+new URL("icon_back-b80c2fc2.svg",import.meta.url).href;export{c as i};

+ 1 - 1
dist/assets/icon_back-legacy-01ae0639.js → dist/assets/icon_back-legacy-fc4602e2.js

@@ -1 +1 @@
-System.register([],(function(e,t){"use strict";return{execute:function(){e("i",""+new URL("icon_back-b80c2fc2.svg",t.meta.url).href)}}}));
+System.register([],(function(e,t){"use strict";return{execute:function(){e("i",""+new URL("icon_back-5e4a9810.svg",t.meta.url).href)}}}));

BIN
dist/assets/icon_bg-8e6656ee.png


BIN
dist/assets/icon_bg-e6ef420c.png


+ 0 - 0
dist/assets/icon_close-c5194700.svg → dist/assets/icon_close-7cbd75e8.svg


+ 0 - 0
dist/assets/icon_default-c2fa566e.svg → dist/assets/icon_default-486fe3d3.svg


+ 0 - 0
dist/assets/icon_down-27184904.svg → dist/assets/icon_down-dbb42185.svg


+ 0 - 0
dist/assets/icon_hot-954f4a46.svg → dist/assets/icon_hot-0c8bef2b.svg


+ 0 - 0
dist/assets/icon_jianpuActive-17580202.svg → dist/assets/icon_jianpuActive-1d89770a.svg


+ 0 - 0
dist/assets/icon_order-81136547.svg → dist/assets/icon_order-6c4dbe83.svg


+ 0 - 0
dist/assets/icon_refunding-47b787dd.svg → dist/assets/icon_refunding-47c3a880.svg


+ 0 - 0
dist/assets/icon_success-418d3aaa.svg → dist/assets/icon_success-ddfa806c.svg


BIN
dist/assets/icon_title-f0bb26d9.png


+ 0 - 0
dist/assets/icon_tradeing-f6dadddb.svg → dist/assets/icon_tradeing-f589a525.svg


+ 4 - 0
dist/assets/index-c18bb473.js → dist/assets/index-00aa7b6e.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD:dist/assets/index-c18bb473.js
 <<<<<<< HEAD:dist/assets/index-bbb4b957.js
 <<<<<<< HEAD:dist/assets/index-3216dd8a.js
 <<<<<<<< HEAD:dist/assets/index-dddeb888.js
@@ -11,3 +12,6 @@ import{d as l,Y as o,a as h,S as n}from"./index-86432905.js";const d=l({name:"co
 =======
 import{d as l,Y as o,a as h,S as n}from"./index-434359ae.js";const d=l({name:"col-popup",props:{height:{type:String,default:"100%"},width:{type:String,default:"100%"},teleport:{type:String,default:""},destroy:{type:Boolean,default:!1},modelValue:{type:Boolean,default:!1},position:{type:String,default:"bottom"},zIndex:{type:Number,default:2018}},emits:["close","update:modelValue"],data(){return{popupShow:!1,isDestroy:!1}},watch:{modelValue(){this.hashState()}},mounted(){this.destroy&&(this.isDestroy=!1),window.addEventListener("hashchange",this.onHash,!1)},unmounted(){window.removeEventListener("hashchange",this.onHash,!1)},methods:{onHash(){this.$emit("update:modelValue",!1),this.isDestroy=!1,this.$emit("close")},onPopupClose(t){this.$emit("update:modelValue",t),this.hashState()},hashState(){if(this.modelValue){this.isDestroy=!1;const t=window.location.hash.slice(1).split("?"),e=o.parse(t[1]);let s=0;for(const r in e)s++;const i=window.location.href,a=s>0?"&sPop="+ +new Date:"?sPop="+ +new Date;history.pushState("","",`${i}${a}`)}else{const t=window.location.hash.slice(1).split("?");o.parse(t[1]).sPop&&window.history.go(-1)}this.$refs.protocolPopup&&(this.$refs.protocolPopup.scrollTop=0)}},render(){return h(n,{ref:"protocolPopup",show:this.modelValue,transitionAppear:!0,position:this.position,teleport:this.teleport,style:{height:this.height,width:this.width},zIndex:this.zIndex,onClosed:()=>{this.destroy&&(this.isDestroy=!0)}},{default:()=>[this.$slots.default&&!this.isDestroy&&this.$slots.default()]})}});export{d as O};
 >>>>>>> iteration-20240516-member:dist/assets/index-c18bb473.js
+=======
+import{d as l,Y as o,a as h,S as n}from"./index-5d38e327.js";const d=l({name:"col-popup",props:{height:{type:String,default:"100%"},width:{type:String,default:"100%"},teleport:{type:String,default:""},destroy:{type:Boolean,default:!1},modelValue:{type:Boolean,default:!1},position:{type:String,default:"bottom"},zIndex:{type:Number,default:2018}},emits:["close","update:modelValue"],data(){return{popupShow:!1,isDestroy:!1}},watch:{modelValue(){this.hashState()}},mounted(){this.destroy&&(this.isDestroy=!1),window.addEventListener("hashchange",this.onHash,!1)},unmounted(){window.removeEventListener("hashchange",this.onHash,!1)},methods:{onHash(){this.$emit("update:modelValue",!1),this.isDestroy=!1,this.$emit("close")},onPopupClose(t){this.$emit("update:modelValue",t),this.hashState()},hashState(){if(this.modelValue){this.isDestroy=!1;const t=window.location.hash.slice(1).split("?"),e=o.parse(t[1]);let s=0;for(const r in e)s++;const i=window.location.href,a=s>0?"&sPop="+ +new Date:"?sPop="+ +new Date;history.pushState("","",`${i}${a}`)}else{const t=window.location.hash.slice(1).split("?");o.parse(t[1]).sPop&&window.history.go(-1)}this.$refs.protocolPopup&&(this.$refs.protocolPopup.scrollTop=0)}},render(){return h(n,{ref:"protocolPopup",show:this.modelValue,transitionAppear:!0,position:this.position,teleport:this.teleport,style:{height:this.height,width:this.width},zIndex:this.zIndex,onClosed:()=>{this.destroy&&(this.isDestroy=!0)}},{default:()=>[this.$slots.default&&!this.isDestroy&&this.$slots.default()]})}});export{d as O};
+>>>>>>> online:dist/assets/index-00aa7b6e.js

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-0291b85e.css


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-05a53229.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-069dd57e.css


+ 4 - 0
dist/assets/index-8b372852.js → dist/assets/index-09e10f8a.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD:dist/assets/index-8b372852.js
 <<<<<<< HEAD:dist/assets/index-a0967bf5.js
 <<<<<<< HEAD:dist/assets/index-539145ef.js
 <<<<<<<< HEAD:dist/assets/index-b0906f04.js
@@ -11,3 +12,6 @@ import{d as t,q as n,a as e,W as s,a7 as u,U as o,F as r}from"./index-86432905.j
 =======
 import{d as t,q as n,a as e,W as s,a7 as u,U as o,F as r}from"./index-434359ae.js";const p=t({name:"page-404",setup(){const a=n();return()=>e(r,null,[e(s,null,null),e(u,{style:{"min-height":"calc(100vh - var(--van-nav-bar-height))",paddingTop:"0 !important"},showButton:!0,description:"页面找不到了~",image:"404",onClick:()=>{o().isApp?postMessage({api:"back"}):a.back()}},null)])}});export{p as default};
 >>>>>>> iteration-20240516-member:dist/assets/index-8b372852.js
+=======
+import{d as t,q as n,a as e,W as s,a7 as u,U as o,F as r}from"./index-5d38e327.js";const p=t({name:"page-404",setup(){const a=n();return()=>e(r,null,[e(s,null,null),e(u,{style:{"min-height":"calc(100vh - var(--van-nav-bar-height))",paddingTop:"0 !important"},showButton:!0,description:"页面找不到了~",image:"404",onClick:()=>{o().isApp?postMessage({api:"back"}):a.back()}},null)])}});export{p as default};
+>>>>>>> online:dist/assets/index-09e10f8a.js

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-0f62613a.css


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-12e9e4e4.js


+ 4 - 0
dist/assets/index-a99328db.js → dist/assets/index-1546f2f7.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD:dist/assets/index-a99328db.js
 <<<<<<< HEAD:dist/assets/index-9dbba536.js
 <<<<<<< HEAD:dist/assets/index-b965dfa9.js
 <<<<<<<< HEAD:dist/assets/index-15be3da6.js
@@ -11,3 +12,6 @@ import{d as i,x as l,y as d,D as u,a as o,C as p,U as n}from"./index-86432905.js
 =======
 import{d as i,x as l,y as d,D as u,a as o,C as p,U as n}from"./index-434359ae.js";import{s,a as c,w}from"./student-center-df3e5ab3.js";import{I as m}from"./index-d7c57d44.js";const y=i({name:"download",setup(){const t=l({wxStatus:!1,androidUrl:""}),r=()=>{if(n().weixin){t.wxStatus=!0;return}let a="",e="";location.origin.indexOf("kt.colexiu.com")>-1?(a="https://apps.apple.com/us/app/%E9%9F%B3%E4%B9%90%E6%95%B0%E5%AD%97%E8%AF%BE%E5%A0%82/id6452725878",e=t.androidUrl):(a="https://www.pgyer.com/dzRRNN",e=t.androidUrl),n().ios||/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)?a&&(window.location.href=a):window.location.href=e};return d(async()=>{try{const{data:a}=await u.get("/edu-app/open/appVersionInfo/queryLatestByPlatform",{params:{platform:"android-kt",status:"history"}});t.androidUrl=a.downloadUrl}catch(a){}}),()=>o("div",{class:[s.downloadContainer]},[o(m,{class:s.downImg,src:c},null),o("div",{class:s.buttonGroup},[o(p,{round:!0,size:"large",class:s.btn,onClick:r},null)]),t.wxStatus&&o("div",{class:s.wxpopup,onClick:()=>{t.wxStatus=!1}},[o("img",{src:w,alt:""},null)])])}});export{y as default};
 >>>>>>> iteration-20240516-member:dist/assets/index-a99328db.js
+=======
+import{d as i,x as l,y as d,D as u,a as o,C as p,U as n}from"./index-5d38e327.js";import{s,a as c,w}from"./student-center-df3e5ab3.js";import{I as m}from"./index-82331589.js";const y=i({name:"download",setup(){const t=l({wxStatus:!1,androidUrl:""}),r=()=>{if(n().weixin){t.wxStatus=!0;return}let a="",e="";location.origin.indexOf("kt.colexiu.com")>-1?(a="https://apps.apple.com/us/app/%E9%9F%B3%E4%B9%90%E6%95%B0%E5%AD%97%E8%AF%BE%E5%A0%82/id6452725878",e=t.androidUrl):(a="https://www.pgyer.com/dzRRNN",e=t.androidUrl),n().ios||/(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent)?a&&(window.location.href=a):window.location.href=e};return d(async()=>{try{const{data:a}=await u.get("/edu-app/open/appVersionInfo/queryLatestByPlatform",{params:{platform:"android-kt",status:"history"}});t.androidUrl=a.downloadUrl}catch(a){}}),()=>o("div",{class:[s.downloadContainer]},[o(m,{class:s.downImg,src:c},null),o("div",{class:s.buttonGroup},[o(p,{round:!0,size:"large",class:s.btn,onClick:r},null)]),t.wxStatus&&o("div",{class:s.wxpopup,onClick:()=>{t.wxStatus=!1}},[o("img",{src:w,alt:""},null)])])}});export{y as default};
+>>>>>>> online:dist/assets/index-1546f2f7.js

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-17be8058.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-1d224bb3.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-1f47153c.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-1f649a3e.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-22bed470.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-25a415ce.css


+ 4 - 0
dist/assets/index-762727b3.js → dist/assets/index-27d94e28.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD:dist/assets/index-762727b3.js
 <<<<<<< HEAD:dist/assets/index-8488bd01.js
 <<<<<<< HEAD:dist/assets/index-e6385f0b.js
 <<<<<<<< HEAD:dist/assets/index-b9bb3bef.js
@@ -11,3 +12,6 @@ import{c as d,d as r,ag as m,w as p,aa as V,a as s,n as g,ab as h,k as u,aj as f
 =======
 import{c as d,d as r,ag as m,w as p,aa as V,a as s,n as g,ab as h,k as u,aj as f,ak as k,h as v}from"./index-434359ae.js";import{c as b,s as P}from"./Checker-a5b65281.js";const[c,C]=d("radio-group"),_={disabled:Boolean,iconSize:g,direction:String,modelValue:h,checkedColor:String},i=Symbol(c);var w=r({name:c,props:_,emits:["change","update:modelValue"],setup(e,{emit:n,slots:t}){const{linkChildren:o}=m(i),l=a=>n("update:modelValue",a);return p(()=>e.modelValue,a=>n("change",a)),o({props:e,updateValue:l}),V(()=>e.modelValue),()=>{var a;return s("div",{class:C([e.direction]),role:"radiogroup"},[(a=t.default)==null?void 0:a.call(t)])}}});const j=u(w),[R,S]=d("radio");var $=r({name:R,props:b,emits:["update:modelValue"],setup(e,{emit:n,slots:t}){const{parent:o}=f(i),l=()=>(o?o.props.modelValue:e.modelValue)===e.name,a=()=>{o?o.updateValue(e.name):n("update:modelValue",e.name)};return()=>s(P,v({bem:S,role:"radio",parent:o,checked:l(),onToggle:a},e),k(t,["default","icon"]))}});const x=u($);export{j as R,x as a};
 >>>>>>> iteration-20240516-member:dist/assets/index-762727b3.js
+=======
+import{c as d,d as r,ag as m,w as p,aa as V,a as s,n as g,ab as h,k as u,aj as f,ak as k,h as v}from"./index-5d38e327.js";import{c as b,s as P}from"./Checker-59a4d8fb.js";const[c,C]=d("radio-group"),_={disabled:Boolean,iconSize:g,direction:String,modelValue:h,checkedColor:String},i=Symbol(c);var w=r({name:c,props:_,emits:["change","update:modelValue"],setup(e,{emit:n,slots:t}){const{linkChildren:o}=m(i),l=a=>n("update:modelValue",a);return p(()=>e.modelValue,a=>n("change",a)),o({props:e,updateValue:l}),V(()=>e.modelValue),()=>{var a;return s("div",{class:C([e.direction]),role:"radiogroup"},[(a=t.default)==null?void 0:a.call(t)])}}});const j=u(w),[R,S]=d("radio");var $=r({name:R,props:b,emits:["update:modelValue"],setup(e,{emit:n,slots:t}){const{parent:o}=f(i),l=()=>(o?o.props.modelValue:e.modelValue)===e.name,a=()=>{o?o.updateValue(e.name):n("update:modelValue",e.name)};return()=>s(P,v({bem:S,role:"radio",parent:o,checked:l(),onToggle:a},e),k(t,["default","icon"]))}});const x=u($);export{j as R,x as a};
+>>>>>>> online:dist/assets/index-27d94e28.js

File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-291cdf48.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-2a04d291.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-2b482806.css


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-2bbbe5a7.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-2bff8e0a.js


+ 4 - 0
dist/assets/index-d6b5a70c.js → dist/assets/index-31dbe0c6.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD:dist/assets/index-d6b5a70c.js
 <<<<<<< HEAD:dist/assets/index-88d93c9d.js
 <<<<<<< HEAD:dist/assets/index-9795891d.js
 <<<<<<<< HEAD:dist/assets/index-309bfc9f.js
@@ -11,3 +12,6 @@ import{d as n,a as t,A as l,C as r}from"./index-86432905.js";import{b as u}from"
 =======
 import{d as n,a as t,A as l,C as r}from"./index-434359ae.js";import{b as u}from"./index-67ff33ff.js";import{I as a}from"./index-d7c57d44.js";const i="_popupResult_1smys_1",c="_resultTitle_1smys_6",m="_titleImg_1smys_15",p="_result_1smys_6",_="_yes_1smys_29",y="_no_1smys_33",d="_resultContent_1smys_36",s={popupResult:i,resultTitle:c,titleImg:m,result:p,yes:_,no:y,resultContent:d},g=n({name:"result-mode",props:{confirmButtonText:{type:String,default:"我知道了"},answerAnalysis:{type:String,default:""},questionTypeCode:{type:String,default:""}},emits:["close","conform"],setup(e,{emit:o}){return()=>t("div",{class:s.popupResult},[t("div",{class:s.resultTitle},[t(a,{src:u,class:s.titleImg},null),e.questionTypeCode==="PLAY"?"不合格!":"回答错误!"]),t("div",{class:s.resultContent},[t("span",null,[l("答案解析:")]),e.answerAnalysis||"无"]),t(r,{type:"primary",round:!0,class:s.btn,block:!0,onClick:()=>{o("conform"),o("close")}},{default:()=>[e.confirmButtonText]})])}});export{g as E};
 >>>>>>> iteration-20240516-member:dist/assets/index-d6b5a70c.js
+=======
+import{d as n,a as t,A as l,C as r}from"./index-5d38e327.js";import{b as u}from"./index-3c485ae4.js";import{I as a}from"./index-82331589.js";const i="_popupResult_1smys_1",c="_resultTitle_1smys_6",m="_titleImg_1smys_15",p="_result_1smys_6",_="_yes_1smys_29",y="_no_1smys_33",d="_resultContent_1smys_36",s={popupResult:i,resultTitle:c,titleImg:m,result:p,yes:_,no:y,resultContent:d},g=n({name:"result-mode",props:{confirmButtonText:{type:String,default:"我知道了"},answerAnalysis:{type:String,default:""},questionTypeCode:{type:String,default:""}},emits:["close","conform"],setup(e,{emit:o}){return()=>t("div",{class:s.popupResult},[t("div",{class:s.resultTitle},[t(a,{src:u,class:s.titleImg},null),e.questionTypeCode==="PLAY"?"不合格!":"回答错误!"]),t("div",{class:s.resultContent},[t("span",null,[l("答案解析:")]),e.answerAnalysis||"无"]),t(r,{type:"primary",round:!0,class:s.btn,block:!0,onClick:()=>{o("conform"),o("close")}},{default:()=>[e.confirmButtonText]})])}});export{g as E};
+>>>>>>> online:dist/assets/index-31dbe0c6.js

+ 4 - 0
dist/assets/index-04f9d589.js → dist/assets/index-31eda692.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD:dist/assets/index-04f9d589.js
 <<<<<<< HEAD:dist/assets/index-f5d5c72f.js
 <<<<<<< HEAD:dist/assets/index-a801cae1.js
 <<<<<<<< HEAD:dist/assets/index-b03e7585.js
@@ -11,3 +12,6 @@ import{c as P,b as g,d as W,r as v,x as C,bN as D,bP as E,a3 as q,a2 as A,w as L
 =======
 import{c as P,b as g,d as W,r as v,x as C,bN as D,bP as E,a3 as q,a2 as A,w as L,g as M,v as $,a as c,I,a4 as R,aQ as y,aA as O,a1 as Q,k as V}from"./index-434359ae.js";const[X,i]=P("notice-bar"),_={text:String,mode:String,color:String,delay:g(1),speed:g(60),leftIcon:String,wrapable:Boolean,background:String,scrollable:{type:Boolean,default:null}};var j=W({name:X,props:_,emits:["close","replay"],setup(e,{emit:m,slots:a}){let l=0,o=0,h;const d=v(),u=v(),t=C({show:!0,offset:0,duration:0}),k=()=>{if(a["left-icon"])return a["left-icon"]();if(e.leftIcon)return c(I,{class:i("left-icon"),name:e.leftIcon},null)},x=()=>{if(e.mode==="closeable")return"cross";if(e.mode==="link")return"arrow"},N=n=>{e.mode==="closeable"&&(t.show=!1,m("close",n))},p=()=>{if(a["right-icon"])return a["right-icon"]();const n=x();if(n)return c(I,{name:n,class:i("right-icon"),onClick:N},null)},S=()=>{t.offset=l,t.duration=0,O(()=>{y(()=>{t.offset=-o,t.duration=(o+l)/+e.speed,m("replay")})})},T=()=>{const n=e.scrollable===!1&&!e.wrapable,r={transform:t.offset?`translateX(${t.offset}px)`:"",transitionDuration:`${t.duration}s`};return c("div",{ref:d,role:"marquee",class:i("wrap")},[c("div",{ref:u,style:r,class:[i("content"),{"van-ellipsis":n}],onTransitionend:S},[a.default?a.default():e.text])])},s=()=>{const{delay:n,speed:r,scrollable:f}=e,B=Q(n)?+n*1e3:0;l=0,o=0,t.offset=0,t.duration=0,clearTimeout(h),h=setTimeout(()=>{if(!d.value||!u.value||f===!1)return;const w=R(d).width,b=R(u).width;(f||b>w)&&y(()=>{l=w,o=b,t.offset=-o,t.duration=o/+r})},B)};return D(s),E(s),q("pageshow",s),A({reset:s}),L(()=>[e.text,e.scrollable],s),()=>{const{color:n,wrapable:r,background:f}=e;return M(c("div",{role:"alert",class:i({wrapable:r}),style:{color:n,background:f}},[k(),T(),p()]),[[$,t.show]])}}});const F=V(j);export{F as N};
 >>>>>>> iteration-20240516-member:dist/assets/index-04f9d589.js
+=======
+import{c as P,b as g,d as W,r as v,x as C,bN as D,bP as E,a3 as q,a2 as A,w as L,g as M,v as $,a as c,I,a4 as R,aQ as y,aA as O,a1 as Q,k as V}from"./index-5d38e327.js";const[X,i]=P("notice-bar"),_={text:String,mode:String,color:String,delay:g(1),speed:g(60),leftIcon:String,wrapable:Boolean,background:String,scrollable:{type:Boolean,default:null}};var j=W({name:X,props:_,emits:["close","replay"],setup(e,{emit:m,slots:a}){let l=0,o=0,h;const d=v(),u=v(),t=C({show:!0,offset:0,duration:0}),k=()=>{if(a["left-icon"])return a["left-icon"]();if(e.leftIcon)return c(I,{class:i("left-icon"),name:e.leftIcon},null)},x=()=>{if(e.mode==="closeable")return"cross";if(e.mode==="link")return"arrow"},N=n=>{e.mode==="closeable"&&(t.show=!1,m("close",n))},p=()=>{if(a["right-icon"])return a["right-icon"]();const n=x();if(n)return c(I,{name:n,class:i("right-icon"),onClick:N},null)},S=()=>{t.offset=l,t.duration=0,O(()=>{y(()=>{t.offset=-o,t.duration=(o+l)/+e.speed,m("replay")})})},T=()=>{const n=e.scrollable===!1&&!e.wrapable,r={transform:t.offset?`translateX(${t.offset}px)`:"",transitionDuration:`${t.duration}s`};return c("div",{ref:d,role:"marquee",class:i("wrap")},[c("div",{ref:u,style:r,class:[i("content"),{"van-ellipsis":n}],onTransitionend:S},[a.default?a.default():e.text])])},s=()=>{const{delay:n,speed:r,scrollable:f}=e,B=Q(n)?+n*1e3:0;l=0,o=0,t.offset=0,t.duration=0,clearTimeout(h),h=setTimeout(()=>{if(!d.value||!u.value||f===!1)return;const w=R(d).width,b=R(u).width;(f||b>w)&&y(()=>{l=w,o=b,t.offset=-o,t.duration=o/+r})},B)};return D(s),E(s),q("pageshow",s),A({reset:s}),L(()=>[e.text,e.scrollable],s),()=>{const{color:n,wrapable:r,background:f}=e;return M(c("div",{role:"alert",class:i({wrapable:r}),style:{color:n,background:f}},[k(),T(),p()]),[[$,t.show]])}}});const F=V(j);export{F as N};
+>>>>>>> online:dist/assets/index-31eda692.js

+ 4 - 0
dist/assets/index-198888ba.js → dist/assets/index-3326b4d7.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD:dist/assets/index-198888ba.js
 <<<<<<< HEAD:dist/assets/index-5955b4f5.js
 <<<<<<< HEAD:dist/assets/index-19dd349c.js
 <<<<<<<< HEAD:dist/assets/index-9cb962e8.js
@@ -11,3 +12,6 @@ import{d as r,P as d,x as c,y as u,a,W as m,a7 as p,D as g}from"./index-86432905
 =======
 import{d as r,P as d,x as c,y as u,a,W as m,a7 as p,D as g}from"./index-434359ae.js";import{M as o}from"./index-7b53b958.js";import{u as f,a as y}from"./index-17c66f48.js";import{s as i,b as v}from"./banner1-8cdfa8cc.js";import{A as b}from"./index-182e53a6.js";import{I as k}from"./index-d7c57d44.js";import"./browser-504037ee.js";import"./index-ea989b38.js";import"./index-d887b5b4.js";const S=r({name:"instrument-detail",setup(){const l=d(),t=c({titleOpacity:0,background:"transparent",color:"#fff",detail:{},musicList:[],loading:!1}),n=async()=>{t.loading=!0;try{const{data:e}=await g.get("/edu-app/knowledgeWiki/detail/"+l.query.id);e.intros=e.intros.replace(/<video/gi,'<video style="width: 100% !important;" controlslist="nodownload" poster="https://oss.dayaedu.com/ktqy/1701759849244.png"'),t.detail=e||{},t.musicList=e.knowledgeWikiResources.map(s=>({id:s.id,name:s.name,url:s.url}))}catch(e){}t.loading=!1};return u(()=>{f(document,"scroll",()=>{const{y:e}=y();t.titleOpacity=e.value>100?1:e.value/100}),n()}),()=>a("div",{class:i.detail},[a("div",{class:i.bgSection},[a("img",{class:i.bg,src:t.detail.avatar||v},null)]),a(o,{position:"top"},{default:()=>[a(m,{border:!1,background:`rgba(255,255,255, ${t.titleOpacity})`,color:`rgba(51,51,51, ${t.titleOpacity})`,title:t.detail.name||""},null)]}),a("div",{class:i.container},[a("div",{class:i.instrumentLogo},[a(k,{class:i.logo,fit:"cover",src:t.detail.avatar},null)]),a("div",{class:i.title},[t.detail.name]),a("div",{class:i.content,innerHTML:t.detail.intros},null),!t.loading&&!t.detail.intros&&a(p,{description:"暂无内容"},null)]),a(o,{position:"bottom"},{default:()=>[t.musicList.length>0&&a(b,{musicList:t.musicList},null)]})])}});export{S as default};
 >>>>>>> iteration-20240516-member:dist/assets/index-198888ba.js
+=======
+import{d as r,P as d,x as c,y as u,a,W as m,a7 as p,D as g}from"./index-5d38e327.js";import{M as o}from"./index-7348f18e.js";import{u as f,a as y}from"./index-9cbbe862.js";import{s as i,b as v}from"./banner1-8cdfa8cc.js";import{A as b}from"./index-7f8ee803.js";import{I as k}from"./index-82331589.js";import"./browser-504037ee.js";import"./index-6ced602a.js";import"./index-8921ff0f.js";const S=r({name:"instrument-detail",setup(){const l=d(),t=c({titleOpacity:0,background:"transparent",color:"#fff",detail:{},musicList:[],loading:!1}),n=async()=>{t.loading=!0;try{const{data:e}=await g.get("/edu-app/knowledgeWiki/detail/"+l.query.id);e.intros=e.intros.replace(/<video/gi,'<video style="width: 100% !important;" controlslist="nodownload" poster="https://oss.dayaedu.com/ktqy/1701759849244.png"'),t.detail=e||{},t.musicList=e.knowledgeWikiResources.map(s=>({id:s.id,name:s.name,url:s.url}))}catch(e){}t.loading=!1};return u(()=>{f(document,"scroll",()=>{const{y:e}=y();t.titleOpacity=e.value>100?1:e.value/100}),n()}),()=>a("div",{class:i.detail},[a("div",{class:i.bgSection},[a("img",{class:i.bg,src:t.detail.avatar||v},null)]),a(o,{position:"top"},{default:()=>[a(m,{border:!1,background:`rgba(255,255,255, ${t.titleOpacity})`,color:`rgba(51,51,51, ${t.titleOpacity})`,title:t.detail.name||""},null)]}),a("div",{class:i.container},[a("div",{class:i.instrumentLogo},[a(k,{class:i.logo,fit:"cover",src:t.detail.avatar},null)]),a("div",{class:i.title},[t.detail.name]),a("div",{class:i.content,innerHTML:t.detail.intros},null),!t.loading&&!t.detail.intros&&a(p,{description:"暂无内容"},null)]),a(o,{position:"bottom"},{default:()=>[t.musicList.length>0&&a(b,{musicList:t.musicList},null)]})])}});export{S as default};
+>>>>>>> online:dist/assets/index-3326b4d7.js

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-3505fc03.css


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-3556fcde.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-36b42407.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-3a4f63ac.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-3c42cd67.js


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-3c485ae4.js


+ 4 - 0
dist/assets/index-d82ce7f1.js → dist/assets/index-3d76eec6.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD:dist/assets/index-d82ce7f1.js
 <<<<<<< HEAD:dist/assets/index-11a04f7d.js
 <<<<<<< HEAD:dist/assets/index-40aadf83.js
 <<<<<<<< HEAD:dist/assets/index-4cf5bbe1.js
@@ -11,3 +12,6 @@ import{c as x,t as f,n as m,b as N,d as v,ag as _,a as i,o as b,b2 as q,k as p,a
 =======
 import{c as x,t as f,n as m,b as N,d as v,ag as _,a as i,o as b,b2 as q,k as p,ai as O,b3 as T,aj as V,b4 as $,e as P,b5 as z,h as D,b6 as E,I as j}from"./index-434359ae.js";const[h,w]=x("grid"),K={square:Boolean,center:f,border:f,gutter:m,reverse:Boolean,iconSize:m,direction:String,clickable:Boolean,columnNum:N(4)},S=Symbol(h);var L=v({name:h,props:K,setup(e,{slots:t}){const{linkChildren:o}=_(S);return o({props:e}),()=>{var c;return i("div",{style:{paddingLeft:b(e.gutter)},class:[w(),{[q]:e.border&&!e.gutter}]},[(c=t.default)==null?void 0:c.call(t)])}}});const H=p(L),[U,l]=x("grid-item"),Y=O({},T,{dot:Boolean,text:String,icon:String,badge:m,iconColor:String,iconPrefix:String,badgeProps:Object});var A=v({name:U,props:Y,setup(e,{slots:t}){const{parent:o,index:c}=V(S),B=$();if(!o){console.error("[Vant] <GridItem> must be a child component of <Grid>.");return}const I=P(()=>{const{square:s,gutter:n,columnNum:r}=o.props,d=`${100/+r}%`,a={flexBasis:d};if(s)a.paddingTop=d;else if(n){const u=b(n);a.paddingRight=u,c.value>=+r&&(a.marginTop=u)}return a}),y=P(()=>{const{square:s,gutter:n}=o.props;if(s&&n){const r=b(n);return{right:r,bottom:r,height:"auto"}}}),C=()=>{if(t.icon)return i(E,D({dot:e.dot,content:e.badge},e.badgeProps),{default:t.icon});if(e.icon)return i(j,{dot:e.dot,name:e.icon,size:o.props.iconSize,badge:e.badge,class:l("icon"),color:e.iconColor,badgeProps:e.badgeProps,classPrefix:e.iconPrefix},null)},R=()=>{if(t.text)return t.text();if(e.text)return i("span",{class:l("text")},[e.text])},k=()=>t.default?t.default():[C(),R()];return()=>{const{center:s,border:n,square:r,gutter:d,reverse:a,direction:u,clickable:g}=o.props,G=[l("content",[u,{center:s,square:r,reverse:a,clickable:g,surround:n&&d}]),{[z]:n}];return i("div",{class:[l({square:r})],style:I.value},[i("div",{role:g?"button":void 0,class:G,style:y.value,tabindex:g?0:void 0,onClick:B},[k()])])}}});const J=p(A);export{H as G,J as a};
 >>>>>>> iteration-20240516-member:dist/assets/index-d82ce7f1.js
+=======
+import{c as x,t as f,n as m,b as N,d as v,ag as _,a as i,o as b,b2 as q,k as p,ai as O,b3 as T,aj as V,b4 as $,e as P,b5 as z,h as D,b6 as E,I as j}from"./index-5d38e327.js";const[h,w]=x("grid"),K={square:Boolean,center:f,border:f,gutter:m,reverse:Boolean,iconSize:m,direction:String,clickable:Boolean,columnNum:N(4)},S=Symbol(h);var L=v({name:h,props:K,setup(e,{slots:t}){const{linkChildren:o}=_(S);return o({props:e}),()=>{var c;return i("div",{style:{paddingLeft:b(e.gutter)},class:[w(),{[q]:e.border&&!e.gutter}]},[(c=t.default)==null?void 0:c.call(t)])}}});const H=p(L),[U,l]=x("grid-item"),Y=O({},T,{dot:Boolean,text:String,icon:String,badge:m,iconColor:String,iconPrefix:String,badgeProps:Object});var A=v({name:U,props:Y,setup(e,{slots:t}){const{parent:o,index:c}=V(S),B=$();if(!o){console.error("[Vant] <GridItem> must be a child component of <Grid>.");return}const I=P(()=>{const{square:s,gutter:n,columnNum:r}=o.props,d=`${100/+r}%`,a={flexBasis:d};if(s)a.paddingTop=d;else if(n){const u=b(n);a.paddingRight=u,c.value>=+r&&(a.marginTop=u)}return a}),y=P(()=>{const{square:s,gutter:n}=o.props;if(s&&n){const r=b(n);return{right:r,bottom:r,height:"auto"}}}),C=()=>{if(t.icon)return i(E,D({dot:e.dot,content:e.badge},e.badgeProps),{default:t.icon});if(e.icon)return i(j,{dot:e.dot,name:e.icon,size:o.props.iconSize,badge:e.badge,class:l("icon"),color:e.iconColor,badgeProps:e.badgeProps,classPrefix:e.iconPrefix},null)},R=()=>{if(t.text)return t.text();if(e.text)return i("span",{class:l("text")},[e.text])},k=()=>t.default?t.default():[C(),R()];return()=>{const{center:s,border:n,square:r,gutter:d,reverse:a,direction:u,clickable:g}=o.props,G=[l("content",[u,{center:s,square:r,reverse:a,clickable:g,surround:n&&d}]),{[z]:n}];return i("div",{class:[l({square:r})],style:I.value},[i("div",{role:g?"button":void 0,class:G,style:y.value,tabindex:g?0:void 0,onClick:B},[k()])])}}});const J=p(A);export{H as G,J as a};
+>>>>>>> online:dist/assets/index-3d76eec6.js

File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-3dd0dc40.js


+ 4 - 0
dist/assets/index-d2fde87d.js → dist/assets/index-3dec1df0.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD:dist/assets/index-d2fde87d.js
 <<<<<<< HEAD:dist/assets/index-5afc88a0.js
 <<<<<<< HEAD:dist/assets/index-4116825c.js
 <<<<<<<< HEAD:dist/assets/index-595ca046.js
@@ -11,3 +12,6 @@ import{c as g,m as d,t as C,b as h,d as m,ag as N,e as p,a as v,n as S,aj as _,k
 =======
 import{c as g,m as d,t as C,b as h,d as m,ag as N,e as p,a as v,n as S,aj as _,k as P}from"./index-434359ae.js";const[$,j]=g("row"),w=Symbol($),k={tag:d("div"),wrap:C,align:String,gutter:h(0),justify:String};var E=m({name:$,props:k,setup(o,{slots:r}){const{children:l,linkChildren:u}=N(w),i=p(()=>{const e=[[]];let t=0;return l.forEach((a,s)=>{t+=Number(a.span),t>24?(e.push([s]),t-=24):e[e.length-1].push(s)}),e}),n=p(()=>{const e=Number(o.gutter),t=[];return e&&i.value.forEach(a=>{const s=e*(a.length-1)/a.length;a.forEach((c,b)=>{if(b===0)t.push({right:s});else{const f=e-t[c-1].right,y=s-f;t.push({left:f,right:y})}})}),t});return u({spaces:n}),()=>{const{tag:e,wrap:t,align:a,justify:s}=o;return v(e,{class:j({[`align-${a}`]:a,[`justify-${s}`]:s,nowrap:!t})},{default:()=>{var c;return[(c=r.default)==null?void 0:c.call(r)]}})}}});const[R,x]=g("col"),I={tag:d("div"),span:h(0),offset:S};var K=m({name:R,props:I,setup(o,{slots:r}){const{parent:l,index:u}=_(w),i=p(()=>{if(!l)return;const{spaces:n}=l;if(n&&n.value&&n.value[u.value]){const{left:e,right:t}=n.value[u.value];return{paddingLeft:e?`${e}px`:null,paddingRight:t?`${t}px`:null}}});return()=>{const{tag:n,span:e,offset:t}=o;return v(n,{style:i.value,class:x({[e]:e,[`offset-${t}`]:t})},{default:()=>{var a;return[(a=r.default)==null?void 0:a.call(r)]}})}}});const O=P(K),V=P(E);export{O as C,V as R};
 >>>>>>> iteration-20240516-member:dist/assets/index-d2fde87d.js
+=======
+import{c as g,m as d,t as C,b as h,d as m,ag as N,e as p,a as v,n as S,aj as _,k as P}from"./index-5d38e327.js";const[$,j]=g("row"),w=Symbol($),k={tag:d("div"),wrap:C,align:String,gutter:h(0),justify:String};var E=m({name:$,props:k,setup(o,{slots:r}){const{children:l,linkChildren:u}=N(w),i=p(()=>{const e=[[]];let t=0;return l.forEach((a,s)=>{t+=Number(a.span),t>24?(e.push([s]),t-=24):e[e.length-1].push(s)}),e}),n=p(()=>{const e=Number(o.gutter),t=[];return e&&i.value.forEach(a=>{const s=e*(a.length-1)/a.length;a.forEach((c,b)=>{if(b===0)t.push({right:s});else{const f=e-t[c-1].right,y=s-f;t.push({left:f,right:y})}})}),t});return u({spaces:n}),()=>{const{tag:e,wrap:t,align:a,justify:s}=o;return v(e,{class:j({[`align-${a}`]:a,[`justify-${s}`]:s,nowrap:!t})},{default:()=>{var c;return[(c=r.default)==null?void 0:c.call(r)]}})}}});const[R,x]=g("col"),I={tag:d("div"),span:h(0),offset:S};var K=m({name:R,props:I,setup(o,{slots:r}){const{parent:l,index:u}=_(w),i=p(()=>{if(!l)return;const{spaces:n}=l;if(n&&n.value&&n.value[u.value]){const{left:e,right:t}=n.value[u.value];return{paddingLeft:e?`${e}px`:null,paddingRight:t?`${t}px`:null}}});return()=>{const{tag:n,span:e,offset:t}=o;return v(n,{style:i.value,class:x({[e]:e,[`offset-${t}`]:t})},{default:()=>{var a;return[(a=r.default)==null?void 0:a.call(r)]}})}}});const O=P(K),V=P(E);export{O as C,V as R};
+>>>>>>> online:dist/assets/index-3dec1df0.js

+ 4 - 0
dist/assets/index-2a568380.js → dist/assets/index-3f28b475.js

@@ -1,3 +1,4 @@
+<<<<<<< HEAD:dist/assets/index-2a568380.js
 <<<<<<< HEAD:dist/assets/index-b28944db.js
 <<<<<<< HEAD:dist/assets/index-ee37a43a.js
 <<<<<<<< HEAD:dist/assets/index-ddbf2f7b.js
@@ -11,3 +12,6 @@ import{d as r,P as d,x as c,y as u,a as e,W as m,a7 as p,D as f}from"./index-864
 =======
 import{d as r,P as d,x as c,y as u,a as e,W as m,a7 as p,D as f}from"./index-434359ae.js";import{M as s}from"./index-7b53b958.js";import{u as g,a as y}from"./index-17c66f48.js";import{s as i}from"./index.module-f489c00d.js";import{A as v}from"./index-182e53a6.js";import{I as k}from"./index-d7c57d44.js";import"./browser-504037ee.js";import"./index-ea989b38.js";import"./index-d887b5b4.js";const E=r({name:"instrument-detail",setup(){const l=d(),t=c({titleOpacity:0,background:"transparent",color:"#fff",detail:{},musicList:[],loading:!1}),n=async()=>{t.loading=!0;try{const{data:a}=await f.get("/edu-app/knowledgeWiki/detail/"+l.query.id);a.intros=a.intros.replace(/<video/gi,'<video style="width: 100% !important;" controlslist="nodownload" poster="https://oss.dayaedu.com/ktqy/1701759849244.png"'),t.detail=a||{},t.musicList=a.knowledgeWikiResources.map(o=>({id:o.id,name:o.name,url:o.url}))}catch(a){}t.loading=!1};return u(()=>{g(document,"scroll",()=>{const{y:a}=y();t.titleOpacity=a.value>100?1:a.value/100}),n()}),()=>e("div",{class:i.detail},[e(s,{position:"top"},{default:()=>[e(m,{border:!1,background:`rgba(255,255,255, ${t.titleOpacity})`,color:`rgba(51,51,51, ${t.titleOpacity})`,title:t.detail.name||""},null)]}),e("div",{class:i.container},[e("div",{class:i.instrumentLogo},[e(k,{class:i.logo,fit:"cover",src:t.detail.avatar},null)]),e("div",{class:i.title},[t.detail.name]),e("div",{class:i.content,innerHTML:t.detail.intros},null),!t.loading&&!t.detail.intros&&e(p,{description:"暂无内容"},null)]),e(s,{position:"bottom"},{default:()=>[t.musicList.length>0&&e(v,{musicList:t.musicList},null)]})])}});export{E as default};
 >>>>>>> iteration-20240516-member:dist/assets/index-2a568380.js
+=======
+import{d as r,P as d,x as c,y as u,a as e,W as m,a7 as p,D as f}from"./index-5d38e327.js";import{M as s}from"./index-7348f18e.js";import{u as g,a as y}from"./index-9cbbe862.js";import{s as i}from"./index.module-f489c00d.js";import{A as v}from"./index-7f8ee803.js";import{I as k}from"./index-82331589.js";import"./browser-504037ee.js";import"./index-6ced602a.js";import"./index-8921ff0f.js";const E=r({name:"instrument-detail",setup(){const l=d(),t=c({titleOpacity:0,background:"transparent",color:"#fff",detail:{},musicList:[],loading:!1}),n=async()=>{t.loading=!0;try{const{data:a}=await f.get("/edu-app/knowledgeWiki/detail/"+l.query.id);a.intros=a.intros.replace(/<video/gi,'<video style="width: 100% !important;" controlslist="nodownload" poster="https://oss.dayaedu.com/ktqy/1701759849244.png"'),t.detail=a||{},t.musicList=a.knowledgeWikiResources.map(o=>({id:o.id,name:o.name,url:o.url}))}catch(a){}t.loading=!1};return u(()=>{g(document,"scroll",()=>{const{y:a}=y();t.titleOpacity=a.value>100?1:a.value/100}),n()}),()=>e("div",{class:i.detail},[e(s,{position:"top"},{default:()=>[e(m,{border:!1,background:`rgba(255,255,255, ${t.titleOpacity})`,color:`rgba(51,51,51, ${t.titleOpacity})`,title:t.detail.name||""},null)]}),e("div",{class:i.container},[e("div",{class:i.instrumentLogo},[e(k,{class:i.logo,fit:"cover",src:t.detail.avatar},null)]),e("div",{class:i.title},[t.detail.name]),e("div",{class:i.content,innerHTML:t.detail.intros},null),!t.loading&&!t.detail.intros&&e(p,{description:"暂无内容"},null)]),e(s,{position:"bottom"},{default:()=>[t.musicList.length>0&&e(v,{musicList:t.musicList},null)]})])}});export{E as default};
+>>>>>>> online:dist/assets/index-3f28b475.js

File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-407a8095.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-407bfd9c.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-42c0cdbc.css


File diff suppressed because it is too large
+ 1 - 0
dist/assets/index-43536e92.js


Some files were not shown because too many files changed in this diff