Merge branch 'dev' into 8-16

dist/assets/index-legacy.45d11695.js

@@ -0,0 +1,2 @@
+;(function(){System.register(['./vendor-legacy.9dbccea3.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}});}if(item.type==='live'&&item.status==="CANCEL"){// 直播课
+_this.$router.push({path:'/userInfo/liveOperation',query:{type:'edit',groupId:item.courseGroupId}});}}},[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-legacy.4acb2a31.js

@@ -0,0 +1,2 @@
+;(function(){System.register(['./vendor-legacy.9dbccea3.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.ef659f81.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.6a8e775a.js','./vendor-legacy.9dbccea3.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.a4;}],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.1652b85f.js

@@ -0,0 +1 @@
+import{d as a,c as t,a as e,k as n}from"./vendor.278ba663.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 s={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",s.img]},null),t("p",{class:["pt-9 pb-6 text-xl text-[#999]",s.tips]},[e("\u62B1\u6B49\uFF0C\u9875\u9762\u627E\u4E0D\u5230\u4E86\uFF5E")]),t(n,{type:"primary",class:s.btn,onClick:()=>{this.$router.push("/")}},{default:()=>[e("\u56DE\u5230\u9996\u9875")]})])}});export{c as default};

dist/assets/index.53109eb9.js

@@ -0,0 +1 @@
+import{u as a}from"./index.883476c9.js";import{d as o,c as i,a4 as l}from"./vendor.278ba663.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.56bc7e74.js

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

dist/assets/index.5c5ae985.js

@@ -0,0 +1 @@
+import{d as s,c as e,k as r}from"./vendor.278ba663.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};

dist/assets/index.abb1ab6f.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.883476c9.js";import{d as E,c as e,a as o}from"./vendor.278ba663.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.d82f1d4c.js

@@ -0,0 +1 @@
+import{h as r}from"./hold.c2fff6ac.js";import{l as u,s as n}from"./lineStart.fb76406f.js";import{p as c}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.278ba663.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:n,alt:""},null),t("div",{class:e.hold},[t("div",{class:e.masker},[t("img",{src:c,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/moreArrow.e9e7eaf0.js

@@ -0,0 +1 @@
+import{d as o,r as n,S as c,c as A,F as m}from"./vendor.278ba663.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,8 +34,14 @@
     <!-- windows phone 点击无高光 -->
     <meta name="msapplication-tap-highlight" content="no" />
     <title>酷乐秀</title>
+<<<<<<< HEAD
     <script type="module" crossorigin src="./assets/index.b76c8aec.js"></script>
     <link rel="stylesheet" href="./assets/index.a89d4fca.css">
+=======
+    <script type="module" crossorigin src="./assets/index.883476c9.js"></script>
+    <link rel="modulepreload" href="./assets/vendor.278ba663.js">
+    <link rel="stylesheet" href="./assets/index.2b4a5e2c.css">
+>>>>>>> dev
     <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>
 
@@ -43,7 +49,12 @@
     <div id="app"></div>
     
     <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>
+<<<<<<< HEAD
     <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.83ce0ade.js"></script>
     <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.90803b59.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+=======
+    <script nomodule id="vite-legacy-polyfill" src="./assets/polyfills-legacy.8cd33446.js"></script>
+    <script nomodule id="vite-legacy-entry" data-src="./assets/index-legacy.6a8e775a.js">System.import(document.getElementById('vite-legacy-entry').getAttribute('data-src'))</script>
+>>>>>>> dev
   </body>
 </html>

src/components/col-calendar/index.tsx

@@ -6,6 +6,8 @@ import styles from './index.module.less'
 import IconArrow from '@/common/images/icon_arrow.png'
 import IconClock from '@/common/images/icon_clock.png'
 import { ElButton, ElDialog, ElMessage, ElTag } from 'element-plus'
+import isToday from 'dayjs/plugin/isToday'
+dayjs.extend(isToday)
 
 export default defineComponent({
   name: 'calendar',
@@ -112,7 +114,8 @@ export default defineComponent({
       const dateStr = dayjs(date.date).format('YYYY-MM-DD')
       const dateObj = this.list[dateStr]
       // 判断是否有课程 并且 时间在当前时间之后
-      if (dateObj && dayjs().isBefore(dayjs(date.date))) {
+      date.type = ''
+      if (dateObj && dayjs().subtract(1, 'day').isBefore(dayjs(date.date))) {
         if (
           dateObj &&
           (dateObj.fullCourse ||
@@ -126,12 +129,15 @@ export default defineComponent({
       } else {
         date.type = 'disabled'
       }
+      if(this.$route.name == 'userInfoLiveOperation' && dayjs(date.date).isToday()) {
+        date.type = 'disabled'
+      }
       if (dateObj && this.isSkipHolidays && dateObj.holiday) {
         // date.bottomInfo = '节假日'
         date.type = 'disabled'
       }
 
-      date.type = date.type === 'selected' ? '' : date.type
+      // date.type = date.type === 'selected' ? '' : date.type
       return date
     },
     onPrevMonth() {
@@ -198,7 +204,12 @@ export default defineComponent({
     },
     _dayChange(date: Date) {
       const dateStr = dayjs(date).format('YYYY-MM-DD')
-      let dataList = (this.list[dateStr] && this.list[dateStr].courseTime) || []
+      let dataList = [] as any
+      if (this.list[dateStr] && Array.isArray(this.list[dateStr].courseTime)) {
+        dataList = [...this.list[dateStr].courseTime].filter(n =>
+          dayjs().isBefore(dayjs(n.startTime))
+        )
+      }
       dataList.forEach((item: any) => {
         item.start = dayjs(item.startTime).format('HH:mm')
         item.end = dayjs(item.endTime).format('HH:mm')

src/components/col-steps/index.tsx

@@ -78,7 +78,7 @@ export default defineComponent({
     this.stepLength = this.list[this.type].length
   },
   render() {
-    console.log(this.active)
+    // console.log(this.active)
     return (
       <div class={[styles.steps, 'flex items-center justify-between bg-white']}>
         {this.list[this.type].map((item: any, index: number) => (

src/views/user-info/components/item/index.tsx

@@ -25,6 +25,15 @@ export default defineComponent({
               }
             })
           }
+          if (item.type === 'live' && item.status === "CANCEL"){ // 直播课
+            this.$router.push({
+              path: '/userInfo/liveOperation',
+              query:{
+                type: 'edit',
+                groupId: item.courseGroupId
+              }
+            })
+          }
         }}
       >
         {/* {item.subjectName && (

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

@@ -31,7 +31,7 @@ export default defineComponent({
               })
             } else {
               if (!state.user.data?.entryFlag) {
-                ElMessage.error('您还未完成达人认证，认证后才可创建直播课')
+                ElMessage.error('您还未完成达人认证，认证后才可创建直播课程')
                 return
               }
 

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

@@ -111,6 +111,22 @@ export default defineComponent({
           scrollAnimation(currentY, 0)
         })
       }
+    },
+    async onUpdate() {
+      const params = {
+        id: createState.live.courseGroupId,
+        ...createState.live,
+        startTime: createState.live.coursePlanList[0].startTime,
+        backgroundPic:
+          createState.live.backgroundPic ||
+          createState.live.backgroundPicTemplate
+      }
+      // console.log({...params})
+      await request.post('/api-website/courseGroup/updateLiveCourse', {
+        data: params
+      })
+      ElMessage.success('编辑成功')
+      this.$router.replace('/userInfo/liveClass')
     }
   },
   render() {
@@ -152,6 +168,7 @@ export default defineComponent({
               }}
               placeholder="请输入开售日期"
               type="date"
+              disabled={createState.live.courseGroupId ? true : false}
             />
           </ElFormItem>
           <ElFormItem
@@ -184,6 +201,7 @@ export default defineComponent({
               }}
               placeholder="请输入停售日期"
               type="date"
+              disabled={createState.live.courseGroupId ? true : false}
             />
           </ElFormItem>
           <ElFormItem
@@ -205,10 +223,11 @@ export default defineComponent({
               v-slots={{
                 suffix: () => <span class="text-base text-[#999]">人</span>
               }}
+              disabled={createState.live.courseGroupId ? true : false}
             />
           </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) => {
@@ -220,35 +239,35 @@ export default defineComponent({
             </ElTabs>
 
             */}
-              <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
+            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 && (
@@ -297,11 +316,13 @@ export default defineComponent({
             onClick={() => {
               // console.log(true)
               createState.active = 2
-              createState.live.salesStartDate = ''
-              createState.live.salesEndDate = ''
-              createState.live.backgroundPic = ''
-              createState.live.backgroundPicTemplate = ''
-              createState.live.mixStudentNum = null
+              if (!createState.live.courseGroupId) {
+                createState.live.salesStartDate = ''
+                createState.live.salesEndDate = ''
+                createState.live.backgroundPic = ''
+                createState.live.backgroundPicTemplate = ''
+                createState.live.mixStudentNum = null
+              }
             }}
           >
             上一步
@@ -340,14 +361,25 @@ export default defineComponent({
                 >
                   返回编辑
                 </ElButton>
-                <ElButton
-                  size="large"
-                  round
-                  type="primary"
-                  onClick={this.onSubmit}
-                >
-                  创建完成
-                </ElButton>
+                {createState.live.courseGroupId ? (
+                  <ElButton
+                    size="large"
+                    round
+                    type="primary"
+                    onClick={this.onUpdate}
+                  >
+                    确定修改
+                  </ElButton>
+                ) : (
+                  <ElButton
+                    size="large"
+                    round
+                    type="primary"
+                    onClick={this.onSubmit}
+                  >
+                    创建完成
+                  </ElButton>
+                )}
               </span>
             )
           }}

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

@@ -118,6 +118,10 @@ export default defineComponent({
       })
     },
     async onSubmit() {
+      if (createState.live.courseGroupId){
+        createState.active = 3
+        return
+      }
       if (createState.selectCourseList.length <= 0) {
         Toast('请选择课程时间')
         return
@@ -243,17 +247,19 @@ export default defineComponent({
     return (
       <div class={[styles.arrange]}>
         <div class="px-12 pt-7">
-          <div class="px-8 pt-4 pb-6 bg-[#FCFCFC] rounded-[10px]">
-            <ColCalendar
-              selectList={createState.selectCourseList}
-              list={this.calendarList}
-              maxDays={createState.live.courseNum || 0}
-              nextMonth={(date: Date) => this.getList(date)}
-              prevMonth={(date: Date) => this.getList(date)}
-              selectDay={this.onSelectDay}
-              v-model:calendarDate={this.calendarDate}
-            />
-          </div>
+          {createState.live.courseGroupId ? null : (
+            <div class="px-8 pt-4 pb-6 bg-[#FCFCFC] rounded-[10px]">
+              <ColCalendar
+                selectList={createState.selectCourseList}
+                list={this.calendarList}
+                maxDays={createState.live.courseNum || 0}
+                nextMonth={(date: Date) => this.getList(date)}
+                prevMonth={(date: Date) => this.getList(date)}
+                selectDay={this.onSelectDay}
+                v-model:calendarDate={this.calendarDate}
+              />
+            </div>
+          )}
 
           <div class={[styles.arrangeCell, '!my-4']}>
             <div class={styles.rTitle}>
@@ -268,7 +274,7 @@ export default defineComponent({
                     size="large"
                     effect="light"
                     class={['mb-2 !border-[#2DC7AA] !color-[#2DC7AA] mr-2']}
-                    closable
+                    closable={createState.live.courseGroupId ? false : true}
                     onClose={() => this.onCloseTag(item)}
                   >
                     {item.title}
@@ -285,10 +291,14 @@ export default defineComponent({
             round
             class="!w-44 !h-[48px] !text-base"
             onClick={() => {
-              this.onReset()
+              if (!createState.live.courseGroupId) {
+                this.onReset()
+              }
               createState.active = 1
               // 重置选择的课次
-              createState.selectCourseList = []
+              if (!createState.live.courseGroupId) {
+                createState.selectCourseList = []
+              }
             }}
           >
             上一步

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

@@ -29,24 +29,36 @@ export default defineComponent({
   data() {
     return {
       url: '',
-      calcRatePrice: 0 as any,
-      calcSingleRatePrice: 0 as any
+      // calcRatePrice: 0 as any,
+      // calcSingleRatePrice: 0 as any
     }
   },
   computed: {
     subjectList() {
       // 学科列表
       return createState.subjectList || []
+    },
+    calcSingleRatePrice() {
+      let rate = createState.rate || 0
+      let nums = createState.live.courseNum
+      let price = createState.live.coursePrice || 0
+      return nums ? ((price / nums) * (1 - rate / 100)).toFixed(2) : 0
+    },
+    calcRatePrice() {
+      // 计算手续费
+      let rate = createState.rate || 0
+      let price = createState.live.coursePrice || 0
+      return (price - (rate / 100) * price).toFixed(2)
     }
   },
   async mounted() {
-    const rate = createState.rate || 0
-    const nums = createState.live.courseNum
-    const tempPrice = createState.live.coursePrice || 0
-    this.calcRatePrice = (tempPrice - (rate / 100) * tempPrice).toFixed(2)
-    this.calcSingleRatePrice = nums
-      ? ((tempPrice / nums) * (1 - rate / 100)).toFixed(2)
-      : 0
+    // const rate = createState.rate || 0
+    // const nums = createState.live.courseNum
+    // const tempPrice = createState.live.coursePrice || 0
+    // this.calcRatePrice = (tempPrice - (rate / 100) * tempPrice).toFixed(2)
+    // this.calcSingleRatePrice = nums
+    //   ? ((tempPrice / nums) * (1 - rate / 100)).toFixed(2)
+    //   : 0
     try {
       // 获取手续费和分钟数
       let config = await request.get(
@@ -77,6 +89,9 @@ export default defineComponent({
 
       let teacher = await request.post('/api-website/teacher/querySubject')
       createState.subjectList = teacher.data || []
+      if (createState.live.subjectName){
+        createState.live.subjectId = (createState.subjectList.find((n:any) => n.name === createState.live.subjectName) as any)?.id || ''
+      }
     } catch (err: any) {
       console.log(err)
     }
@@ -91,9 +106,9 @@ export default defineComponent({
       let rate = createState.rate || 0
       let nums = createState.live.courseNum
       let tempPrice = createState.live.coursePrice || 0
-      this.calcSingleRatePrice = nums
-        ? ((tempPrice / nums) * (1 - rate / 100)).toFixed(2)
-        : 0
+      // this.calcSingleRatePrice = nums
+      //   ? ((tempPrice / nums) * (1 - rate / 100)).toFixed(2)
+      //   : 0
     },
     onFormatter(e: any) {
       e.target.value = verifyNumberIntegerAndFloat(e.target.value)
@@ -101,13 +116,13 @@ export default defineComponent({
       // 计算手续费
       let rate = createState.rate || 0
       let price = e.target.value || 0
-      this.calcRatePrice = (price - (rate / 100) * price).toFixed(2)
+      // this.calcRatePrice = (price - (rate / 100) * price).toFixed(2)
 
       let nums = createState.live.courseNum
       // let tempPrice = createState.live.coursePrice || 0
-      this.calcSingleRatePrice = nums
-        ? ((price / nums) * (1 - rate / 100)).toFixed(2)
-        : 0
+      // this.calcSingleRatePrice = nums
+      //   ? ((price / nums) * (1 - rate / 100)).toFixed(2)
+      //   : 0
     }
   },
   render() {
@@ -120,6 +135,7 @@ export default defineComponent({
           labelWidth={'120px'}
           labelPosition="left"
           model={createState.live}
+          disabled={createState.live.courseGroupId ? true : false}
         >
           <ElFormItem
             label="课程名称"
@@ -252,14 +268,14 @@ export default defineComponent({
                   verifyNumberIntegerAndFloat(value)
 
                 // 计算手续费
-                const rate = createState.rate || 0
-                const price = createState.live.coursePrice || 0
-                this.calcRatePrice = (price - (rate / 100) * price).toFixed(2)
+                // const rate = createState.rate || 0
+                // const price = createState.live.coursePrice || 0
+                // this.calcRatePrice = (price - (rate / 100) * price).toFixed(2)
 
-                const nums = createState.live.courseNum
-                this.calcSingleRatePrice = nums
-                  ? ((price / nums) * (1 - rate / 100)).toFixed(2)
-                  : 0
+                // const nums = createState.live.courseNum
+                // this.calcSingleRatePrice = nums
+                //   ? ((price / nums) * (1 - rate / 100)).toFixed(2)
+                //   : 0
               }}
               maxlength={8}
               v-slots={{

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

@@ -93,7 +93,9 @@ export default defineComponent({
             class="!w-44 !h-[48px] !text-base"
             onClick={() => {
               createState.active = 0
-              createState.live.coursePlanList = [{ ...basePlan }]
+              if (!createState.live.courseGroupId) {
+                createState.live.coursePlanList = [{ ...basePlan }]
+              }
             }}
           >
             上一步

src/views/user-info/live-operation/createState.ts

@@ -23,8 +23,11 @@ const original = () => {
     selectCourseList: [] as any, // 选择课程列表
     coursePlanStatus: false, // 是否有锁课程
     live: {
+      courseGroupId: '',
+      teacherId: '',
       name: '',
       subjectId: null as any,
+      subjectName: '',
       courseIntroduce: '',
       courseNum: null as any,
       singleCourseMinutes: 0,

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

@@ -17,6 +17,43 @@ export default defineComponent({
   },
   created() {
     resestState()
+    this.getLiveClassDetail()
+  },
+  methods: {
+    // 获取直播课详情
+    async getLiveClassDetail() {
+      const groupId = this.$route.query.groupId
+      if (!groupId) return
+      const res = await request.get(
+        `/api-website/courseGroup/queryLiveCourseInfo?groupId=${groupId}`
+      )
+      console.log(res, [...createState.subjectList])
+      if (res.code == 200) {
+        const data = res.data
+        createState.live.courseGroupId = data.courseGroupId
+        createState.live.teacherId = data.teacherId
+        createState.live.name = data.courseGroupName
+        createState.live.subjectName = data.subjectName
+        createState.live.courseIntroduce = data.courseIntroduce
+        createState.live.courseNum = data.courseNum
+        createState.live.singleMins = data.singleCourseMinutes
+        createState.live.coursePrice = data.coursePrice
+        const list = data.planList.map(n => {
+          if (n.startTime && n.endTime) {
+            n.start = n.startTime.split(' ')[1]
+            n.end = n.endTime.split(' ')[1]
+          }
+          return n
+        })
+        createState.live.coursePlanList = list
+        createState.selectCourseList = list
+        createState.live.salesStartDate = data.salesStartDate
+        createState.live.salesEndDate = data.salesEndDate
+        createState.live.mixStudentNum = data.mixStudentNum
+        // createState.live.coursePrice = data.singleCourseMinutes
+        createState.live.backgroundPic = data.backgroundPic
+      }
+    }
   },
   render() {
     return (