提交

1

dist/assets/index-legacy.5f4fcba5.js

@@ -0,0 +1,2 @@
+;(function(){var __vite_style__=document.createElement('style');__vite_style__.innerHTML="._pagination-container_1x1u9_1{background:transparent;padding:24px 16px 32px;width:100%;display:flex;flex-direction:row;justify-content:center}._pagination-container_1x1u9_1 .el-pagination.is-background .btn-next,._pagination-container_1x1u9_1 .el-pagination.is-background .btn-prev,._pagination-container_1x1u9_1 .el-pagination.is-background .el-pager li{border-radius:999px;box-sizing:border-box;border:1px solid #329e8a;background-color:#fff;color:#329e8a}._pagination-container_1x1u9_1 .el-pagination.is-background .el-pager li:not(.is-disabled).is-active{border-color:var(--el-color-primary)}._pagination-container_1x1u9_1 .el-input__wrapper{border-radius:99px}._pagination-container_1x1u9_1 .el-input__inner{border-radius:99px;background-color:#fff!important}._pagination-container_1x1u9_1._hidden_1x1u9_28{display:none}\n";document.head.appendChild(__vite_style__);System.register(['./index-legacy.93a7afb7.js','./vendor-legacy.586833b0.js'],function(exports){'use strict';var scrollAnimation,defineComponent,createVNode,ElPagination;return{setters:[function(module){scrollAnimation=module.u;},function(module){defineComponent=module.d;createVNode=module.c;ElPagination=module.a3;}],execute:function execute(){var hidden="_hidden_1x1u9_28";var styles={"pagination-container":"_pagination-container_1x1u9_1",hidden:hidden};var Pagination=exports('P',defineComponent({name:'pagination',props:{total:{required:true,type:Number},page:{type:Number,default:1},limit:{type:Number,default:10},pageSizes:{type:Array,default:[5,10,20,30,50]},// , jumper
+layout:{type:String,default:'total, sizes, prev, pager, next'},showMuitiple:{type:Number,default:10},hideOnSinglePage:{type:Boolean,default:true},background:{type:Boolean,default:true},autoScroll:{type:Boolean,default:true},hidden:{type:Boolean,default:false},sync:{type:Boolean,default:false},saveKey:{type:String,default:''},pagination:{type:Function,default:function _default(){}}},methods:{handleSizeChange:function handleSizeChange(val){this.$emit('update:page',1);this.$emit('update:limit',val);this.pagination();if(this.autoScroll){var currentY=document.documentElement.scrollTop||document.body.scrollTop;scrollAnimation(currentY,0);}},handleCurrentChange:function handleCurrentChange(val){this.$emit('update:page',val);this.$emit('update:limit',this.limit);this.pagination();if(this.autoScroll){var currentY=document.documentElement.scrollTop||document.body.scrollTop;scrollAnimation(currentY,0);}}},render:function render(){var _this=this;return createVNode("div",{"class":[styles['pagination-container'],this.hidden&&styles.hidden]},[createVNode(ElPagination,{"currentPage":this.page,"pageSize":this.limit,"onUpdate:currentPage":function onUpdateCurrentPage(val){},"onUpdate:pageSize":function onUpdatePageSize(val){_this.handleSizeChange(val);},"pageSizes":this.pageSizes,"total":this.total,"hideOnSinglePage":this.total>this.showMuitiple?false:this.hideOnSinglePage,"background":this.background,"layout":this.layout,"onSise-change":this.handleSizeChange,"onCurrent-change":this.handleCurrentChange},null)]);}}));}};});})();

dist/assets/index-legacy.7b7aee71.js

@@ -0,0 +1,2 @@
+;(function(){System.register(['./vendor-legacy.586833b0.js'],function(exports){'use strict';var defineComponent,createVNode,ElButton;return{setters:[function(module){defineComponent=module.d;createVNode=module.c;ElButton=module.k;}],execute:function execute(){var empty="./assets/icon_empty.df5db7bf.png";var live="./assets/icon_no_live.fcb0eb56.png";var teacherCert="./assets/icon_teacher_cert.ee709a8f.png";var musicCert="./assets/icon_music_cert.a65c8b91.png";var ColEmpty=exports('C',defineComponent({name:'col-empty',props:{message:{type:String,default:'暂无数据'},buttonText:{type:String,default:'去首页'},buttonVisibility:{type:Boolean,default:false},type:{type:String,default:'empty'// 'empty' | 'live' | 'teacherCert' | 'musicCert'
+},onDetail:{type:Function,default:function _default(){}}},computed:{icon:function icon(){switch(this.type){case'empty':return empty;case'live':return live;case'teacherCert':return teacherCert;case'musicCert':return musicCert;default:return empty;}}},render:function render(){var _this=this;return createVNode("div",{"class":"w-full h-full text-center flex items-center justify-center flex-col"},[createVNode("img",{"src":this.icon,"class":"w-64 m-auto"},null),createVNode("p",{"class":"text-base text-[#999999] pt-4 pb-6"},[this.message]),this.buttonVisibility&&createVNode(ElButton,{"type":"primary","class":"rounded-sm !px-12","round":true,"style":{height:'48px'},"onClick":function onClick(){_this.onDetail();}},{default:function _default(){return[_this.buttonText];}})]);}}));}};});})();

dist/assets/index-legacy.a07d6dfb.js

@@ -0,0 +1 @@
+;(function(){System.register(['./vendor-legacy.586833b0.js'],function(exports){'use strict';var defineComponent,createVNode,ElImage,createTextVNode;return{setters:[function(module){defineComponent=module.d;createVNode=module.c;ElImage=module.x;createTextVNode=module.a;}],execute:function execute(){var Item=exports('I',defineComponent({name:'item',props:{item:{type:Object,default:function _default(){return{};}}},render:function render(){var _this=this;var item=this.item;return createVNode("div",{"class":"border border-[#E0E0E0] box-border rounded-[10px] w-[218px] m-auto overflow-hidden relative transition-all cursor-pointer","onClick":function onClick(){console.log(item);if(item.type==='video'){_this.$router.push({path:'/videoDetail',query:{id:item.id}});}}},[createVNode("div",{"class":"relative"},[createVNode(ElImage,{"class":"w-full h-[122px] align-middle","fit":"cover","src":item.backgroundPic},null),createVNode("div",{"class":"text-sm text-[#52FFDC] h-7 leading-7 px-3 flex items-center justify-end absolute left-0 right-0 bottom-0 bg-black/60"},[createVNode("i",{"class":"w-1 h-1 bg-[#52FFDC] rounded-full mr-1.5 inline-block"},null),item.studentCount,createTextVNode("\u4EBA\u5DF2\u8D2D\u4E70")])]),createVNode("div",{"class":"text-base px-2.5 pt-2 text-[#666666] leading-none font-semibold whitespace-nowrap overflow-hidden text-ellipsis"},[item.courseGroupName]),item.courseStartTime&&createVNode("p",{"class":"text-[#999] text-xs px-2.5 leading-none pt-1.5"},[createTextVNode("\u5F00\u8BFE\u65F6\u95F4\uFF1A"),item.courseStartTime]),createVNode("div",{"class":"mx-2.5 pt-1.5 pb-2 flex items-center justify-between"},[createVNode("div",{"class":"text-xl text-[#F90000] font-semibold leading-none"},[createVNode("span",{"class":"text-sm leading-7"},[createTextVNode("\uFFE5")]),item.coursePrice]),createVNode("div",{"class":"text-base text-[#FF5F22] leading-none"},[item.courseNum,createTextVNode("\u8BFE\u65F6")])])]);}}));}};});})();

dist/assets/index.0f74bf52.js

@@ -0,0 +1 @@
+import{u as a}from"./index.4d5173c8.js";import{d as o,c as i,a3 as l}from"./vendor.3e065b0c.js";const d="_hidden_1x1u9_28";var n={"pagination-container":"_pagination-container_1x1u9_1",hidden:d},u=o({name:"pagination",props:{total:{required:!0,type:Number},page:{type:Number,default:1},limit:{type:Number,default:10},pageSizes:{type:Array,default:[5,10,20,30,50]},layout:{type:String,default:"total, sizes, prev, pager, next"},showMuitiple:{type:Number,default:10},hideOnSinglePage:{type:Boolean,default:!0},background:{type:Boolean,default:!0},autoScroll:{type:Boolean,default:!0},hidden:{type:Boolean,default:!1},sync:{type:Boolean,default:!1},saveKey:{type:String,default:""},pagination:{type:Function,default:()=>{}}},methods:{handleSizeChange(e){if(this.$emit("update:page",1),this.$emit("update:limit",e),this.pagination(),this.autoScroll){const t=document.documentElement.scrollTop||document.body.scrollTop;a(t,0)}},handleCurrentChange(e){if(this.$emit("update:page",e),this.$emit("update:limit",this.limit),this.pagination(),this.autoScroll){const t=document.documentElement.scrollTop||document.body.scrollTop;a(t,0)}}},render(){return i("div",{class:[n["pagination-container"],this.hidden&&n.hidden]},[i(l,{currentPage:this.page,pageSize:this.limit,"onUpdate:currentPage":e=>{},"onUpdate:pageSize":e=>{this.handleSizeChange(e)},pageSizes:this.pageSizes,total:this.total,hideOnSinglePage:this.total>this.showMuitiple?!1:this.hideOnSinglePage,background:this.background,layout:this.layout,"onSise-change":this.handleSizeChange,"onCurrent-change":this.handleCurrentChange},null)])}});export{u as P};

dist/assets/index.196e4474.js

@@ -0,0 +1 @@
+import{h as r}from"./hold.c2fff6ac.js";import{l as u,s as c}from"./lineStart.fb76406f.js";import{p as n}from"./player.8b5ee2bb.js";import{d,r as h,S as _,f as p,c as t,F as b,a as o}from"./vendor.3e065b0c.js";const v="_itemWrap_1h7x4_1",f="_hold_1h7x4_7",g="_masker_1h7x4_11",B="_showPaly_1h7x4_1",x="_startImage_1h7x4_64",C="_itemBottom_1h7x4_88",y="_itemBottomR_1h7x4_97",F="_itemBottomL_1h7x4_100";var e={itemWrap:v,hold:f,masker:g,showPaly:B,startImage:x,itemBottom:C,itemBottomR:y,itemBottomL:F},k=d({name:"albumItem",props:{detail:{type:Object,default:{albumCoverUrl:"",albumDesc:"",albumFavoriteCount:0,albumName:"",albumStatus:0,albumTag:"",auditVersion:0,createBy:0,createTime:"",delFlag:null,hotFlag:null,id:0,musicSheetCount:0,musicTagNames:"",sortNumber:0,topFlag:null,updateBy:34,updateTime:"",favorite:0}}},setup(l){const a=h({detail:l.detail});_(()=>l.detail,i=>{a.detail=i});const m=p(),s=()=>{m.push({path:"/albumDetail",query:{id:a.detail.id}})};return()=>t(b,null,[t("div",{class:e.itemWrap,onClick:()=>{s()}},[t("img",{class:e.startImage,src:a.detail.favorite?u:c,alt:""},null),t("div",{class:e.hold},[t("div",{class:e.masker},[t("img",{src:n,alt:""},null)]),t("img",{src:a.detail.albumCoverUrl?a.detail.albumCoverUrl:r,alt:""},null)]),t("h2",null,[a.detail.albumName]),t("div",{class:e.itemBottom},[t("div",{class:e.itemBottomL},[t("span",null,[a.detail.musicSheetCount,o("\u9996")])]),t("div",{class:e.itemBottomR},[t("span",null,[a.detail.albumFavoriteCount,o("\u6536\u85CF")])])])])])}});export{k as a};

dist/assets/index.40c1df3d.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.40c1df3d.js
 import{d as i,c as e,x as o,a as s}from"./vendor.b02f1696.js";var a=i({name:"item",props:{item:{type:Object,default:()=>({})}},render(){const t=this.item;return e("div",{class:"border border-[#E0E0E0] box-border rounded-[10px] w-[218px] m-auto overflow-hidden relative transition-all cursor-pointer",onClick:()=>{console.log(t),t.type==="video"&&this.$router.push({path:"/videoDetail",query:{id:t.id}})}},[e("div",{class:"relative"},[e(o,{class:"w-full h-[122px] align-middle",fit:"cover",src:t.backgroundPic},null),e("div",{class:"text-sm text-[#52FFDC] h-7 leading-7 px-3 flex items-center justify-end absolute left-0 right-0 bottom-0 bg-black/60"},[e("i",{class:"w-1 h-1 bg-[#52FFDC] rounded-full mr-1.5 inline-block"},null),t.studentCount,s("\u4EBA\u5DF2\u8D2D\u4E70")])]),e("div",{class:"text-base px-2.5 pt-2 text-[#666666] leading-none font-semibold whitespace-nowrap overflow-hidden text-ellipsis"},[t.courseGroupName]),t.courseStartTime&&e("p",{class:"text-[#999] text-xs px-2.5 leading-none pt-1.5"},[s("\u5F00\u8BFE\u65F6\u95F4\uFF1A"),t.courseStartTime]),e("div",{class:"mx-2.5 pt-1.5 pb-2 flex items-center justify-between"},[e("div",{class:"text-xl text-[#F90000] font-semibold leading-none"},[e("span",{class:"text-sm leading-7"},[s("\uFFE5")]),t.coursePrice]),e("div",{class:"text-base text-[#FF5F22] leading-none"},[t.courseNum,s("\u8BFE\u65F6")])])])}});export{a as I};
+========
+import{d as i,c as e,x as o,a as s}from"./vendor.3e065b0c.js";var a=i({name:"item",props:{item:{type:Object,default:()=>({})}},render(){const t=this.item;return e("div",{class:"border border-[#E0E0E0] box-border rounded-[10px] w-[218px] m-auto overflow-hidden relative transition-all cursor-pointer",onClick:()=>{console.log(t),t.type==="video"&&this.$router.push({path:"/videoDetail",query:{id:t.id}})}},[e("div",{class:"relative"},[e(o,{class:"w-full h-[122px] align-middle",fit:"cover",src:t.backgroundPic},null),e("div",{class:"text-sm text-[#52FFDC] h-7 leading-7 px-3 flex items-center justify-end absolute left-0 right-0 bottom-0 bg-black/60"},[e("i",{class:"w-1 h-1 bg-[#52FFDC] rounded-full mr-1.5 inline-block"},null),t.studentCount,s("\u4EBA\u5DF2\u8D2D\u4E70")])]),e("div",{class:"text-base px-2.5 pt-2 text-[#666666] leading-none font-semibold whitespace-nowrap overflow-hidden text-ellipsis"},[t.courseGroupName]),t.courseStartTime&&e("p",{class:"text-[#999] text-xs px-2.5 leading-none pt-1.5"},[s("\u5F00\u8BFE\u65F6\u95F4\uFF1A"),t.courseStartTime]),e("div",{class:"mx-2.5 pt-1.5 pb-2 flex items-center justify-between"},[e("div",{class:"text-xl text-[#F90000] font-semibold leading-none"},[e("span",{class:"text-sm leading-7"},[s("\uFFE5")]),t.coursePrice]),e("div",{class:"text-base text-[#FF5F22] leading-none"},[t.courseNum,s("\u8BFE\u65F6")])])])}});export{a as I};
+>>>>>>>> newVersion:dist/assets/index.fa2d3a19.js

dist/assets/index.47ee097f.js

@@ -0,0 +1 @@
+import{_ as i,a as g,b as n,c as l,d as t,e as m,f as r,g as p,h as c,i as d,j as u,k as b,l as x,m as f,n as v,o as A}from"./music_default.03358cd5.js";import{_ as D}from"./icon_timer.e5c284b0.js";import{_ as T,a as j}from"./icon_vip_default.947b22a2.js";import{g as _,z as h,c as w}from"./index.4d5173c8.js";import{d as E,c as e,a as o}from"./vendor.3e065b0c.js";const F=s=>{const a=`../../images/${s}`;return{"../../images/course_bg.png":i,"../../images/entry_active.png":g,"../../images/entry_default.png":n,"../../images/icon_cert.png":l,"../../images/icon_cert_default.png":t,"../../images/icon_king.png":m,"../../images/icon_live.png":r,"../../images/icon_live_default.png":p,"../../images/icon_member.png":c,"../../images/icon_member_default.png":d,"../../images/icon_music.png":u,"../../images/icon_music_default.png":b,"../../images/icon_timer.png":D,"../../images/icon_video.png":x,"../../images/icon_video_default.png":f,"../../images/icon_vip.png":T,"../../images/icon_vip_default.png":j,"../../images/music_active.png":v,"../../images/music_default.png":A}[a].default};var H=E({name:"open-member",render(){return console.log(_()),e("div",null,[e("img",{src:F("icon_king.png"),class:"w-[318px] absolute -top-10 left-1/2 -ml-[158px]"},null),e("div",{class:"text-center text-2xl font-semibold text-[#333] pt-[70px] pb-9"},[o("\u624B\u673A\u626B\u7801\u4E0B\u8F7D"),_()==="STUDENT"?"\u9177\u4E50\u79C0":"\u9177\u4E50\u79C0\u5B66\u9662",o("App")]),_()==="TEACHER"?e("img",{src:h,class:"mx-auto w-[216px] h-[216px] align-middle border-4 border-solid border-[#2DC7AA] rounded-[10px]"},null):e("img",{src:w,class:"mx-auto w-[216px] h-[216px] align-middle border-4 border-solid border-[#2DC7AA] rounded-[10px]"},null),e("p",{class:"text-lg text-center text-[#333] pt-8"},[o("\u6253\u5F00"),_()==="STUDENT"?"\u9177\u4E50\u79C0":"\u9177\u4E50\u79C0\u5B66\u9662",o("App\u5F00\u901A\u4F1A\u5458")])])}});export{H as O};

dist/assets/index.55292a92.js

@@ -0,0 +1 @@
+import{d as a,c as t,a as s,k as n}from"./vendor.3e065b0c.js";var u="./assets/404.2e8d3dbb.png";const i="_img_qlhqa_11",p="_slideUp_qlhqa_1",l="_tips_qlhqa_18",r="_btn_qlhqa_25";var e={img:i,slideUp:p,tips:l,btn:r},c=a({name:"404",render(){return t("div",{class:"text-center py-32"},[t("img",{src:u,class:["w-[425px] h-[375px] m-auto",e.img]},null),t("p",{class:["pt-9 pb-6 text-xl text-[#999]",e.tips]},[s("\u62B1\u6B49\uFF0C\u9875\u9762\u627E\u4E0D\u5230\u4E86\uFF5E")]),t(n,{type:"primary",class:e.btn,onClick:()=>{this.$router.push("/")}},{default:()=>[s("\u56DE\u5230\u9996\u9875")]})])}});export{c as default};

dist/assets/index.665af467.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.d1158f24.js
+import{d as s,c as e,k as r}from"./vendor.b02f1696.js";var t="./assets/icon_empty.df5db7bf.png",a="./assets/icon_no_live.fcb0eb56.png",n="./assets/icon_teacher_cert.ee709a8f.png",i="./assets/icon_music_cert.a65c8b91.png",l=s({name:"col-empty",props:{message:{type:String,default:"\u6682\u65E0\u6570\u636E"},buttonText:{type:String,default:"\u53BB\u9996\u9875"},buttonVisibility:{type:Boolean,default:!1},type:{type:String,default:"empty"},onDetail:{type:Function,default:()=>{}}},computed:{icon(){switch(this.type){case"empty":return t;case"live":return a;case"teacherCert":return n;case"musicCert":return i;default:return t}}},render(){return e("div",{class:"w-full h-full text-center flex items-center justify-center flex-col"},[e("img",{src:this.icon,class:"w-64 m-auto"},null),e("p",{class:"text-base text-[#999999] pt-4 pb-6"},[this.message]),this.buttonVisibility&&e(r,{type:"primary",class:"rounded-sm !px-12",round:!0,style:{height:"48px"},onClick:()=>{this.onDetail()}},{default:()=>[this.buttonText]})])}});export{l as C};
+========
+import{d as s,c as e,k as r}from"./vendor.3e065b0c.js";var t="./assets/icon_empty.df5db7bf.png",a="./assets/icon_no_live.fcb0eb56.png",n="./assets/icon_teacher_cert.ee709a8f.png",i="./assets/icon_music_cert.a65c8b91.png",l=s({name:"col-empty",props:{message:{type:String,default:"\u6682\u65E0\u6570\u636E"},buttonText:{type:String,default:"\u53BB\u9996\u9875"},buttonVisibility:{type:Boolean,default:!1},type:{type:String,default:"empty"},onDetail:{type:Function,default:()=>{}}},computed:{icon(){switch(this.type){case"empty":return t;case"live":return a;case"teacherCert":return n;case"musicCert":return i;default:return t}}},render(){return e("div",{class:"w-full h-full text-center flex items-center justify-center flex-col"},[e("img",{src:this.icon,class:"w-64 m-auto"},null),e("p",{class:"text-base text-[#999999] pt-4 pb-6"},[this.message]),this.buttonVisibility&&e(r,{type:"primary",class:"rounded-sm !px-12",round:!0,style:{height:"48px"},onClick:()=>{this.onDetail()}},{default:()=>[this.buttonText]})])}});export{l as C};
+>>>>>>>> newVersion:dist/assets/index.665af467.js

dist/assets/index.d1158f24.js

@@ -1 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.d1158f24.js
 import{d as s,c as e,k as r}from"./vendor.b02f1696.js";var t="./assets/icon_empty.df5db7bf.png",a="./assets/icon_no_live.fcb0eb56.png",n="./assets/icon_teacher_cert.ee709a8f.png",i="./assets/icon_music_cert.a65c8b91.png",l=s({name:"col-empty",props:{message:{type:String,default:"\u6682\u65E0\u6570\u636E"},buttonText:{type:String,default:"\u53BB\u9996\u9875"},buttonVisibility:{type:Boolean,default:!1},type:{type:String,default:"empty"},onDetail:{type:Function,default:()=>{}}},computed:{icon(){switch(this.type){case"empty":return t;case"live":return a;case"teacherCert":return n;case"musicCert":return i;default:return t}}},render(){return e("div",{class:"w-full h-full text-center flex items-center justify-center flex-col"},[e("img",{src:this.icon,class:"w-64 m-auto"},null),e("p",{class:"text-base text-[#999999] pt-4 pb-6"},[this.message]),this.buttonVisibility&&e(r,{type:"primary",class:"rounded-sm !px-12",round:!0,style:{height:"48px"},onClick:()=>{this.onDetail()}},{default:()=>[this.buttonText]})])}});export{l as C};
+========
+import{d as s,c as e,k as r}from"./vendor.3e065b0c.js";var t="./assets/icon_empty.df5db7bf.png",a="./assets/icon_no_live.fcb0eb56.png",n="./assets/icon_teacher_cert.ee709a8f.png",i="./assets/icon_music_cert.a65c8b91.png",l=s({name:"col-empty",props:{message:{type:String,default:"\u6682\u65E0\u6570\u636E"},buttonText:{type:String,default:"\u53BB\u9996\u9875"},buttonVisibility:{type:Boolean,default:!1},type:{type:String,default:"empty"},onDetail:{type:Function,default:()=>{}}},computed:{icon(){switch(this.type){case"empty":return t;case"live":return a;case"teacherCert":return n;case"musicCert":return i;default:return t}}},render(){return e("div",{class:"w-full h-full text-center flex items-center justify-center flex-col"},[e("img",{src:this.icon,class:"w-64 m-auto"},null),e("p",{class:"text-base text-[#999999] pt-4 pb-6"},[this.message]),this.buttonVisibility&&e(r,{type:"primary",class:"rounded-sm !px-12",round:!0,style:{height:"48px"},onClick:()=>{this.onDetail()}},{default:()=>[this.buttonText]})])}});export{l as C};
+>>>>>>>> newVersion:dist/assets/index.665af467.js

dist/assets/index.fa2d3a19.js

@@ -0,0 +1,5 @@
+<<<<<<<< HEAD:dist/assets/index.40c1df3d.js
+import{d as i,c as e,x as o,a as s}from"./vendor.b02f1696.js";var a=i({name:"item",props:{item:{type:Object,default:()=>({})}},render(){const t=this.item;return e("div",{class:"border border-[#E0E0E0] box-border rounded-[10px] w-[218px] m-auto overflow-hidden relative transition-all cursor-pointer",onClick:()=>{console.log(t),t.type==="video"&&this.$router.push({path:"/videoDetail",query:{id:t.id}})}},[e("div",{class:"relative"},[e(o,{class:"w-full h-[122px] align-middle",fit:"cover",src:t.backgroundPic},null),e("div",{class:"text-sm text-[#52FFDC] h-7 leading-7 px-3 flex items-center justify-end absolute left-0 right-0 bottom-0 bg-black/60"},[e("i",{class:"w-1 h-1 bg-[#52FFDC] rounded-full mr-1.5 inline-block"},null),t.studentCount,s("\u4EBA\u5DF2\u8D2D\u4E70")])]),e("div",{class:"text-base px-2.5 pt-2 text-[#666666] leading-none font-semibold whitespace-nowrap overflow-hidden text-ellipsis"},[t.courseGroupName]),t.courseStartTime&&e("p",{class:"text-[#999] text-xs px-2.5 leading-none pt-1.5"},[s("\u5F00\u8BFE\u65F6\u95F4\uFF1A"),t.courseStartTime]),e("div",{class:"mx-2.5 pt-1.5 pb-2 flex items-center justify-between"},[e("div",{class:"text-xl text-[#F90000] font-semibold leading-none"},[e("span",{class:"text-sm leading-7"},[s("\uFFE5")]),t.coursePrice]),e("div",{class:"text-base text-[#FF5F22] leading-none"},[t.courseNum,s("\u8BFE\u65F6")])])])}});export{a as I};
+========
+import{d as i,c as e,x as o,a as s}from"./vendor.3e065b0c.js";var a=i({name:"item",props:{item:{type:Object,default:()=>({})}},render(){const t=this.item;return e("div",{class:"border border-[#E0E0E0] box-border rounded-[10px] w-[218px] m-auto overflow-hidden relative transition-all cursor-pointer",onClick:()=>{console.log(t),t.type==="video"&&this.$router.push({path:"/videoDetail",query:{id:t.id}})}},[e("div",{class:"relative"},[e(o,{class:"w-full h-[122px] align-middle",fit:"cover",src:t.backgroundPic},null),e("div",{class:"text-sm text-[#52FFDC] h-7 leading-7 px-3 flex items-center justify-end absolute left-0 right-0 bottom-0 bg-black/60"},[e("i",{class:"w-1 h-1 bg-[#52FFDC] rounded-full mr-1.5 inline-block"},null),t.studentCount,s("\u4EBA\u5DF2\u8D2D\u4E70")])]),e("div",{class:"text-base px-2.5 pt-2 text-[#666666] leading-none font-semibold whitespace-nowrap overflow-hidden text-ellipsis"},[t.courseGroupName]),t.courseStartTime&&e("p",{class:"text-[#999] text-xs px-2.5 leading-none pt-1.5"},[s("\u5F00\u8BFE\u65F6\u95F4\uFF1A"),t.courseStartTime]),e("div",{class:"mx-2.5 pt-1.5 pb-2 flex items-center justify-between"},[e("div",{class:"text-xl text-[#F90000] font-semibold leading-none"},[e("span",{class:"text-sm leading-7"},[s("\uFFE5")]),t.coursePrice]),e("div",{class:"text-base text-[#FF5F22] leading-none"},[t.courseNum,s("\u8BFE\u65F6")])])])}});export{a as I};
+>>>>>>>> newVersion:dist/assets/index.fa2d3a19.js

dist/assets/moreArrow.22b983e7.js

@@ -0,0 +1 @@
+import{d as o,r as n,S as c,c as A,F as m}from"./vendor.3e065b0c.js";const r="_tag_ks7yu_1",g="_small_ks7yu_27",U="_active_ks7yu_34";var s={tag:r,small:g,active:U},p=o({name:"tagItem",emits:["searchTag"],props:{title:{type:String,default:""},isChiose:{type:Boolean,default:!1},item:{type:Object,default:{isCheck:!1}},isSmall:{type:Boolean,default:!1}},setup(a,l){const e=n({title:a.title,isCheck:a.item.isCheck,isSmall:a.isSmall}),i=t=>{l.emit("searchTag",t)};return c(()=>a.item,t=>{console.log(t),e.isCheck=t.isCheck},{deep:!0}),()=>A(m,null,[A("div",{onClick:()=>i(e.title),class:[s.tag,e.isSmall?s.small:""]},[e.title])])}}),C="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAwlJREFUWEfVmT1oFFEQx//z4iVYCAEtFAUJFlpo5UcsDVgINoIKEay08ANtYpODu9u3ewenzRWJqFhYKSpJIIWpbQUVxFiYQkGMKFxOAhaarHkjc7kLe5dLLm/3Nqxb7nsz78fMzsfOI4R4tNZqaWnpqFJqAMBhZt4PYBeAbTV1vwB8J6IZAG+NMS+7urpea62N7XFkI1AoFHb7vn+DmS8C2GMjC2CWiB6nUqm7mUzm20ZlNwSYTqe3p1KpPIBLAHo2qnyNfQsAHvm+ny0Wi5V2utoCaq0HjTGjAHa0U2a5PqeUuqm1frae3JqAWustzDzKzFctD7baTkQPiEhA/7YSbAlYKpW2zs/PjwE4bXVa+M1Tvb2954eGhn43q1gFKJYzxkxuIlydaUopdabZkqsAHce5H7db1zK0uNt13WvB9QbAWkA8De+p6JJKqQvBwFkBrKWSjzFEqy31nO/7B+opaAUwl8vdA9Bg3jaapSpIlL9TSl1h5uO2JOvsv+953nVZrwJKhVhcXPxkmYSfeJ4nFQUjIyM9lUplkplPdQhyobu7e59UnCqg4zhFZh62Ua6UuqO1XpHpNCQR3XZdN01S+I0xX0LU1ooxpr9QKIjlq0+HIWeVUnspm832E9ErG+sF9s4aY07EBSnfNTmOM8zMxZCAIhYbJBGlKZfLjQM4GwFQRL8aYwZisOSEAE4DOBgRMC7IDwJY7mBybmnJcrn8gohOhjDCnAD+scx/7c5ZBZnJZPqUUp/bCbZYX9gUwHw+3+f7fmjAxLv4PYBDIczfLBJHJE9LHhxj5nMRAeOAAxGNdyJRxwJX7WQkUUcsdbHBCWC11EVoFn4aY47FUD3qX9tysxC23SKikuu6t2LqZMS9y+1WhIZ1wvO8anB1uM0SlY0Nq7wJ0fIzgIcyHAJwGUB/xEwQFG9s+WUl8T9NApmE304Ag57nPa+b8//6ca9ZMdmjD4FM9PCo7vtEj9+C8Z7YAWYQMtEj4CBoYofozRUieA3BzEcAyDXEzqZriB8AZojoTZRriH/AKz0mle7dAAAAAABJRU5ErkJggg==";export{C as a,p as t};

dist/index.html

@@ -34,9 +34,15 @@
     <!-- windows phone 点击无高光 -->
     <meta name="msapplication-tap-highlight" content="no" />
     <title>酷乐秀</title>
+<<<<<<< HEAD
     <script type="module" crossorigin src="./assets/index.60523354.js"></script>
     <link rel="modulepreload" href="./assets/vendor.b02f1696.js">
     <link rel="stylesheet" href="./assets/index.168e7261.css">
+=======
+    <script type="module" crossorigin src="./assets/index.4d5173c8.js"></script>
+    <link rel="modulepreload" href="./assets/vendor.3e065b0c.js">
+    <link rel="stylesheet" href="./assets/index.c087993d.css">
+>>>>>>> newVersion
     <script type="module">!function(){try{new Function("m","return import(m)")}catch(o){console.warn("vite: loading legacy build because dynamic import is unsupported, syntax error above should be ignored");var e=document.getElementById("vite-legacy-polyfill"),n=document.createElement("script");n.src=e.src,n.onload=function(){System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))},document.body.appendChild(n)}}();</script>
   </head>
 
@@ -45,6 +51,10 @@
     
     <script nomodule>!function(){var e=document,t=e.createElement("script");if(!("noModule"in t)&&"onbeforeload"in t){var n=!1;e.addEventListener("beforeload",(function(e){if(e.target===t)n=!0;else if(!e.target.hasAttribute("nomodule")||!n)return;e.preventDefault()}),!0),t.type="module",t.src=".",e.head.appendChild(t),t.remove()}}();</script>
     <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.f87d81cd.js"></script>
+<<<<<<< HEAD
     <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.e248e9a7.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+    <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.93a7afb7.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> newVersion
   </body>
 </html>

src/views/muiscDetial/modals/musicItem.tsx

@@ -4,7 +4,7 @@ import classes from './musicItem.module.less'
 import music from '@/components/musicLIstItem/images/music.png'
 import arrow from '@/components/musicLIstItem/images/arrow.png'
 import { useRouter } from 'vue-router'
-
+import { ElTooltip } from 'element-plus'
 type Props = {
   id?: Number
   addName: String
@@ -63,8 +63,10 @@ export default defineComponent({
               <img src={music} alt="" />
             </div>
             <div class={classes.textWrap}>
+
               <p>
-                {state.item.musicSheetName}
+                <ElTooltip placement="top" content={state.item.musicSheetName}>{state.item.musicSheetName}</ElTooltip>
+
 
               </p>
               <p>

src/views/role-auth/teacherAuth/components/edu-information/index.tsx

@@ -62,21 +62,31 @@ export default defineComponent({
       >
         <ElFormItem
           labelWidth={this.labelWidth}
-          label="毕业院校（选填）"
+          label="毕业院校（必填）"
           prop="graduateSchool"
-          // rules={[
-          //   {
-          //     required: true,
-          //     message: '请输入您的毕业院校'
-          //   }
-          // ]}
+          rules={[
+            {
+              required: true,
+              message: '请输入您的毕业院校'
+            }
+          ]}
         >
           <ElInput
             v-model={teacherState.teacherCert.graduateSchool}
             placeholder="请输入您的毕业院校"
           />
         </ElFormItem>
-        <ElFormItem labelWidth={this.labelWidth} label="专业（选填）">
+        <ElFormItem
+          labelWidth={this.labelWidth}
+          label="专业（必填）"
+          prop="subject"
+          rules={[
+            {
+              required: true,
+              message: '请输入您的专业名称'
+            }
+          ]}
+        >
           <ElInput
             v-model={teacherState.teacherCert.subject}
             placeholder="请输入您的专业名称"

src/views/student-info/my-follow/item.tsx

@@ -2,6 +2,7 @@ import { defineComponent } from 'vue'
 import styles from './index.module.less'
 import iconTeacher from '@/common/images/icon_teacher.png'
 import {
+  dayjs,
   ElButton,
   ElImage,
   ElMessage,
@@ -74,8 +75,13 @@ export default defineComponent({
           }
           break
         case 'VIP':
-          if (teacher) {
-            status = teacher.isVip > 0
+          if (teacher.membershipStartTime && teacher.membershipEndTime) {
+            const startTime = dayjs(teacher.membershipStartTime).valueOf()
+            const endTime = dayjs(teacher.membershipEndTime).valueOf()
+            const nowTime = dayjs().valueOf()
+            status = nowTime >= startTime && nowTime <= endTime
+          } else {
+            status = false
           }
           break
         default:
@@ -102,21 +108,21 @@ export default defineComponent({
               {item.userName}
             </p>
             <div class="flex items-center">
-              {/* <ElImage
+              <ElImage
                 src={
                   this.checkBadge('VIP')
                     ? getAssetsHomeFile('icon_vip.png')
                     : getAssetsHomeFile('icon_vip_default.png')
                 }
                 class="h-7 -ml-1"
-              /> */}
+              />
               <img
                 src={
                   this.checkBadge('STYLE')
                     ? getAssetsHomeFile('icon_cert.png')
                     : getAssetsHomeFile('icon_cert_default.png')
                 }
-                class="h-[26px] -ml-1"
+                class="h-[26px] px-1"
               />
               <img
                 src={

src/views/user-info/live-operation/course-class/index.tsx

@@ -207,8 +207,8 @@ export default defineComponent({
               }}
             />
           </ElFormItem>
-          <ElFormItem label="课程封面" class="!mb-0" required>
-            <ElTabs
+         {/*  <ElFormItem label="课程封面" class="!mb-0" required> */}
+            {/* <ElTabs
               v-model={createState.tabIndex}
               class={styles.tabs}
               onTab-change={(name: any) => {
@@ -218,9 +218,40 @@ export default defineComponent({
               <ElTabPane label="图片模板" name={1}></ElTabPane>
               <ElTabPane label="自定义模板" name={2}></ElTabPane>
             </ElTabs>
-          </ElFormItem>
 
-          {createState.tabIndex === 1 && (
+            */}
+              <ElFormItem
+              label="课程封面"
+              prop="backgroundPic"
+              rules={[
+                {
+                  required: true,
+                  message: '请上传课程封面',
+                  trigger: 'change'
+                }
+              ]}
+            >
+              <ColCropper
+                modelValue={createState.live.backgroundPic}
+                bucket="video-course"
+                cropUploadSuccess={(data: any) => {
+                  createState.live.backgroundPic = data
+                  createState.live.backgroundPicTemplate = ''
+                }}
+                options={{
+                  title: '课程封面',
+                  fixedNumber: [3.34, 2],
+                  autoCropWidth: 375,
+                  autoCropHeight: 212
+                  // fixedNumber: [3, 2],
+                  // autoCropWidth: 300,
+                  // autoCropHeight: 200
+                }}
+              />
+            </ElFormItem>
+          {/* </ElFormItem> */}
+
+          {/* {createState.tabIndex === 1 && (
             <ElFormItem
               prop="backgroundPicTemplate"
               rules={[
@@ -253,38 +284,11 @@ export default defineComponent({
                 </ElRow>
               </ElRadioGroup>
             </ElFormItem>
-          )}
+          )} */}
 
-          {createState.tabIndex === 2 && (
-            <ElFormItem
-              prop="backgroundPic"
-              rules={[
-                {
-                  required: true,
-                  message: '请上传课程封面',
-                  trigger: 'change'
-                }
-              ]}
-            >
-              <ColCropper
-                modelValue={createState.live.backgroundPic}
-                bucket="video-course"
-                cropUploadSuccess={(data: any) => {
-                  createState.live.backgroundPic = data
-                  createState.live.backgroundPicTemplate = ''
-                }}
-                options={{
-                  title: '课程封面',
-                  fixedNumber: [3.34, 2],
-                  autoCropWidth: 375,
-                  autoCropHeight: 212
-                  // fixedNumber: [3, 2],
-                  // autoCropWidth: 300,
-                  // autoCropHeight: 200
-                }}
-              />
-            </ElFormItem>
-          )}
+          {/* {createState.tabIndex === 2 && (
+
+          )} */}
         </ElForm>
         <div class="text-center pt-6 pb-7">
           <ElButton

src/views/user-info/open-live/index.tsx

@@ -115,7 +115,15 @@ export default defineComponent({
             </div>
           )}
 
-          <div class={['flex justify-between', !this.btnStatus && 'mt-8']}>
+          <div
+            class={[
+              'text-2xl text-[#333] pb-4 mt-8',
+              !this.btnStatus && 'mt-8'
+            ]}
+          >
+            开通条件
+          </div>
+          <div class={['flex justify-between']}>
             <div
               class="w-[334px] rounded-[10px] px-7 py-7"
               style={{
@@ -123,26 +131,16 @@ export default defineComponent({
               }}
             >
               <div class="flex justify-between items-center">
-                <span class="text-2xl text-[#666]">
+                <span class="text-xl text-[#666]">
                   <i class="text-[#E32121] pr-1">*</i>粉丝数
                 </span>
                 <div class="text-2xl text-[#999] font-semibold flex items-center">
                   <span class="text-4xl text-black leading-none">
-                    {this.users?.fansNum}
+                    {this.fansNum}
                   </span>
-                  <span>/</span>
-                  <span class="mt-1">{this.fansNum}</span>
+                  <span class="mt-1 text-xl text-black">人</span>
                 </div>
               </div>
-              <div class="relative h-3.5 mt-7">
-                <div class="absolute w-full h-full bg-[#E9E9E9] z-10 rounded-lg" />
-                <div
-                  class="absolute h-full bg-[#FFA449] z-20 rounded-lg"
-                  style={{
-                    width: this.getRate(this.users?.fansNum, this.fansNum)
-                  }}
-                />
-              </div>
             </div>
 
             <div
@@ -152,26 +150,16 @@ export default defineComponent({
               }}
             >
               <div class="flex justify-between items-center">
-                <span class="text-2xl text-[#666]">
+                <span class="text-xl text-[#666]">
                   <i class="text-[#E32121] pr-1">*</i>课程数
                 </span>
                 <div class="text-2xl text-[#999] font-semibold flex items-center">
                   <span class="text-4xl text-black leading-none">
-                    {this.users?.expTime}
+                    {this.overClassNum}
                   </span>
-                  <span>/</span>
-                  <span class="mt-1">{this.overClassNum}</span>
+                  <span class="mt-1 text-xl text-black">课时</span>
                 </div>
               </div>
-              <div class="relative h-3.5 mt-7">
-                <div class="absolute w-full h-full bg-[#E9E9E9] z-10 rounded-lg" />
-                <div
-                  class="absolute h-full bg-[#2DC7AA] z-20 rounded-lg"
-                  style={{
-                    width: this.getRate(this.users?.expTime, this.overClassNum)
-                  }}
-                />
-              </div>
             </div>
           </div>
 

src/views/user-info/video-operation/course-info/index.tsx

@@ -20,6 +20,7 @@ import {
 import { defineComponent } from 'vue'
 import { createState } from '../createState'
 import { scrollAnimation } from '@/util/scroll'
+import ColUpload from '@/components/col-upload'
 
 export default defineComponent({
   name: 'course-info',
@@ -197,8 +198,8 @@ export default defineComponent({
             </p>
             <p>您的课程收入将在课程结束后结算到您的账户中 </p>
           </div>
-          <ElFormItem label="课程封面" class="!mb-0" required>
-            <ElTabs
+          {/* <ElFormItem label="课程封面" class="!mb-0" required>
+           <ElTabs
               v-model={createState.tabIndex}
               class={styles.tabs}
               onTab-change={(name: any) => {
@@ -208,9 +209,9 @@ export default defineComponent({
               <ElTabPane label="图片模板" name={1}></ElTabPane>
               <ElTabPane label="自定义模板" name={2}></ElTabPane>
             </ElTabs>
-          </ElFormItem>
+          </ElFormItem> */}
 
-          {createState.tabIndex === 1 && (
+          {/* {createState.tabIndex === 1 && (
             <ElFormItem
               prop="lessonCoverTemplateUrl"
               rules={[
@@ -245,45 +246,47 @@ export default defineComponent({
                 </ElRow>
               </ElRadioGroup>
             </ElFormItem>
-          )}
+          )} */}
 
-          {createState.tabIndex === 2 && (
-            <ElFormItem
-              prop="lessonCoverUrl"
-              rules={[
-                {
-                  required: true,
-                  message: '请上传课程封面',
-                  trigger: 'change'
-                }
-              ]}
-            >
-              {/* <ColUpload
+          {/* {createState.tabIndex === 2 && ( */}
+          <ElFormItem
+            label="课程封面"
+            class="!mb-0"
+            prop="lessonCoverUrl"
+            rules={[
+              {
+                required: true,
+                message: '请上传课程封面',
+                trigger: 'change'
+              }
+            ]}
+          >
+            {/* <ColUpload
                 v-model:modelValue={createState.lessonGroup.lessonCoverUrl}
                 onChange={(value: any) => {
                   createState.lessonGroup.lessonCoverTemplateUrl = ''
                 }}
               /> */}
-              <ColCropper
-                modelValue={createState.lessonGroup.lessonCoverUrl}
-                class={styles.imgCover}
-                bucket="video-course"
-                cropUploadSuccess={(data: any) => {
-                  createState.lessonGroup.lessonCoverUrl = data
-                  createState.lessonGroup.lessonCoverTemplateUrl = ''
-                }}
-                options={{
-                  // fixedNumber: [3, 2],
-                  // autoCropWidth: 300,
-                  // autoCropHeight: 200
-                  title: '课程封面',
-                  fixedNumber: [3.34, 2],
-                  autoCropWidth: 375,
-                  autoCropHeight: 212
-                }}
-              />
-            </ElFormItem>
-          )}
+
+            <ColCropper
+              modelValue={createState.lessonGroup.lessonCoverUrl}
+              bucket="video-course"
+              cropUploadSuccess={(data: any) => {
+                createState.lessonGroup.lessonCoverUrl = data
+                createState.lessonGroup.lessonCoverTemplateUrl = ''
+              }}
+              options={{
+                title: '课程封面',
+                fixedNumber: [3.34, 2],
+                autoCropWidth: 375,
+                autoCropHeight: 212
+                // fixedNumber: [3, 2],
+                // autoCropWidth: 300,
+                // autoCropHeight: 200
+              }}
+            />
+          </ElFormItem>
+          {/* )} */}
         </ElForm>
         <div class=" text-center pt-6 pb-7">
           <ElButton

yarn.lock

@@ -2893,6 +2893,10 @@
   "resolved" "https://registry.npmmirror.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz"
   "version" "0.9.3"
 
+"esbuild-darwin-64@0.13.15":
+  "integrity" "sha512-ihOQRGs2yyp7t5bArCwnvn2Atr6X4axqPpEdCFPVp7iUj4cVSdisgvEKdNR7yH3JDjW6aQDw40iQFoTqejqxvQ=="
+  "version" "0.13.15"
+
 "esbuild@^0.13.12":
   "integrity" "sha512-raCxt02HBKv8RJxE8vkTSCXGIyKHdEdGfUmiYb8wnabnaEmHzyW7DCHb5tEN0xU8ryqg5xw54mcwnYkC4x3AIw=="
   "version" "0.13.15"
@@ -3271,6 +3275,11 @@
   "resolved" "https://registry.npmmirror.com/fs.realpath/-/fs.realpath-1.0.0.tgz"
   "version" "1.0.0"
 
+"fsevents@~2.3.2":
+  "integrity" "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA=="
+  "resolved" "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.2.tgz"
+  "version" "2.3.2"
+
 "function-bind@^1.1.1":
   "integrity" "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
   "resolved" "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.1.tgz"