Merge branch 'iteration-class' into jenkins

src/views/attend-class/index.tsx

@@ -644,11 +644,11 @@ export default defineComponent({
       activeData.timer = setTimeout(() => {
         activeData.model = false;
         Object.values(data.videoRefs).map((n: any) =>
-          n.toggleHideControl(false)
+          n?.toggleHideControl(false)
         );
 
         Object.values(data.audioRefs).map((n: any) =>
-          n.toggleHideControl(false)
+          n?.toggleHideControl(false)
         );
       }, 4000);
     };

src/views/prepare-lessons/components/resource-main/components/resource-item/index.tsx

@@ -80,7 +80,12 @@ export default defineComponent({
             exist: index !== -1 ? true : false // 是否存在
           });
         });
-        state.tableList.push(...temp);
+        if (state.pagination.page === 1) {
+          state.tableList = temp;
+        } else {
+          state.tableList.push(...temp);
+        }
+
         state.finshed = data.pages <= data.current ? true : false;
       } catch {
         state.loading = false;