Merge branch 'iteration-20241011' into iteration-20241126

src/business-components/user-detail/index.tsx

@@ -14,6 +14,7 @@ import iconCourse from './images/icon-course.png'
  * @param {type} headUrl 头像
  * @param {type} username 姓名
  * @param {type} startTime 开始时间
+ * @param {type} courseStartTime
  * @param {type} buyNum 购买用户数
  * @param {type} payType 收费方式
  * @param {type} type 课程类型
@@ -31,6 +32,7 @@ interface UserType {
   headUrl: string
   username: string
   startTime?: string
+  courseStartTime?: any
   id?: number
   buyNum?: number
   payType?: string
@@ -39,7 +41,7 @@ interface UserType {
   lessonPrice: number
   lessonNum?: number
   lessonDesc?: string
-  mixStudentNum?: string
+  mixStudentNum?: string | number
   lessonCoverUrl: string
   lessonName: string
   auditVersion: number
@@ -100,7 +102,7 @@ export default defineComponent({
                         style={{ marginRight: '5px' }}
                       />
                       开课时间：
-                      {this.userInfo.startTime}
+                      {this.userInfo.courseStartTime}
                     </div>
 
                     {this.showBuy && ['live', 'group'].includes(this.userInfo.type || '') && (

src/student/group-class/group-detail.tsx

@@ -51,7 +51,7 @@ export default defineComponent({
       const planList = live.planList || []
       const startTime = planList[0]?.startTime || new Date()
       const endTime = planList[0]?.endTime || new Date()
-      const studentNum = live.maxStudentNum || 0 - live.studentCount || 0
+      const studentNum = (live.maxStudentNum || 0) - (live.studentCount || 0)
       return {
         avatar: live.avatar,
         headUrl: live.avatar,
@@ -70,7 +70,7 @@ export default defineComponent({
         lessonCoverUrl: live.backgroundPic || live.backgroundPicTemplate,
         lessonName: live.courseGroupName,
         subjectName: live.subjectName,
-        courseStartTime: live.courseStartTime,
+        courseStartTime: dayjs(live.courseStartTime).format('YYYY-MM-DD HH:mm'),
         auditVersion: live.auditVersion || 0,
         isDegree: live.degreeFlag ? true : false,
         isTeacher: live.teacherFlag ? true : false

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

@@ -31,9 +31,8 @@ export default defineComponent({
         username:
           state.user.data?.username || `游客${state.user.data?.userId || ''}`,
         startTime:
-          `${dayjs(startTime).format('YYYY-MM-DD')} ${dayjs(startTime).format(
-            'HH:mm'
-          )}` || '',
+          `${dayjs(startTime).format('YYYY-MM-DD HH:mm')}` || '',
+        courseStartTime: dayjs(startTime).format('YYYY-MM-DD HH:mm'),
         buyNum: 0,
         type: 'group',
         mixStudentNum: createState.live.maxStudentNum,

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

@@ -45,17 +45,15 @@ export default defineComponent({
       const live = this.live as any
       const planList = live.planList || []
       const startTime = planList[0]?.startTime || new Date()
-      const endTime = planList[0]?.endTime || new Date()
-      const studentNum = live.maxStudentNum || 0 - live.studentCount || 0
+      // const endTime = planList[0]?.endTime || new Date()
+      const studentNum = (live.maxStudentNum || 0) - (live.studentCount || 0)
       return {
         headUrl: live.avatar,
         avatar: live.avatar,
         username: live.userName,
         id: live.teacherId,
         startTime:
-          `${dayjs(startTime).format('YYYY-MM-DD')} ${dayjs(startTime).format(
-            'HH:mm'
-          )}~${dayjs(endTime).format('HH:mm')}` || '',
+          `${dayjs(startTime).format('YYYY-MM-DD HH:mm')}` || '',
         lessonPrice: live.coursePrice,
         buyNum: live.studentCount || 0,
         type: 'group',
@@ -68,7 +66,7 @@ export default defineComponent({
         lessonCoverUrl: live.backgroundPic || live.backgroundPicTemplate,
         lessonName: live.courseGroupName,
         subjectName: live.subjectName,
-        courseStartTime: live.courseStartTime,
+        courseStartTime: dayjs(live.courseStartTime).format('YYYY-MM-DD HH:mm'),
         auditVersion: live.auditVersion || 0,
         isDegree: live.degreeFlag ? true : false,
         isTeacher: live.teacherFlag ? true : false

src/views/live-class/live-item.tsx

@@ -12,7 +12,7 @@ interface IProps {
   courseGroupId: number
   courseGroupName: string
   courseNum: string
-  courseStartTime?: number
+  courseStartTime?: string
   coursePrice: number
   payType?: string
   teacherName: string