skyblued 2 年之前
父节点
当前提交
d374341beb

+ 14 - 3
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')

+ 1 - 1
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
               }
 

+ 1 - 1
src/views/user-info/live-class/list.tsx

@@ -139,7 +139,7 @@ export default defineComponent({
         ) : (
           <ColEmpty
             type="teacherCert"
-            message="您还未完成达人认证,认证后才可创建视频课哦~"
+            message="您还未完成达人认证,认证后才可创建直播课哦~"
             buttonVisibility
             buttonText="去认证"
             onDetail={() => {

+ 1 - 1
src/views/user-info/music-class/index.tsx

@@ -32,7 +32,7 @@ export default defineComponent({
                 path: '/userInfo/musicOperation'
               })
             } else {
-              ElMessage.error('您还未完成达人认证,认证后才可创建视频课哦')
+              ElMessage.error('您还未完成达人认证,认证后才可上传乐谱哦')
               return
             }
           }}

+ 1 - 1
src/views/user-info/music-class/list.tsx

@@ -156,7 +156,7 @@ export default defineComponent({
           <div class="px-[38px]">
             <ColEmpty
               type="teacherCert"
-              message="您还未完成达人认证,认证后才可创建视频课哦~"
+              message="您还未完成达人认证,认证后才可上传乐谱哦~"
               buttonVisibility
               buttonText="去认证"
               onDetail={() => {