Merge branch 'master' of http://git.dayaedu.com/liushengqiang/classroom-app

src/views/courseware-list/component/book/index.module.less

@@ -87,8 +87,8 @@
     }
 
     .icon {
-        width: 22Px;
-        height: 22Px;
+        width: 20Px;
+        height: 20Px;
         margin-right: 6Px;
     }
 

src/views/courseware-list/component/book/index.tsx

@@ -153,17 +153,18 @@ export default defineComponent({
       let listItem = [] as any[];
       for (let i = 0; i < props.bookData.lessonList.length; i++) {
         const item = props.bookData.lessonList[i];
-        if (listItem.length < step) {
-          listItem.push({ name: item.name });
-        } else {
+        if (listItem.length >= step){
+          list.push([...listItem]);
           listItem = [{ name: item.name }];
+        } else {
+          listItem.push({ name: item.name });
         }
         for (let j = 0; j < item.knowledgeList.length; j++) {
-          if (listItem.length < step) {
-            listItem.push(item.knowledgeList[j]);
-          } else {
-            list.push(listItem);
+          if (listItem.length >= step){
+            list.push([...listItem]);
             listItem = [item.knowledgeList[j]];
+          } else {
+            listItem.push(item.knowledgeList[j]);
           }
         }
       }
@@ -171,6 +172,7 @@ export default defineComponent({
         list.push(listItem);
       }
       data.list = list;
+      // console.log("🚀 ~ data.list:", data.list)
     };
     watch(
       () => props.show,
@@ -255,7 +257,7 @@ export default defineComponent({
                                     src={icon_play}
                                   />
                                 ) : null}
-                                <div class={styles.name}>
+                                <div class={styles.name} style={{lineHeight: '20Px'}}>
                                   {item.name}
                                   {data.lastTime === item.id && (
                                     <span class={styles.last}>上次观看</span>