Merge branch 'iteration-20250108-fix' into dev

src/views/courseware-list/index.tsx

@@ -261,8 +261,9 @@ export default defineComponent({
                     src={data.courseRecord.coverImg}
                     onLoad={() => {
                       data.courseRecord.load = true;
-                    }}
-                  />
+                    }}>
+                    {{ loading: () => <i></i> }}
+                  </Image>
                 </div>
 
                 <div class={styles.name}>{data.courseRecord.name}</div>
@@ -312,8 +313,9 @@ export default defineComponent({
                                 src={item.coverImg}
                                 onLoad={() => {
                                   item.load = true;
-                                }}
-                              />
+                                }}>
+                                {{ loading: () => <i></i> }}
+                              </Image>
                             </div>
 
                             <div class={styles.name}>{item.name}</div>

src/views/courseware-play/index.tsx

@@ -290,7 +290,7 @@ export default defineComponent({
         if (res?.code === 200 && Array.isArray(res?.data.rows)) {
           const result = res?.data.rows || [];
 
-          const tempObj: any = {};
+          const tempObj: any = [];
           // 格式化成年的数组
           result.forEach((item: any) => {
             item.lessonCourseware = item.lessonCoursewareJson
@@ -305,7 +305,6 @@ export default defineComponent({
           });
 
           data.courseDetails = result || [];
-
           const formatList: any[] = [];
           for (let key in tempObj) {
             const tempY = tempObj[key];
@@ -332,8 +331,8 @@ export default defineComponent({
               list: tempResult
             });
           }
-
-          data.formatCourseList = formatList;
+          // 返回数据进行排序
+          data.formatCourseList = formatList.sort((a: any, b: any) => b.year - a.year);
         }
       } catch (e) {
         //
@@ -1013,7 +1012,7 @@ export default defineComponent({
           (item: any) => item.courseId === data.courseId
         );
         // 是否为第一节课
-        return detailIndex + 1 >= data.courseDetails.length - 1 ? true : false;
+        return detailIndex + 1 <= data.courseDetails.length - 1 ? true : false;
       }
 
       // 获取当前是哪个章节
@@ -1565,6 +1564,7 @@ export default defineComponent({
             itemActive={data.courseId as any}
             popShow={popupData.chapterCourseOpen}
             onHandleSelect={async (item: any) => {
+              if (data.courseId === item.itemActive) return;
               loadNewCourseware({
                 id: item.itemActive
               });