Merge branch 'iteration-20241011' into iteration-20241126

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'
       }
       // 是否是节假日

src/teacher/group-class/create-components/course-start.tsx

@@ -162,14 +162,14 @@ export default defineComponent({
               maxlength={8}
               disabled={this.disabled}
               formatter={this.onFormatterInt}
-              rules={[{ required: true, message: '请输入最低开课人数' }]}
+              rules={[{ required: true, message: `1~${createState.live.maxStudentNum}` }]}
               v-slots={{
                 button: () => <span>人</span>
               }}
             />
           </ColField>
           <div class={styles.stepTips}>
-            课程停售时付费学员达到该人数可开课，若未达到该人数课程将会失效，已付费学员将自动退款
+            课程停售时，付费学员达到该人数课开课，若未达到该人数，则成课失败，已付费学员将自动退款。
           </div>
         </ColFieldGroup>
 

src/teacher/group-class/create-components/detail.tsx

@@ -36,7 +36,7 @@ export default defineComponent({
           )}` || '',
         buyNum: 0,
         type: 'group',
-        mixStudentNum: createState.live.mixStudentNum,
+        mixStudentNum: createState.live.maxStudentNum,
         lessonPrice: createState.live.coursePrice,
         lessonNum: createState.live.courseNum,
         lessonDesc: createState.live.courseIntroduce,

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'