Merge branch 'iteration-20241011' into iteration-20241126

src/student/teacher-dependent/components/group.tsx

@@ -32,10 +32,10 @@ export default defineComponent({
   methods: {
     formatTime(time: string) {
       const timeStr = dayjs(time || new Date())
-      const weekStr = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
-      // console.log(timeStr.day())
+      // const weekStr = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
+      // // console.log(timeStr.day())
 
-      return timeStr.format('YYYY-MM-DD')  + `(${weekStr[timeStr.day()]})`
+      return timeStr.format('YYYY-MM-DD HH:mm')
     },
     async getList() {
       try {
@@ -108,7 +108,7 @@ export default defineComponent({
               >
                 <div class={styles.liveTop}>
                   <img src={iconLive} class={styles.iconLive} />
-                  <span>开课时间： {this.formatTime(item.salesStartDate)} </span>
+                  <span>开课时间： {this.formatTime(item.courseStartTime)} </span>
                 </div>
                 <div class={styles.liveCenter}>
                   <Image

src/student/teacher-dependent/components/live.tsx

@@ -35,10 +35,10 @@ export default defineComponent({
   methods: {
     formatTime(time: string) {
       const timeStr = dayjs(time || new Date())
-      const weekStr = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
+      // const weekStr = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
       // console.log(timeStr.day())
 
-      return timeStr.format('YYYY-MM-DD')  + `(${weekStr[timeStr.day()]})`
+      return timeStr.format('YYYY-MM-DD HH:mm')
     },
     async getList() {
       try {
@@ -106,7 +106,7 @@ export default defineComponent({
               >
                 <div class={styles.liveTop}>
                   <img src={iconLive} class={styles.iconLive} />
-                  <span>开课时间： {this.formatTime(item.salesStartDate)} </span>
+                  <span>开课时间： {this.formatTime(item.courseStartTime)} </span>
                 </div>
                 <div class={styles.liveCenter}>
                   <Image

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

@@ -23,14 +23,16 @@ export default defineComponent({
   computed: {
     userInfo() {
       const startTime = createState.live.coursePlanList[0].startTime
+      const endTime = createState.live.coursePlanList[0].endTime
       return {
         headUrl: state.user.data?.heardUrl,
         username:
           state.user.data?.username || `游客${state.user.data?.userId || ''}`,
         startTime:
-          `${dayjs(startTime).format('YYYY-MM-DD')} ${dayjs(startTime).format(
+          `${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'),
         buyNum: 0,
         lessonPrice: createState.live.coursePrice,
         lessonNum: createState.live.courseNum,
@@ -68,7 +70,6 @@ export default defineComponent({
     async onSubmit() {
       if(this.submitLoading) return
       this.submitLoading = true;
-      
       try {
         const params = {
           ...createState.live,