Merge branch 'master' of http://git.dayaedu.com/lex/classroom-instruments

src/components/card-type/index.module.less

@@ -14,16 +14,15 @@
   width: 300px;
   height: 220px;
   border-radius: 14px;
-  overflow: hidden;
   background: linear-gradient(270deg, #DBF1FF 0%, #E7F9FF 100%) !important;
   display: inline-flex;
+  transition: all .3s ease-in-out;
 
   // 鼠标经过时样式
   &:hover {
-    .image {
-      transform: scale(1.02);
-      transition: all .3s ease-in-out;
-    }
+    transform: scale(1.01);
+    transition: all .3s ease-in-out;
+
 
     .addBtn {
       display: block;
@@ -41,6 +40,8 @@
     width: 100%;
     height: 170px;
     background-color: #fff;
+    border-radius: 14px 14px 0 0;
+    overflow: hidden;
 
     img {
       height: fit-content;
@@ -48,10 +49,6 @@
     }
   }
 
-  .image {
-    transition: all .3s ease-in-out;
-  }
-
 
   :global {
     .n-card__footer {

src/views/prepare-lessons/components/lesson-main/index.module.less

@@ -72,13 +72,13 @@
 }
 
 .listContainer {
-  margin-top: 24px;
-  padding: 0 22px 0;
+  margin-top: 12px;
   // // 52 + 28 + 38
-  max-height: calc(var(--window-page-lesson-height) - 146px - 24px);
+  max-height: calc(var(--window-page-lesson-height) - 148px);
 }
 
 .list {
+  padding: 12px 22px 12px;
   display: flex;
   flex-flow: row wrap;
   justify-content: flex-start;

src/views/prepare-lessons/components/resource-main/index.module.less

@@ -50,10 +50,11 @@
 }
 
 .listContainer {
-  margin: 20px 0;
-  max-height: calc(var(--window-page-lesson-height) - 224px - 40px);
+  margin: 10px 0;
+  max-height: calc(var(--window-page-lesson-height) - 224px - 20px);
 
   .list {
+    padding: 10px 0;
     text-align: center;
 
     &>div {