浏览代码

Merge branch 'iteration-20241011' into dev

lex-xin 7 月之前
父节点
当前提交
2a735d65fb
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      src/business-components/calendar/index.tsx
  2. 1 1
      src/teacher/live-class/create-components/course.tsx

+ 1 - 1
src/business-components/calendar/index.tsx

@@ -128,7 +128,7 @@ export default defineComponent({
         date.type = 'disabled'
       }
       // console.log(date)
-      if(this.$route.name == 'liveCreate' && dayjs(date.date).isToday()) {
+      if((this.$route.name == 'liveCreate' || this.$route.name == 'groupCreate') && dayjs(date.date).isToday()) {
         date.type = 'disabled'
       }
       // 是否是节假日

+ 1 - 1
src/teacher/live-class/create-components/course.tsx

@@ -2,7 +2,7 @@ import ColField from '@/components/col-field'
 import ColFieldGroup from '@/components/col-field-group'
 import ColPopup from '@/components/col-popup'
 import SubjectModel from '@/business-components/subject-list'
-import { ActionSheet, Button, Field, Form, Sticky } from 'vant'
+import { ActionSheet, Button, Field, Form } from 'vant'
 import { defineComponent } from 'vue'
 import styles from './course.module.less'
 import { createState } from './createState'