修改样式

dist/assets/Checker-65e16c22.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/Checker-7f794cc6.js
+import{ab as m,m as g,n as C,d as P,ai as S,b6 as x,t as z,r as y,e as r,a as d,I as B,o as D}from"./index-0dce60df.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};
+========
+import{ab as m,m as g,n as C,d as P,ai as S,b6 as x,t as z,r as y,e as r,a as d,I as B,o as D}from"./index-4f770187.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-20241115:dist/assets/Checker-65e16c22.js

dist/assets/Checker-7f794cc6.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/Checker-7f794cc6.js
 import{ab as m,m as g,n as C,d as P,ai as S,b6 as x,t as z,r as y,e as r,a as d,I as B,o as D}from"./index-0dce60df.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};
+========
+import{ab as m,m as g,n as C,d as P,ai as S,b6 as x,t as z,r as y,e as r,a as d,I as B,o as D}from"./index-4f770187.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-20241115:dist/assets/Checker-65e16c22.js

dist/assets/Checker-legacy-118f8dd1.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/Checker-legacy-118f8dd1.js
 System.register(["./index-legacy-9dc9b3ae.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.b6,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])}}}))}}}));
+========
+System.register(["./index-legacy-dc69775f.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.b6,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-20241115:dist/assets/Checker-legacy-5e38beb8.js

dist/assets/Checker-legacy-5e38beb8.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/Checker-legacy-118f8dd1.js
+System.register(["./index-legacy-9dc9b3ae.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.b6,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])}}}))}}}));
+========
+System.register(["./index-legacy-dc69775f.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.b6,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-20241115:dist/assets/Checker-legacy-5e38beb8.js

dist/assets/api-0fecc53b.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/api-e4a4594d.js
+import{D as s}from"./index-0dce60df.js";const r=e=>s.get(`/edu-app/userMusic/detail/${e}`),u=e=>s.get(`/edu-app/open/userMusic/detail/${e}`),t=e=>s.post("/edu-app/userMusicStar/page",{data:e}),p=e=>s.post("/edu-app/open/userMusic/page",{data:e}),i=e=>s.post("/edu-app/userMusicStar/star",{data:e}),o=e=>s.post("/edu-app/userMusic/save",{data:e}),c=e=>s.post("/edu-app/userMusic/remove",{requestType:"form",params:e}),n=e=>s.post("/edu-app/open/user/verification",{data:e});export{r as a,t as b,c,o as d,u as e,i as f,n as g,p as h};
+========
+import{D as s}from"./index-4f770187.js";const r=e=>s.get(`/edu-app/userMusic/detail/${e}`),u=e=>s.get(`/edu-app/open/userMusic/detail/${e}`),t=e=>s.post("/edu-app/userMusicStar/page",{data:e}),p=e=>s.post("/edu-app/open/userMusic/page",{data:e}),i=e=>s.post("/edu-app/userMusicStar/star",{data:e}),o=e=>s.post("/edu-app/userMusic/save",{data:e}),c=e=>s.post("/edu-app/userMusic/remove",{requestType:"form",params:e}),n=e=>s.post("/edu-app/open/user/verification",{data:e});export{r as a,t as b,c,o as d,u as e,i as f,n as g,p as h};
+>>>>>>>> iteration-20241115:dist/assets/api-0fecc53b.js

dist/assets/api-1294934d.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/api-4c3e8bf9.js
+import{D as r}from"./index-0dce60df.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-4f770187.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};
+>>>>>>>> iteration-20241115:dist/assets/api-1294934d.js

dist/assets/api-4c3e8bf9.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/api-4c3e8bf9.js
 import{D as r}from"./index-0dce60df.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-4f770187.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};
+>>>>>>>> iteration-20241115:dist/assets/api-1294934d.js

dist/assets/api-68ea0158.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/api-d86ceed6.js
+import{D as e}from"./index-0dce60df.js";const r=()=>e.get("/edu-app/open/sysArea/queryAllProvince"),s=a=>e.post("/edu-app/open/school/save",{data:a});export{r as a,s as b};
+========
+import{D as e}from"./index-4f770187.js";const r=()=>e.get("/edu-app/open/sysArea/queryAllProvince"),s=a=>e.post("/edu-app/open/school/save",{data:a});export{r as a,s as b};
+>>>>>>>> iteration-20241115:dist/assets/api-68ea0158.js

dist/assets/api-8bb31a83.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/api-8bb31a83.js
 import{D as t}from"./index-0dce60df.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};
+========
+import{D as t}from"./index-4f770187.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-20241115:dist/assets/api-ad26c44a.js

dist/assets/api-ad26c44a.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/api-8bb31a83.js
+import{D as t}from"./index-0dce60df.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};
+========
+import{D as t}from"./index-4f770187.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-20241115:dist/assets/api-ad26c44a.js

dist/assets/api-d86ceed6.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/api-d86ceed6.js
 import{D as e}from"./index-0dce60df.js";const r=()=>e.get("/edu-app/open/sysArea/queryAllProvince"),s=a=>e.post("/edu-app/open/school/save",{data:a});export{r as a,s as b};
+========
+import{D as e}from"./index-4f770187.js";const r=()=>e.get("/edu-app/open/sysArea/queryAllProvince"),s=a=>e.post("/edu-app/open/school/save",{data:a});export{r as a,s as b};
+>>>>>>>> iteration-20241115:dist/assets/api-68ea0158.js

dist/assets/api-e4a4594d.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/api-e4a4594d.js
 import{D as s}from"./index-0dce60df.js";const r=e=>s.get(`/edu-app/userMusic/detail/${e}`),u=e=>s.get(`/edu-app/open/userMusic/detail/${e}`),t=e=>s.post("/edu-app/userMusicStar/page",{data:e}),p=e=>s.post("/edu-app/open/userMusic/page",{data:e}),i=e=>s.post("/edu-app/userMusicStar/star",{data:e}),o=e=>s.post("/edu-app/userMusic/save",{data:e}),c=e=>s.post("/edu-app/userMusic/remove",{requestType:"form",params:e}),n=e=>s.post("/edu-app/open/user/verification",{data:e});export{r as a,t as b,c,o as d,u as e,i as f,n as g,p as h};
+========
+import{D as s}from"./index-4f770187.js";const r=e=>s.get(`/edu-app/userMusic/detail/${e}`),u=e=>s.get(`/edu-app/open/userMusic/detail/${e}`),t=e=>s.post("/edu-app/userMusicStar/page",{data:e}),p=e=>s.post("/edu-app/open/userMusic/page",{data:e}),i=e=>s.post("/edu-app/userMusicStar/star",{data:e}),o=e=>s.post("/edu-app/userMusic/save",{data:e}),c=e=>s.post("/edu-app/userMusic/remove",{requestType:"form",params:e}),n=e=>s.post("/edu-app/open/user/verification",{data:e});export{r as a,t as b,c,o as d,u as e,i as f,n as g,p as h};
+>>>>>>>> iteration-20241115:dist/assets/api-0fecc53b.js

dist/assets/api-f517253f.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/api-f8e27bbc.js
+import{D as t}from"./index-0dce60df.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};
+========
+import{D as t}from"./index-4f770187.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-20241115:dist/assets/api-f517253f.js

dist/assets/api-f8e27bbc.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/api-f8e27bbc.js
 import{D as t}from"./index-0dce60df.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};
+========
+import{D as t}from"./index-4f770187.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-20241115:dist/assets/api-f517253f.js

dist/assets/api-legacy-0ae1a707.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/api-legacy-0ae1a707.js
 System.register(["./index-legacy-9dc9b3ae.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})))}}}));
+========
+System.register(["./index-legacy-dc69775f.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-20241115:dist/assets/api-legacy-ac6afe63.js

dist/assets/api-legacy-1af9bdc5.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/api-legacy-1f16f13a.js
+System.register(["./index-legacy-9dc9b3ae.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-dc69775f.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)))}}}));
+>>>>>>>> iteration-20241115:dist/assets/api-legacy-1af9bdc5.js

dist/assets/api-legacy-1f16f13a.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/api-legacy-1f16f13a.js
 System.register(["./index-legacy-9dc9b3ae.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-dc69775f.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)))}}}));
+>>>>>>>> iteration-20241115:dist/assets/api-legacy-1af9bdc5.js

dist/assets/api-legacy-6cd1f393.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/api-legacy-6cd1f393.js
 System.register(["./index-legacy-9dc9b3ae.js"],(function(e,t){"use strict";var s;return{setters:[e=>{s=e.D}],execute:function(){e("a",(()=>s.get("/edu-app/open/sysArea/queryAllProvince"))),e("b",(e=>s.post("/edu-app/open/school/save",{data:e})))}}}));
+========
+System.register(["./index-legacy-dc69775f.js"],(function(e,t){"use strict";var s;return{setters:[e=>{s=e.D}],execute:function(){e("a",(()=>s.get("/edu-app/open/sysArea/queryAllProvince"))),e("b",(e=>s.post("/edu-app/open/school/save",{data:e})))}}}));
+>>>>>>>> iteration-20241115:dist/assets/api-legacy-e3d70be5.js

dist/assets/api-legacy-ac6afe63.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/api-legacy-0ae1a707.js
+System.register(["./index-legacy-9dc9b3ae.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})))}}}));
+========
+System.register(["./index-legacy-dc69775f.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-20241115:dist/assets/api-legacy-ac6afe63.js

dist/assets/api-legacy-d1281ee9.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/api-legacy-da383b25.js
+System.register(["./index-legacy-9dc9b3ae.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})))}}}));
+========
+System.register(["./index-legacy-dc69775f.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-20241115:dist/assets/api-legacy-d1281ee9.js

dist/assets/api-legacy-da383b25.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/api-legacy-da383b25.js
 System.register(["./index-legacy-9dc9b3ae.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})))}}}));
+========
+System.register(["./index-legacy-dc69775f.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-20241115:dist/assets/api-legacy-d1281ee9.js

dist/assets/api-legacy-da97303d.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/api-legacy-e08ba034.js
+System.register(["./index-legacy-9dc9b3ae.js"],(function(e,a){"use strict";var s;return{setters:[e=>{s=e.D}],execute:function(){e("a",(e=>s.get(`/edu-app/userMusic/detail/${e}`))),e("e",(e=>s.get(`/edu-app/open/userMusic/detail/${e}`))),e("b",(e=>s.post("/edu-app/userMusicStar/page",{data:e}))),e("h",(e=>s.post("/edu-app/open/userMusic/page",{data:e}))),e("f",(e=>s.post("/edu-app/userMusicStar/star",{data:e}))),e("d",(e=>s.post("/edu-app/userMusic/save",{data:e}))),e("c",(e=>s.post("/edu-app/userMusic/remove",{requestType:"form",params:e}))),e("g",(e=>s.post("/edu-app/open/user/verification",{data:e})))}}}));
+========
+System.register(["./index-legacy-dc69775f.js"],(function(e,a){"use strict";var s;return{setters:[e=>{s=e.D}],execute:function(){e("a",(e=>s.get(`/edu-app/userMusic/detail/${e}`))),e("e",(e=>s.get(`/edu-app/open/userMusic/detail/${e}`))),e("b",(e=>s.post("/edu-app/userMusicStar/page",{data:e}))),e("h",(e=>s.post("/edu-app/open/userMusic/page",{data:e}))),e("f",(e=>s.post("/edu-app/userMusicStar/star",{data:e}))),e("d",(e=>s.post("/edu-app/userMusic/save",{data:e}))),e("c",(e=>s.post("/edu-app/userMusic/remove",{requestType:"form",params:e}))),e("g",(e=>s.post("/edu-app/open/user/verification",{data:e})))}}}));
+>>>>>>>> iteration-20241115:dist/assets/api-legacy-da97303d.js

dist/assets/api-legacy-e08ba034.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/api-legacy-e08ba034.js
 System.register(["./index-legacy-9dc9b3ae.js"],(function(e,a){"use strict";var s;return{setters:[e=>{s=e.D}],execute:function(){e("a",(e=>s.get(`/edu-app/userMusic/detail/${e}`))),e("e",(e=>s.get(`/edu-app/open/userMusic/detail/${e}`))),e("b",(e=>s.post("/edu-app/userMusicStar/page",{data:e}))),e("h",(e=>s.post("/edu-app/open/userMusic/page",{data:e}))),e("f",(e=>s.post("/edu-app/userMusicStar/star",{data:e}))),e("d",(e=>s.post("/edu-app/userMusic/save",{data:e}))),e("c",(e=>s.post("/edu-app/userMusic/remove",{requestType:"form",params:e}))),e("g",(e=>s.post("/edu-app/open/user/verification",{data:e})))}}}));
+========
+System.register(["./index-legacy-dc69775f.js"],(function(e,a){"use strict";var s;return{setters:[e=>{s=e.D}],execute:function(){e("a",(e=>s.get(`/edu-app/userMusic/detail/${e}`))),e("e",(e=>s.get(`/edu-app/open/userMusic/detail/${e}`))),e("b",(e=>s.post("/edu-app/userMusicStar/page",{data:e}))),e("h",(e=>s.post("/edu-app/open/userMusic/page",{data:e}))),e("f",(e=>s.post("/edu-app/userMusicStar/star",{data:e}))),e("d",(e=>s.post("/edu-app/userMusic/save",{data:e}))),e("c",(e=>s.post("/edu-app/userMusic/remove",{requestType:"form",params:e}))),e("g",(e=>s.post("/edu-app/open/user/verification",{data:e})))}}}));
+>>>>>>>> iteration-20241115:dist/assets/api-legacy-da97303d.js

dist/assets/api-legacy-e3d70be5.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/api-legacy-6cd1f393.js
+System.register(["./index-legacy-9dc9b3ae.js"],(function(e,t){"use strict";var s;return{setters:[e=>{s=e.D}],execute:function(){e("a",(()=>s.get("/edu-app/open/sysArea/queryAllProvince"))),e("b",(e=>s.post("/edu-app/open/school/save",{data:e})))}}}));
+========
+System.register(["./index-legacy-dc69775f.js"],(function(e,t){"use strict";var s;return{setters:[e=>{s=e.D}],execute:function(){e("a",(()=>s.get("/edu-app/open/sysArea/queryAllProvince"))),e("b",(e=>s.post("/edu-app/open/school/save",{data:e})))}}}));
+>>>>>>>> iteration-20241115:dist/assets/api-legacy-e3d70be5.js

dist/assets/detail-5935ee53.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/detail-b56fa730.js
+import{d as o,P as r,q as c,r as i,y as d,a as e,c1 as p,W as v,A as f,F as m,D as y}from"./index-0dce60df.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};
+========
+import{d as o,P as r,q as c,r as i,y as d,a as e,c1 as p,W as v,A as f,F as m,D as y}from"./index-4f770187.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-20241115:dist/assets/detail-5935ee53.js

dist/assets/detail-b56fa730.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/detail-b56fa730.js
 import{d as o,P as r,q as c,r as i,y as d,a as e,c1 as p,W as v,A as f,F as m,D as y}from"./index-0dce60df.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};
+========
+import{d as o,P as r,q as c,r as i,y as d,a as e,c1 as p,W as v,A as f,F as m,D as y}from"./index-4f770187.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-20241115:dist/assets/detail-5935ee53.js

dist/assets/detail-legacy-09431ca2.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/detail-legacy-1a55f04f.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-9dc9b3ae.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.c1,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)])])])}}))}}}))}();
+========
+!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-dc69775f.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.c1,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-20241115:dist/assets/detail-legacy-09431ca2.js

dist/assets/detail-legacy-1a55f04f.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/detail-legacy-1a55f04f.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-9dc9b3ae.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.c1,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)])])])}}))}}}))}();
+========
+!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-dc69775f.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.c1,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-20241115:dist/assets/detail-legacy-09431ca2.js

dist/assets/imageFunction-9db501a8.js

@@ -0,0 +1 @@
+const n=""+new URL("logoWatermark-270788fc.png",import.meta.url).href,g=async a=>{try{const t=document.createElement("img");t.setAttribute("crossOrigin","anonymous"),n&&typeof n=="string"&&n.includes("data:image"),t.src=n,await new Promise(i=>t.onload=i);const e=document.createElement("canvas");e.width=a.width,e.height=a.height;const o=e.getContext("2d");o.drawImage(a,0,0);const r=document.createElement("canvas");r.width=280,r.height=220,r.getContext("2d").drawImage(t,80,80);const c=o.createPattern(r,"repeat");return o.fillStyle=c,o.fillRect(0,0,e.width,e.height),e}catch(t){console.log(t)}},m=(a,t=1)=>a.toDataURL("image/png",t);export{g as a,m as c};

dist/assets/imageFunction-legacy-98bd6cb2.js

@@ -0,0 +1 @@
+!function(){function t(t,e,n,r,o,c,i){try{var a=t[c](i),u=a.value}catch(s){return void n(s)}a.done?e(u):Promise.resolve(u).then(r,o)}System.register([],(function(e,n){"use strict";return{execute:function(){const r=""+new URL("logoWatermark-270788fc.png",n.meta.url).href;e("a",function(){var e,n=(e=function*(t){try{const e=document.createElement("img");e.setAttribute("crossOrigin","anonymous"),r&&"string"==typeof r&&r.includes("data:image"),e.src=r,yield new Promise((t=>e.onload=t));const n=document.createElement("canvas");n.width=t.width,n.height=t.height;const o=n.getContext("2d");o.drawImage(t,0,0);const c=document.createElement("canvas");c.width=280,c.height=220,c.getContext("2d").drawImage(e,80,80);const i=o.createPattern(c,"repeat");return o.fillStyle=i,o.fillRect(0,0,n.width,n.height),n}catch(e){console.log(e)}},function(){var n=this,r=arguments;return new Promise((function(o,c){var i=e.apply(n,r);function a(e){t(i,o,c,a,u,"next",e)}function u(e){t(i,o,c,a,u,"throw",e)}a(void 0)}))});return function(t){return n.apply(this,arguments)}}()),e("c",((t,e=1)=>t.toDataURL("image/png",e)))}}}))}();

dist/assets/index-0e4d184d.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-0e4d184d.js
 import{c as C,b as L,m as w,t as B,d as E,r as h,bB as R,w as x,bC as N,y,a2 as _,a3 as z,a as r,z as D,a4 as b,bD as F,L as H,k as I}from"./index-0dce60df.js";import{u as M}from"./use-tab-status-f98f4aa3.js";const[U,o,V]=C("list"),j={error:Boolean,offset:L(300),loading:Boolean,disabled:Boolean,finished:Boolean,errorText:String,direction:w("down"),loadingText:String,finishedText:String,immediateCheck:B};var q=E({name:U,props:j,emits:["load","update:error","update:loading"],setup(e,{emit:c,slots:a}){const d=h(e.loading),u=h(),g=h(),s=M(),m=R(u),n=()=>{D(()=>{if(d.value||e.finished||e.disabled||e.error||(s==null?void 0:s.value)===!1)return;const{direction:t}=e,l=+e.offset,i=b(m);if(!i.height||F(u))return;let f=!1;const v=b(g);t==="up"?f=i.top-v.top<=l:f=v.bottom-i.bottom<=l,f&&(d.value=!0,c("update:loading",!0),c("load"))})},T=()=>{if(e.finished){const t=a.finished?a.finished():e.finishedText;if(t)return r("div",{class:o("finished-text")},[t])}},k=()=>{c("update:error",!1),n()},P=()=>{if(e.error){const t=a.error?a.error():e.errorText;if(t)return r("div",{role:"button",class:o("error-text"),tabindex:0,onClick:k},[t])}},S=()=>{if(d.value&&!e.finished&&!e.disabled)return r("div",{class:o("loading")},[a.loading?a.loading():r(H,{class:o("loading-icon")},{default:()=>[e.loadingText||V("loading")]})])};return x(()=>[e.loading,e.finished,e.error],n),s&&x(s,t=>{t&&n()}),N(()=>{d.value=e.loading}),y(()=>{e.immediateCheck&&n()}),_({check:n}),z("scroll",n,{target:m,passive:!0}),()=>{var t;const l=(t=a.default)==null?void 0:t.call(a),i=r("div",{ref:g,class:o("placeholder")},null);return r("div",{ref:u,role:"feed",class:o(),"aria-busy":d.value},[e.direction==="down"?l:i,S(),T(),P(),e.direction==="up"?l:i])}}});const J=I(q);export{J as L};
+========
+import{c as C,b as L,m as w,t as B,d as E,r as h,bB as R,w as x,bC as N,y,a2 as _,a3 as z,a as r,z as D,a4 as b,bD as F,L as H,k as I}from"./index-4f770187.js";import{u as M}from"./use-tab-status-5493acae.js";const[U,o,V]=C("list"),j={error:Boolean,offset:L(300),loading:Boolean,disabled:Boolean,finished:Boolean,errorText:String,direction:w("down"),loadingText:String,finishedText:String,immediateCheck:B};var q=E({name:U,props:j,emits:["load","update:error","update:loading"],setup(e,{emit:c,slots:a}){const d=h(e.loading),u=h(),g=h(),s=M(),m=R(u),n=()=>{D(()=>{if(d.value||e.finished||e.disabled||e.error||(s==null?void 0:s.value)===!1)return;const{direction:t}=e,l=+e.offset,i=b(m);if(!i.height||F(u))return;let f=!1;const v=b(g);t==="up"?f=i.top-v.top<=l:f=v.bottom-i.bottom<=l,f&&(d.value=!0,c("update:loading",!0),c("load"))})},T=()=>{if(e.finished){const t=a.finished?a.finished():e.finishedText;if(t)return r("div",{class:o("finished-text")},[t])}},k=()=>{c("update:error",!1),n()},P=()=>{if(e.error){const t=a.error?a.error():e.errorText;if(t)return r("div",{role:"button",class:o("error-text"),tabindex:0,onClick:k},[t])}},S=()=>{if(d.value&&!e.finished&&!e.disabled)return r("div",{class:o("loading")},[a.loading?a.loading():r(H,{class:o("loading-icon")},{default:()=>[e.loadingText||V("loading")]})])};return x(()=>[e.loading,e.finished,e.error],n),s&&x(s,t=>{t&&n()}),N(()=>{d.value=e.loading}),y(()=>{e.immediateCheck&&n()}),_({check:n}),z("scroll",n,{target:m,passive:!0}),()=>{var t;const l=(t=a.default)==null?void 0:t.call(a),i=r("div",{ref:g,class:o("placeholder")},null);return r("div",{ref:u,role:"feed",class:o(),"aria-busy":d.value},[e.direction==="down"?l:i,S(),T(),P(),e.direction==="up"?l:i])}}});const J=I(q);export{J as L};
+>>>>>>>> iteration-20241115:dist/assets/index-1cb0bedc.js

dist/assets/index-0e4e8074.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-c60171dd.js
+import{d as t,q as n,a as e,W as s,a7 as u,V as o,F as r}from"./index-0dce60df.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};
+========
+import{d as t,q as n,a as e,W as s,a7 as u,V as o,F as r}from"./index-4f770187.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-20241115:dist/assets/index-0e4e8074.js

dist/assets/index-15afb98a.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-a728cac1.js
+import{c as O,ai as E,bi as f,d as T,r as g,e as b,w as y,bF as m,a as I,h as N,ak as S,k as A}from"./index-0dce60df.js";import{s as B,f as K,a as u,g as R,p as U}from"./utils-b70e104c.js";import{P as _}from"./index-e2676c1f.js";const x=new Date().getFullYear(),[$]=O("date-picker"),j=E({},B,{columnsType:{type:Array,default:()=>["year","month","day"]},minDate:{type:Date,default:()=>new Date(x-10,0,1),validator:f},maxDate:{type:Date,default:()=>new Date(x+10,11,31),validator:f}});var q=T({name:$,props:j,emits:["confirm","cancel","change","update:modelValue"],setup(a,{emit:r,slots:v}){const n=g(a.modelValue),l=g(!1),M=()=>{const e=a.minDate.getFullYear(),t=a.maxDate.getFullYear();return u(e,t,"year",a.formatter,a.filter)},i=e=>e===a.minDate.getFullYear(),d=e=>e===a.maxDate.getFullYear(),Y=e=>e===a.minDate.getMonth()+1,V=e=>e===a.maxDate.getMonth()+1,s=e=>{const{minDate:t,columnsType:o}=a,c=o.indexOf(e),D=l.value?a.modelValue[c]:n.value[c];if(D)return+D;switch(e){case"year":return t.getFullYear();case"month":return t.getMonth()+1;case"day":return t.getDate()}},k=()=>{const e=s("year"),t=i(e)?a.minDate.getMonth()+1:1,o=d(e)?a.maxDate.getMonth()+1:12;return u(t,o,"month",a.formatter,a.filter)},P=()=>{const e=s("year"),t=s("month"),o=i(e)&&Y(t)?a.minDate.getDate():1,c=d(e)&&V(t)?a.maxDate.getDate():R(e,t);return u(o,c,"day",a.formatter,a.filter)},h=b(()=>a.columnsType.map(e=>{switch(e){case"year":return M();case"month":return k();case"day":return P();default:throw new Error(`[Vant] DatePicker: unsupported columns type: ${e}`)}}));y(n,e=>{m(e,a.modelValue)||r("update:modelValue",e)}),y(()=>a.modelValue,(e,t)=>{l.value=m(t,n.value),e=K(e,h.value),m(e,n.value)||(n.value=e),l.value=!1},{immediate:!0});const C=(...e)=>r("change",...e),F=(...e)=>r("cancel",...e),w=(...e)=>r("confirm",...e);return()=>I(_,N({modelValue:n.value,"onUpdate:modelValue":e=>n.value=e,columns:h.value,onChange:C,onCancel:F,onConfirm:w},S(a,U)),v)}});const J=A(q);export{J as D};
+========
+import{c as O,ai as E,bi as f,d as T,r as g,e as b,w as y,bF as m,a as I,h as N,ak as S,k as A}from"./index-4f770187.js";import{s as B,f as K,a as u,g as R,p as U}from"./utils-e1138c1f.js";import{P as _}from"./index-32fd3102.js";const x=new Date().getFullYear(),[$]=O("date-picker"),j=E({},B,{columnsType:{type:Array,default:()=>["year","month","day"]},minDate:{type:Date,default:()=>new Date(x-10,0,1),validator:f},maxDate:{type:Date,default:()=>new Date(x+10,11,31),validator:f}});var q=T({name:$,props:j,emits:["confirm","cancel","change","update:modelValue"],setup(a,{emit:r,slots:v}){const n=g(a.modelValue),l=g(!1),M=()=>{const e=a.minDate.getFullYear(),t=a.maxDate.getFullYear();return u(e,t,"year",a.formatter,a.filter)},i=e=>e===a.minDate.getFullYear(),d=e=>e===a.maxDate.getFullYear(),Y=e=>e===a.minDate.getMonth()+1,V=e=>e===a.maxDate.getMonth()+1,s=e=>{const{minDate:t,columnsType:o}=a,c=o.indexOf(e),D=l.value?a.modelValue[c]:n.value[c];if(D)return+D;switch(e){case"year":return t.getFullYear();case"month":return t.getMonth()+1;case"day":return t.getDate()}},k=()=>{const e=s("year"),t=i(e)?a.minDate.getMonth()+1:1,o=d(e)?a.maxDate.getMonth()+1:12;return u(t,o,"month",a.formatter,a.filter)},P=()=>{const e=s("year"),t=s("month"),o=i(e)&&Y(t)?a.minDate.getDate():1,c=d(e)&&V(t)?a.maxDate.getDate():R(e,t);return u(o,c,"day",a.formatter,a.filter)},h=b(()=>a.columnsType.map(e=>{switch(e){case"year":return M();case"month":return k();case"day":return P();default:throw new Error(`[Vant] DatePicker: unsupported columns type: ${e}`)}}));y(n,e=>{m(e,a.modelValue)||r("update:modelValue",e)}),y(()=>a.modelValue,(e,t)=>{l.value=m(t,n.value),e=K(e,h.value),m(e,n.value)||(n.value=e),l.value=!1},{immediate:!0});const C=(...e)=>r("change",...e),F=(...e)=>r("cancel",...e),w=(...e)=>r("confirm",...e);return()=>I(_,N({modelValue:n.value,"onUpdate:modelValue":e=>n.value=e,columns:h.value,onChange:C,onCancel:F,onConfirm:w},S(a,U)),v)}});const J=A(q);export{J as D};
+>>>>>>>> iteration-20241115:dist/assets/index-15afb98a.js

dist/assets/index-1cb0bedc.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-0e4d184d.js
+import{c as C,b as L,m as w,t as B,d as E,r as h,bB as R,w as x,bC as N,y,a2 as _,a3 as z,a as r,z as D,a4 as b,bD as F,L as H,k as I}from"./index-0dce60df.js";import{u as M}from"./use-tab-status-f98f4aa3.js";const[U,o,V]=C("list"),j={error:Boolean,offset:L(300),loading:Boolean,disabled:Boolean,finished:Boolean,errorText:String,direction:w("down"),loadingText:String,finishedText:String,immediateCheck:B};var q=E({name:U,props:j,emits:["load","update:error","update:loading"],setup(e,{emit:c,slots:a}){const d=h(e.loading),u=h(),g=h(),s=M(),m=R(u),n=()=>{D(()=>{if(d.value||e.finished||e.disabled||e.error||(s==null?void 0:s.value)===!1)return;const{direction:t}=e,l=+e.offset,i=b(m);if(!i.height||F(u))return;let f=!1;const v=b(g);t==="up"?f=i.top-v.top<=l:f=v.bottom-i.bottom<=l,f&&(d.value=!0,c("update:loading",!0),c("load"))})},T=()=>{if(e.finished){const t=a.finished?a.finished():e.finishedText;if(t)return r("div",{class:o("finished-text")},[t])}},k=()=>{c("update:error",!1),n()},P=()=>{if(e.error){const t=a.error?a.error():e.errorText;if(t)return r("div",{role:"button",class:o("error-text"),tabindex:0,onClick:k},[t])}},S=()=>{if(d.value&&!e.finished&&!e.disabled)return r("div",{class:o("loading")},[a.loading?a.loading():r(H,{class:o("loading-icon")},{default:()=>[e.loadingText||V("loading")]})])};return x(()=>[e.loading,e.finished,e.error],n),s&&x(s,t=>{t&&n()}),N(()=>{d.value=e.loading}),y(()=>{e.immediateCheck&&n()}),_({check:n}),z("scroll",n,{target:m,passive:!0}),()=>{var t;const l=(t=a.default)==null?void 0:t.call(a),i=r("div",{ref:g,class:o("placeholder")},null);return r("div",{ref:u,role:"feed",class:o(),"aria-busy":d.value},[e.direction==="down"?l:i,S(),T(),P(),e.direction==="up"?l:i])}}});const J=I(q);export{J as L};
+========
+import{c as C,b as L,m as w,t as B,d as E,r as h,bB as R,w as x,bC as N,y,a2 as _,a3 as z,a as r,z as D,a4 as b,bD as F,L as H,k as I}from"./index-4f770187.js";import{u as M}from"./use-tab-status-5493acae.js";const[U,o,V]=C("list"),j={error:Boolean,offset:L(300),loading:Boolean,disabled:Boolean,finished:Boolean,errorText:String,direction:w("down"),loadingText:String,finishedText:String,immediateCheck:B};var q=E({name:U,props:j,emits:["load","update:error","update:loading"],setup(e,{emit:c,slots:a}){const d=h(e.loading),u=h(),g=h(),s=M(),m=R(u),n=()=>{D(()=>{if(d.value||e.finished||e.disabled||e.error||(s==null?void 0:s.value)===!1)return;const{direction:t}=e,l=+e.offset,i=b(m);if(!i.height||F(u))return;let f=!1;const v=b(g);t==="up"?f=i.top-v.top<=l:f=v.bottom-i.bottom<=l,f&&(d.value=!0,c("update:loading",!0),c("load"))})},T=()=>{if(e.finished){const t=a.finished?a.finished():e.finishedText;if(t)return r("div",{class:o("finished-text")},[t])}},k=()=>{c("update:error",!1),n()},P=()=>{if(e.error){const t=a.error?a.error():e.errorText;if(t)return r("div",{role:"button",class:o("error-text"),tabindex:0,onClick:k},[t])}},S=()=>{if(d.value&&!e.finished&&!e.disabled)return r("div",{class:o("loading")},[a.loading?a.loading():r(H,{class:o("loading-icon")},{default:()=>[e.loadingText||V("loading")]})])};return x(()=>[e.loading,e.finished,e.error],n),s&&x(s,t=>{t&&n()}),N(()=>{d.value=e.loading}),y(()=>{e.immediateCheck&&n()}),_({check:n}),z("scroll",n,{target:m,passive:!0}),()=>{var t;const l=(t=a.default)==null?void 0:t.call(a),i=r("div",{ref:g,class:o("placeholder")},null);return r("div",{ref:u,role:"feed",class:o(),"aria-busy":d.value},[e.direction==="down"?l:i,S(),T(),P(),e.direction==="up"?l:i])}}});const J=I(q);export{J as L};
+>>>>>>>> iteration-20241115:dist/assets/index-1cb0bedc.js

dist/assets/index-1ff6bf2b.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-1ff6bf2b.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,a$ as $,k as p,ai as q,b0 as O,aj as T,b1 as V,e as P,b2 as z,h as D,b3 as E,I as j}from"./index-0dce60df.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(),{[$]:e.border&&!e.gutter}]},[(c=t.default)==null?void 0:c.call(t)])}}});const H=p(L),[U,l]=x("grid-item"),Y=q({},O,{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}=T(S),B=V();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};
+========
+import{c as x,t as f,n as m,b as N,d as v,ag as _,a as i,o as b,a$ as $,k as p,ai as q,b0 as O,aj as T,b1 as V,e as P,b2 as z,h as D,b3 as E,I as j}from"./index-4f770187.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(),{[$]:e.border&&!e.gutter}]},[(c=t.default)==null?void 0:c.call(t)])}}});const H=p(L),[U,l]=x("grid-item"),Y=q({},O,{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}=T(S),B=V();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-20241115:dist/assets/index-dc12b0fd.js

dist/assets/index-20990b5f.css

@@ -1 +0,0 @@
-._m-search_cpkbm_1{--van-cell-background-color: transparent}._m-search_cpkbm_1 input::-moz-placeholder{color:var(--k-gray-4);font-size:.34667rem}._m-search_cpkbm_1 input::placeholder{color:var(--k-gray-4);font-size:.34667rem}._m-search_cpkbm_1 .van-field__control{-webkit-user-select:text!important;-moz-user-select:text!important;user-select:text!important;font-size:.34667rem}._m-search_cpkbm_1 .van-search__field{background:transparent!important;padding:0 var(--van-padding-xs) 0 0}._m-search_cpkbm_1 .van-field__right-icon{display:flex;align-items:center;justify-content:center;padding-right:.10667rem}._m-search_cpkbm_1._default_cpkbm_23 .van-search__content{background:#f8f9fc!important}._m-search_cpkbm_1._white_cpkbm_26 .van-search__content{background:#fff!important}._m-search_cpkbm_1._transparent_cpkbm_29 .van-search__content{background:rgba(255,255,255,.16)}._m-search_cpkbm_1._transparent_cpkbm_29 .van-search__content input::-moz-placeholder{color:#fff}._m-search_cpkbm_1._transparent_cpkbm_29 .van-search__content input::placeholder{color:#fff}._m-search_cpkbm_1._transparent_cpkbm_29 .van-search__content input,._m-search_cpkbm_1._transparent_cpkbm_29 .van-search__content .van-field__clear{color:#fff}._m-search_cpkbm_1 ._searchBtn_cpkbm_41{width:1.38667rem;height:.66667rem;padding:0;font-size:.34667rem;font-weight:500;--van-button-mini-height: .74667rem;--van-font-size-xs: .32rem;background:linear-gradient(to right,#40c4fe,#259CFE);border:none}._m-search_cpkbm_1 ._leftIcon_cpkbm_52{width:.37333rem;height:.37333rem;margin-top:-.05333rem}._m-search_cpkbm_1 ._leftIcon_cpkbm_52 img{width:100%;height:100%}

dist/assets/index-26dc3475.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-824c6cad.js
+import{n as E,t as O,a as h,i as S}from"./index-2b0bcd89.js";import{w as _,e as A,r as p,aP as w,y as M}from"./index-0dce60df.js";function d(e){var n;const t=O(e);return(n=t==null?void 0:t.$el)!=null?n:t}const m=S?window:void 0;function P(...e){let n,t,r,i;if(typeof e[0]=="string"||Array.isArray(e[0])?([t,r,i]=e,n=m):[n,t,r,i]=e,!n)return E;Array.isArray(t)||(t=[t]),Array.isArray(r)||(r=[r]);const c=[],o=()=>{c.forEach(s=>s()),c.length=0},f=(s,u,a,l)=>(s.addEventListener(u,a,l),()=>s.removeEventListener(u,a,l)),v=_(()=>[d(n),O(i)],([s,u])=>{o(),s&&c.push(...t.flatMap(a=>r.map(l=>f(s,a,l,u))))},{immediate:!0,flush:"post"}),y=()=>{v(),o()};return h(y),y}function $(){const e=p(!1);return w()&&M(()=>{e.value=!0}),e}function g(e){const n=$();return A(()=>(n.value,!!e()))}var b=Object.getOwnPropertySymbols,j=Object.prototype.hasOwnProperty,x=Object.prototype.propertyIsEnumerable,R=(e,n)=>{var t={};for(var r in e)j.call(e,r)&&n.indexOf(r)<0&&(t[r]=e[r]);if(e!=null&&b)for(var r of b(e))n.indexOf(r)<0&&x.call(e,r)&&(t[r]=e[r]);return t};function I(e,n,t={}){const r=t,{window:i=m}=r,c=R(r,["window"]);let o;const f=g(()=>i&&"ResizeObserver"in i),v=()=>{o&&(o.disconnect(),o=void 0)},y=A(()=>Array.isArray(e)?e.map(a=>d(a)):[d(e)]),s=_(y,a=>{if(v(),f.value&&i){o=new ResizeObserver(n);for(const l of a)l&&o.observe(l,c)}},{immediate:!0,flush:"post",deep:!0}),u=()=>{v(),s()};return h(u),{isSupported:f,stop:u}}function L({window:e=m}={}){if(!e)return{x:p(0),y:p(0)};const n=p(e.scrollX),t=p(e.scrollY);return P(e,"scroll",()=>{n.value=e.scrollX,t.value=e.scrollY},{capture:!1,passive:!0}),{x:n,y:t}}export{L as a,I as b,P as u};
+========
+import{n as E,t as O,a as h,i as S}from"./index-5fcc4b8e.js";import{w as _,e as A,r as p,aP as w,y as M}from"./index-4f770187.js";function d(e){var n;const t=O(e);return(n=t==null?void 0:t.$el)!=null?n:t}const m=S?window:void 0;function P(...e){let n,t,r,i;if(typeof e[0]=="string"||Array.isArray(e[0])?([t,r,i]=e,n=m):[n,t,r,i]=e,!n)return E;Array.isArray(t)||(t=[t]),Array.isArray(r)||(r=[r]);const c=[],o=()=>{c.forEach(s=>s()),c.length=0},f=(s,u,a,l)=>(s.addEventListener(u,a,l),()=>s.removeEventListener(u,a,l)),v=_(()=>[d(n),O(i)],([s,u])=>{o(),s&&c.push(...t.flatMap(a=>r.map(l=>f(s,a,l,u))))},{immediate:!0,flush:"post"}),y=()=>{v(),o()};return h(y),y}function $(){const e=p(!1);return w()&&M(()=>{e.value=!0}),e}function g(e){const n=$();return A(()=>(n.value,!!e()))}var b=Object.getOwnPropertySymbols,j=Object.prototype.hasOwnProperty,x=Object.prototype.propertyIsEnumerable,R=(e,n)=>{var t={};for(var r in e)j.call(e,r)&&n.indexOf(r)<0&&(t[r]=e[r]);if(e!=null&&b)for(var r of b(e))n.indexOf(r)<0&&x.call(e,r)&&(t[r]=e[r]);return t};function I(e,n,t={}){const r=t,{window:i=m}=r,c=R(r,["window"]);let o;const f=g(()=>i&&"ResizeObserver"in i),v=()=>{o&&(o.disconnect(),o=void 0)},y=A(()=>Array.isArray(e)?e.map(a=>d(a)):[d(e)]),s=_(y,a=>{if(v(),f.value&&i){o=new ResizeObserver(n);for(const l of a)l&&o.observe(l,c)}},{immediate:!0,flush:"post",deep:!0}),u=()=>{v(),s()};return h(u),{isSupported:f,stop:u}}function L({window:e=m}={}){if(!e)return{x:p(0),y:p(0)};const n=p(e.scrollX),t=p(e.scrollY);return P(e,"scroll",()=>{n.value=e.scrollX,t.value=e.scrollY},{capture:!1,passive:!0}),{x:n,y:t}}export{L as a,I as b,P as u};
+>>>>>>>> iteration-20241115:dist/assets/index-26dc3475.js

dist/assets/index-29bf006e.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-29bf006e.js
 import{d as s,r as i,y as c,w as r,a as o,U as f,C as a,F as p}from"./index-0dce60df.js";const d="_wxPopupDialog_y05ae_1",B="_popupContainer_y05ae_19",C="_title1_y05ae_27",m="_popupTips_y05ae_34",y="_btnGroup_y05ae_41",_="_button_y05ae_46",w="_confirmBtn_y05ae_54",g="_iconClose_y05ae_59",e={wxPopupDialog:d,popupContainer:B,title1:C,popupTips:m,btnGroup:y,button:_,confirmBtn:w,iconClose:g},x=s({name:"m-wx-tip",props:{show:{type:Boolean,default:!0},title:{type:String,default:"温馨提示"},message:{type:String,default:"请使用微信打开"},messageAlign:{type:String,default:"center"},showCancelButton:{type:Boolean,default:!1},cancelButtonText:{type:String,default:"取消"},cancelButtonColor:{type:String,default:""},showConfirmButton:{type:Boolean,default:!0},confirmButtonText:{type:String,default:"确认"},confirmButtonColor:{type:String,default:""},showCloseButton:{type:Boolean,default:!0}},emits:["confirm","cancel","close"],setup(t,{emit:l}){const n=i(!1);return c(()=>{t.show&&(n.value=!0)}),r(()=>[t.show,t.message],()=>{t.show?n.value=!0:n.value=!1}),()=>o(p,null,[o(f,{show:n.value,"onUpdate:show":u=>n.value=u,round:!0,style:{width:"100%",maxWidth:"520px"},closeOnClickOverlay:!1,class:e.wxPopupDialog},{default:()=>[o("div",{class:e.popupContainer},[t.showCloseButton&&o("i",{class:e.iconClose,onClick:()=>l("close")},null),o("p",{class:e.title1,innerHTML:t.title},null),o("p",{class:e.popupTips,style:{"text-align":t.messageAlign},innerHTML:t.message},null),(t.showConfirmButton||t.showConfirmButton)&&o("div",{class:e.btnGroup},[t.showCancelButton&&o(a,{round:!0,class:[e.button,e.cancelBtn],color:t.cancelButtonColor,onClick:()=>l("cancel")},{default:()=>[t.cancelButtonText]}),t.showConfirmButton&&o(a,{round:!0,class:[e.button,e.confirmBtn],color:t.confirmButtonColor,onClick:()=>l("confirm")},{default:()=>[t.confirmButtonText]})])])]})])}});export{x as M};
+========
+import{d as s,r as i,y as c,w as r,a as o,U as f,C as a,F as p}from"./index-4f770187.js";const d="_wxPopupDialog_y05ae_1",B="_popupContainer_y05ae_19",C="_title1_y05ae_27",m="_popupTips_y05ae_34",y="_btnGroup_y05ae_41",_="_button_y05ae_46",w="_confirmBtn_y05ae_54",g="_iconClose_y05ae_59",e={wxPopupDialog:d,popupContainer:B,title1:C,popupTips:m,btnGroup:y,button:_,confirmBtn:w,iconClose:g},x=s({name:"m-wx-tip",props:{show:{type:Boolean,default:!0},title:{type:String,default:"温馨提示"},message:{type:String,default:"请使用微信打开"},messageAlign:{type:String,default:"center"},showCancelButton:{type:Boolean,default:!1},cancelButtonText:{type:String,default:"取消"},cancelButtonColor:{type:String,default:""},showConfirmButton:{type:Boolean,default:!0},confirmButtonText:{type:String,default:"确认"},confirmButtonColor:{type:String,default:""},showCloseButton:{type:Boolean,default:!0}},emits:["confirm","cancel","close"],setup(t,{emit:l}){const n=i(!1);return c(()=>{t.show&&(n.value=!0)}),r(()=>[t.show,t.message],()=>{t.show?n.value=!0:n.value=!1}),()=>o(p,null,[o(f,{show:n.value,"onUpdate:show":u=>n.value=u,round:!0,style:{width:"100%",maxWidth:"520px"},closeOnClickOverlay:!1,class:e.wxPopupDialog},{default:()=>[o("div",{class:e.popupContainer},[t.showCloseButton&&o("i",{class:e.iconClose,onClick:()=>l("close")},null),o("p",{class:e.title1,innerHTML:t.title},null),o("p",{class:e.popupTips,style:{"text-align":t.messageAlign},innerHTML:t.message},null),(t.showConfirmButton||t.showConfirmButton)&&o("div",{class:e.btnGroup},[t.showCancelButton&&o(a,{round:!0,class:[e.button,e.cancelBtn],color:t.cancelButtonColor,onClick:()=>l("cancel")},{default:()=>[t.cancelButtonText]}),t.showConfirmButton&&o(a,{round:!0,class:[e.button,e.confirmBtn],color:t.confirmButtonColor,onClick:()=>l("confirm")},{default:()=>[t.confirmButtonText]})])])]})])}});export{x as M};
+>>>>>>>> iteration-20241115:dist/assets/index-4fab90bf.js

dist/assets/index-2b0bcd89.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-2b0bcd89.js
 import{r as _,bx as d,w as y,by as w,bz as O,bA as b}from"./index-0dce60df.js";function f(e){return w()?(O(e),!0):!1}function P(e){return typeof e=="function"?e():b(e)}const p=typeof window<"u",x=()=>{};function I(e,t=1e3,r={}){const{immediate:i=!0,immediateCallback:a=!1}=r;let n=null;const o=_(!1);function s(){n&&(clearInterval(n),n=null)}function u(){o.value=!1,s()}function c(){const l=P(t);l<=0||(o.value=!0,a&&e(),s(),n=setInterval(e,l))}if(i&&p&&c(),d(t)||typeof t=="function"){const l=y(t,()=>{o.value&&p&&c()});f(l)}return f(u),{isActive:o,pause:u,resume:c}}var $=Object.defineProperty,m=Object.getOwnPropertySymbols,S=Object.prototype.hasOwnProperty,g=Object.prototype.propertyIsEnumerable,v=(e,t,r)=>t in e?$(e,t,{enumerable:!0,configurable:!0,writable:!0,value:r}):e[t]=r,h=(e,t)=>{for(var r in t||(t={}))S.call(t,r)&&v(e,r,t[r]);if(m)for(var r of m(t))g.call(t,r)&&v(e,r,t[r]);return e};function V(e=1e3,t={}){const{controls:r=!1,immediate:i=!0,callback:a}=t,n=_(0),o=()=>n.value+=1,s=()=>{n.value=0},u=I(a?()=>{o(),a(n.value)}:o,e,{immediate:i});return r?h({counter:n,reset:s},u):n}export{f as a,I as b,p as i,x as n,P as t,V as u};
+========
+import{r as _,bx as d,w as y,by as w,bz as O,bA as b}from"./index-4f770187.js";function f(e){return w()?(O(e),!0):!1}function P(e){return typeof e=="function"?e():b(e)}const p=typeof window<"u",x=()=>{};function I(e,t=1e3,r={}){const{immediate:i=!0,immediateCallback:a=!1}=r;let n=null;const o=_(!1);function s(){n&&(clearInterval(n),n=null)}function u(){o.value=!1,s()}function c(){const l=P(t);l<=0||(o.value=!0,a&&e(),s(),n=setInterval(e,l))}if(i&&p&&c(),d(t)||typeof t=="function"){const l=y(t,()=>{o.value&&p&&c()});f(l)}return f(u),{isActive:o,pause:u,resume:c}}var $=Object.defineProperty,m=Object.getOwnPropertySymbols,S=Object.prototype.hasOwnProperty,g=Object.prototype.propertyIsEnumerable,v=(e,t,r)=>t in e?$(e,t,{enumerable:!0,configurable:!0,writable:!0,value:r}):e[t]=r,h=(e,t)=>{for(var r in t||(t={}))S.call(t,r)&&v(e,r,t[r]);if(m)for(var r of m(t))g.call(t,r)&&v(e,r,t[r]);return e};function V(e=1e3,t={}){const{controls:r=!1,immediate:i=!0,callback:a}=t,n=_(0),o=()=>n.value+=1,s=()=>{n.value=0},u=I(a?()=>{o(),a(n.value)}:o,e,{immediate:i});return r?h({counter:n,reset:s},u):n}export{f as a,I as b,p as i,x as n,P as t,V as u};
+>>>>>>>> iteration-20241115:dist/assets/index-5fcc4b8e.js

dist/assets/index-2b1af46b.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-2b1af46b.js
 import{d as l,Y as o,a as h,U as n}from"./index-0dce60df.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};
+========
+import{d as l,Y as o,a as h,U as n}from"./index-4f770187.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-20241115:dist/assets/index-6290df1d.js

dist/assets/index-31f3cc78.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-31f3cc78.js
 import{d as u,x as g,r as y,y as S,w as h,a as n}from"./index-0dce60df.js";import{b as l}from"./index-824c6cad.js";const x="_sticky_4d2w6_1",p="_white_4d2w6_6",k={sticky:x,white:p},_=u({name:"m-sticky",props:{position:{type:String,default:"top"},mode:{type:String,default:"fixed"},offsetTop:{type:String,default:"0px"},offsetBottom:{default:"0px"},varName:{type:String,default:"--header-height"}},emits:["barHeight"],setup(e,{slots:a,emit:m,expose:r}){const t=g({divStyle:{},heightV:0,sectionStyle:{width:"100%",height:"auto",left:"0"}}),c=o=>{t.sectionStyle.height=`${o}px`,t.heightV=o,document.documentElement.style.setProperty(e.varName,`${o}px`),m("barHeight",o)},f=y(),d=y();S(()=>{e.position==="top"?t.divStyle.top=e.offsetTop||"0px":t.divStyle.bottom=e.offsetBottom||"0px";try{l(f.value,o=>{const s=o[0],{height:i}=s.contentRect;Math.abs(i-t.heightV)>1&&setTimeout(()=>{c(i)},10)})}catch(o){}});const v=()=>{try{l(d.value,o=>{const s=o[0],{height:i}=s.contentRect;Math.abs(i-t.heightV)>1&&setTimeout(()=>{c(i)},10)})}catch(o){}};return h(()=>e.offsetTop,()=>{t.divStyle.top=e.offsetTop}),h(()=>e.offsetBottom,()=>{t.divStyle.bottom=e.offsetBottom}),r({onChnageHeight:v}),()=>n("div",{style:[t.sectionStyle],class:e.mode==="sticky"&&k.sticky},[n("div",{ref:f,class:["van-sticky",e.mode==="fixed"?"van-sticky--fixed":""],style:[t.divStyle,t.sectionStyle]},[n("div",{ref:d},[a.default&&a.default()])])])}});export{_ as M};
+========
+import{d as u,x as g,r as y,y as S,w as h,a as n}from"./index-4f770187.js";import{b as l}from"./index-26dc3475.js";const x="_sticky_4d2w6_1",p="_white_4d2w6_6",k={sticky:x,white:p},_=u({name:"m-sticky",props:{position:{type:String,default:"top"},mode:{type:String,default:"fixed"},offsetTop:{type:String,default:"0px"},offsetBottom:{default:"0px"},varName:{type:String,default:"--header-height"}},emits:["barHeight"],setup(e,{slots:a,emit:m,expose:r}){const t=g({divStyle:{},heightV:0,sectionStyle:{width:"100%",height:"auto",left:"0"}}),c=o=>{t.sectionStyle.height=`${o}px`,t.heightV=o,document.documentElement.style.setProperty(e.varName,`${o}px`),m("barHeight",o)},f=y(),d=y();S(()=>{e.position==="top"?t.divStyle.top=e.offsetTop||"0px":t.divStyle.bottom=e.offsetBottom||"0px";try{l(f.value,o=>{const s=o[0],{height:i}=s.contentRect;Math.abs(i-t.heightV)>1&&setTimeout(()=>{c(i)},10)})}catch(o){}});const v=()=>{try{l(d.value,o=>{const s=o[0],{height:i}=s.contentRect;Math.abs(i-t.heightV)>1&&setTimeout(()=>{c(i)},10)})}catch(o){}};return h(()=>e.offsetTop,()=>{t.divStyle.top=e.offsetTop}),h(()=>e.offsetBottom,()=>{t.divStyle.bottom=e.offsetBottom}),r({onChnageHeight:v}),()=>n("div",{style:[t.sectionStyle],class:e.mode==="sticky"&&k.sticky},[n("div",{ref:f,class:["van-sticky",e.mode==="fixed"?"van-sticky--fixed":""],style:[t.divStyle,t.sectionStyle]},[n("div",{ref:d},[a.default&&a.default()])])])}});export{_ as M};
+>>>>>>>> iteration-20241115:dist/assets/index-ecc21874.js

dist/assets/index-32fd3102.js

@@ -0,0 +1 @@
+import{s as t}from"./Picker-8865420d.js";import{k as s}from"./index-4f770187.js";const a=s(t);export{a as P};

dist/assets/index-36b36b7b.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index-36b36b7b.js
 import{d as n,P as d,x as c,y as u,a as e,W as m,a7 as p,D as f}from"./index-0dce60df.js";import{M as s}from"./index-31f3cc78.js";import{u as g,a as y}from"./index-824c6cad.js";import{s as i}from"./index.module-f489c00d.js";import{A as v}from"./index-e1ff29d7.js";import{I as k}from"./index-6fa0c70b.js";import"./index-2b0bcd89.js";import"./browser-504037ee.js";import"./index-b3c99a8a.js";import"./index-946a1952.js";const A=n({name:"instrument-detail",setup(){const l=d(),t=c({titleOpacity:0,background:"transparent",color:"#fff",detail:{},musicList:[],loading:!1}),r=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}),r()}),()=>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{A as default};
+========
+import{d as n,P as d,x as c,y as u,a as e,W as m,a7 as p,D as f}from"./index-4f770187.js";import{M as s}from"./index-ecc21874.js";import{u as g,a as y}from"./index-26dc3475.js";import{s as i}from"./index.module-f489c00d.js";import{A as v}from"./index-eb407bd8.js";import{I as k}from"./index-951ee035.js";import"./index-5fcc4b8e.js";import"./browser-504037ee.js";import"./index-7c24bdf0.js";import"./index-58dd3ee1.js";const A=n({name:"instrument-detail",setup(){const l=d(),t=c({titleOpacity:0,background:"transparent",color:"#fff",detail:{},musicList:[],loading:!1}),r=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}),r()}),()=>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{A as default};
+>>>>>>>> iteration-20241115:dist/assets/index-fa6636a0.js