Merge branch 'video-tcplayer' into online

src/views/attend-class/index.module.less

@@ -553,13 +553,19 @@
 }
 
 .removeVisiable {
-  width: 500px;
+  width: 432px;
+
+  :global {
+    .n-card-header {
+      font-size: max(22px, 16Px);
+    }
+  }
 
   .studentRemove {
     padding: 20px 40px 0;
 
     p {
-      font-size: max(18px, 16px);
+      font-size: max(18px, 14Px);
       color: #777777;
       line-height: 30px;
       text-align: center;

src/views/attend-class/model/train-type/index.module.less

@@ -270,13 +270,19 @@
 
 
 .removeVisiable {
-  width: 500px;
+  width: 432px;
+
+  :global {
+    .n-card-header {
+      font-size: max(22px, 16Px);
+    }
+  }
 
   .studentRemove {
     padding: 20px 40px 0;
 
     p {
-      font-size: 18px;
+      font-size: max(18px, 14Px);
       color: #777777;
       line-height: 30px;
       text-align: center;
@@ -297,4 +303,4 @@
       }
     }
   }
-}
+}

src/views/classList/index.module.less

@@ -722,13 +722,19 @@
 }
 
 .removeVisiable {
-  width: 500px;
+  width: 432px;
+
+  :global {
+    .n-card-header {
+      font-size: max(22px, 16Px);
+    }
+  }
 
   .studentRemove {
     padding: 0 40px;
 
     p {
-      font-size: max(18px, 14px);
+      font-size: max(18px, 14Px);
       color: #777777;
       line-height: 30px;
 
@@ -754,4 +760,4 @@
 
 .nextWrap {
   padding: 30px 32px 0 !important;
-}
+}

src/views/natural-resources/components/my-resources/index.module.less

@@ -195,13 +195,19 @@
 
 
 .removeVisiable {
-  width: 500px;
+  width: 432px;
+
+  :global {
+    .n-card-header {
+      font-size: max(22px, 16Px);
+    }
+  }
 
   .studentRemove {
     padding: 20px 40px 0;
 
     p {
-      font-size: max(18px, 16px);
+      font-size: max(18px, 14px);
       color: #777777;
       line-height: 30px;
       text-align: center;
@@ -222,4 +228,4 @@
       }
     }
   }
-}
+}

src/views/notation/index.module.less

@@ -23,13 +23,19 @@
 }
 
 .removeVisiable {
-  width: 500px;
+  width: 432px;
+
+  :global {
+    .n-card-header {
+      font-size: max(22px, 16Px);
+    }
+  }
 
   .studentRemove {
     padding: 20px 40px 0;
 
     p {
-      font-size: max(18px, 16px);
+      font-size: max(18px, 14Px);
       color: #777777;
       line-height: 30px;
       text-align: center;

src/views/prepare-lessons/components/directory-main/select-lessonware/index.module.less

@@ -195,13 +195,19 @@
 }
 
 .removeVisiable {
-  width: 500px;
+  width: 432px;
+
+  :global {
+    .n-card-header {
+      font-size: max(22px, 16Px);
+    }
+  }
 
   .studentRemove {
     padding: 20px 40px 0;
 
     p {
-      font-size: 18px;
+      font-size: max(18px, 14Px);
       color: #777777;
       line-height: 30px;
       text-align: center;
@@ -222,4 +228,4 @@
       }
     }
   }
-}
+}

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

@@ -110,13 +110,20 @@
 }
 
 .removeVisiable {
-  width: 500px;
+  width: 432px;
+
+  :global {
+    .n-card-header {
+      font-size: max(22px, 16Px);
+    }
+  }
+
 
   .studentRemove {
     padding: 20px 40px 0;
 
     p {
-      font-size: max(18px, 16px);
+      font-size: max(18px, 14Px);
       color: #777777;
       line-height: 30px;
       text-align: center;
@@ -140,13 +147,19 @@
 }
 
 .removeVisiable1 {
-  width: 500px;
+  width: 432px;
+
+  :global {
+    .n-card-header {
+      font-size: max(22px, 16Px);
+    }
+  }
 
   .studentRemove {
     padding: 20px 40px 0;
 
     p {
-      font-size: max(18px, 16px);
+      font-size: max(18px, 14Px);
       color: #777777;
       line-height: 30px;
 
@@ -166,4 +179,4 @@
       }
     }
   }
-}
+}

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

@@ -106,13 +106,20 @@
 }
 
 .removeVisiable {
-  width: 500px;
+  width: 432px;
+
+  :global {
+    .n-card-header {
+      font-size: max(22px, 16Px);
+    }
+  }
+
 
   .studentRemove {
     padding: 20px 40px 0;
 
     p {
-      font-size: 18px;
+      font-size: max(18px, 14Px);
       color: #777777;
       line-height: 30px;
       text-align: center;
@@ -136,13 +143,19 @@
 }
 
 .removeVisiable1 {
-  width: 500px;
+  width: 432px;
+
+  :global {
+    .n-card-header {
+      font-size: max(22px, 16Px);
+    }
+  }
 
   .studentRemove {
     padding: 20px 40px 0;
 
     p {
-      font-size: 18px;
+      font-size: max(18px, 14Px);
       color: #777777;
       line-height: 30px;
 
@@ -162,4 +175,4 @@
       }
     }
   }
-}
+}

src/views/studentList/index.module.less

@@ -553,7 +553,13 @@
 
 
 .removeVisiable {
-  width: 500px;
+  width: 432px;
+
+  :global {
+    .n-card-header {
+      font-size: max(22px, 16Px);
+    }
+  }
 
   .studentRemove {
     padding: 0 40px;
@@ -579,4 +585,4 @@
       }
     }
   }
-}
+}

src/views/xiaoku-music/index.module.less

@@ -362,6 +362,15 @@
 .previewWindow {
   width: 85%;
   height: 85vh;
+  position: relative;
+
+  .previewClose {
+    position: absolute;
+    left: 40px;
+    top: 40px;
+    width: 60px;
+    height: 65px;
+  }
 
   .previewIframe {
     width: 100%;

src/views/xiaoku-music/index.tsx

@@ -30,6 +30,7 @@ import icon_goXiaoku from './images/icon_goXiaoku.png';
 import icon_favitor from '/src/common/images/icon-collect-default.png';
 import icon_favitorActive from '/src/common/images/icon-collect-active.png';
 import icon_default from './images/icon_default.png';
+import icon_close from './images/icon-close.png';
 import { useRoute, useRouter } from 'vue-router';
 import PlayItem from './component/play-item';
 import PlayLoading from './component/play-loading';
@@ -461,6 +462,12 @@ export default defineComponent({
           showIcon={false}
           displayDirective="show">
           <NSpin show={data.showPreivew} style="--n-opacity-spinning: 1;">
+            <img
+              src={icon_close}
+              class={styles.previewClose}
+              onClick={() => (data.previewModal = false)}
+            />
+
             <iframe
               class={styles.previewIframe}
               onLoad={() => {