Bladeren bron

Merge branch 'iteration-20241011' into iteration-20241126

lex-xin 3 maanden geleden
bovenliggende
commit
97841f2941

+ 5 - 2
src/student/live-class/live-detail.tsx

@@ -53,7 +53,11 @@ export default defineComponent({
         headUrl: live.avatar,
         username: live.userName || `游客${live.teacherId || ''}`,
         id: live.teacherId,
-        startTime: `${dayjs(startTime).format('YYYY-MM-DD')} ${dayjs(startTime).format('HH:mm')}` || '',
+        startTime:
+          `${dayjs(startTime).format('YYYY-MM-DD')} ${dayjs(startTime).format(
+            'HH:mm'
+          )}` || '',
+        courseStartTime: dayjs(live.courseStartTime).format('YYYY-MM-DD HH:mm'),
         buyNum: live.studentCount,
         type: 'live',
         lessonId: live.courseGroupId,
@@ -65,7 +69,6 @@ export default defineComponent({
         lessonCoverUrl: live.backgroundPic || live.backgroundPicTemplate,
         lessonName: live.courseGroupName,
         subjectName: live.subjectName,
-        courseStartTime: live.courseStartTime,
         auditVersion: live.auditVersion || 0,
         isDegree: live.degreeFlag ? true : false,
         isTeacher: live.teacherFlag ? true : false

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

@@ -32,7 +32,7 @@ export default defineComponent({
           `${dayjs(startTime).format('YYYY-MM-DD')} ${dayjs(endTime).format(
             'HH:mm'
           )}~${dayjs(endTime).format('HH:mm')}` || '',
-        courseStartTime: dayjs(endTime).format('YYYY-MM-DD HH:mm'),
+        courseStartTime: dayjs(startTime).format('YYYY-MM-DD HH:mm'),
         buyNum: 0,
         lessonPrice: createState.live.coursePrice,
         lessonNum: createState.live.courseNum,

+ 1 - 1
src/teacher/live-class/live-detail.tsx

@@ -52,6 +52,7 @@ export default defineComponent({
           `${dayjs(startTime).format('YYYY-MM-DD')} ${dayjs(startTime).format(
             'HH:mm'
           )}` || '',
+        courseStartTime: dayjs(live.courseStartTime).format('YYYY-MM-DD HH:mm'),
         lessonPrice: live.coursePrice,
         buyNum: live.studentCount || 0,
         type: 'live',
@@ -63,7 +64,6 @@ export default defineComponent({
         lessonCoverUrl: live.backgroundPic || live.backgroundPicTemplate,
         lessonName: live.courseGroupName,
         subjectName: live.subjectName,
-        courseStartTime: live.courseStartTime,
         auditVersion: live.auditVersion || 0,
         isDegree: live.degreeFlag ? true : false,
         isTeacher: live.teacherFlag ? true : false