lex 1 년 전
부모
커밋
37e16c36c2

+ 5 - 2
src/components/TheSearch/index.module.less

@@ -15,12 +15,15 @@
 
     .n-button {
       height: 34px;
-      font-size: 15px;
+      font-size: max(16px, 13Px);
       font-weight: 500;
       width: auto;
       opacity: 0.7;
     }
 
+    .n-input__placeholder {
+      font-size: max(15px, 13Px);
+    }
   }
 
   .active {
@@ -56,4 +59,4 @@
       }
     }
   }
-}
+}

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

@@ -193,8 +193,8 @@
     position: absolute;
     top: 6px;
     right: 6px;
-    font-size: 16px;
-    font-weight: 600;
+    font-size: max(16px, 12Px);
+    font-weight: 600 !important;
     height: 32px;
     border-radius: 8px;
     // display: none;

+ 1 - 0
src/styles/index.less

@@ -376,6 +376,7 @@ body {
 .n-input {
   --n-height: max(40px, 36Px) !important;
   --n-border-radius: 8px !important;
+  font-size: max(15px, 13Px) !important;
 }
 
 .n-button {

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

@@ -686,7 +686,7 @@
       height: 34px;
       line-height: 34px;
       text-align: center;
-      font-size: 16px;
+      font-size: max(16px, 12Px);
       font-family: PingFangSC, PingFang SC;
       font-weight: 500;
       color: #FFFFFF;
@@ -792,7 +792,7 @@
       height: 34px;
       line-height: 34px;
       text-align: center;
-      font-size: 16px;
+      font-size: max(16px, 12Px);
       font-family: PingFangSC, PingFang SC;
       font-weight: 500;
       color: #FFFFFF;

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

@@ -43,7 +43,7 @@
       .n-button {
         height: 37px;
         padding: 0 24px;
-        font-size: max(18px, 14px);
+        font-size: max(18px, 13Px);
         color: rgba(0, 0, 0, .6);
 
         &.n-button--primary-type {
@@ -69,7 +69,7 @@
 
       .n-button {
         height: 32px;
-        font-size: max(17px, 13px);
+        font-size: max(17px, 12Px);
         border-radius: 8px;
         color: rgba(0, 0, 0, 0.6);
       }
@@ -91,7 +91,7 @@
     right: 0px;
     width: 360px;
     height: 42px;
-    font-size: 16px;
+    font-size: max(18px, 13Px);
     --n-height: 42px !important;
 
     img {
@@ -108,7 +108,7 @@
 
       .n-button {
         height: 34px;
-        font-size: 15px;
+        font-size: max(16px, 12Px);
         font-weight: 500;
         width: auto;
       }
@@ -125,7 +125,7 @@
     .addTrain {
       height: 37px;
       border-radius: 8px;
-      font-size: 18px;
+      font-size: max(18px, 13Px);
       background-color: #E8F4FF;
       color: #0378EC;
 

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

@@ -21,11 +21,11 @@
         --n-height: 37px !important;
         height: 37px;
         padding: 0 24px;
-        font-size: max(18px, 14px);
+        font-size: max(18px, 13Px);
         color: rgba(0, 0, 0, .6);
 
         &.n-button--primary-type {
-          font-weight: bold;
+          font-weight: bold !important;
           color: #fff;
         }
       }
@@ -47,13 +47,18 @@
 
       .n-button {
         height: 32px;
-        font-size: max(17px, 13px);
+        font-size: max(17px, 12Px);
         border-radius: 8px;
         color: rgba(0, 0, 0, 0.6);
       }
 
       .n-button--primary-type {
+        font-weight: 400 !important;
+      }
+
+      .n-button--primary-type {
         color: #131415;
+        font-weight: bold !important;
         background-color: #D2ECFF !important;
       }
     }
@@ -69,7 +74,7 @@
     right: 0px;
     width: 360px;
     height: 42px;
-    font-size: 16px;
+    font-size: max(18px, 13Px);
     --n-height: 42px !important;
 
     img {
@@ -86,7 +91,7 @@
 
       .n-button {
         height: 34px;
-        font-size: 15px;
+        font-size: max(16px, 12Px);
         font-weight: 500;
         width: auto;
       }
@@ -108,7 +113,7 @@
       --n-height: 37px !important;
       height: 37px;
       border-radius: 8px;
-      font-size: 18px;
+      font-size: max(18px, 13Px);
       background-color: #E8F4FF;
       color: #0378EC;
 

+ 2 - 2
src/views/natural-resources/components/my-resources/save-modal/index.module.less

@@ -41,12 +41,12 @@
   height: 270px;
   background: #F9FAFD;
   border-radius: 26px;
-  font-size: 16px;
+  font-size: max(16px, 12Px);
   color: rgba(19, 20, 21, 0.5);
 
   h3 {
     padding-top: 32px;
-    font-size: 18px;
+    font-size: max(18px, 14Px);
     color: #131415;
   }
 

+ 3 - 1
src/views/natural-resources/components/my-resources/save-modal/index.tsx

@@ -97,7 +97,9 @@ export default defineComponent({
         ? NaturalTypeEnum.SONG
         : file.type.includes('video')
         ? NaturalTypeEnum.VIDEO
-        : file.type.includes('vnd.openxmlformats-officedocument.presentationml.presentation') || file.type.includes('vnd.ms-powerpoint')
+        : file.type.includes(
+            'vnd.openxmlformats-officedocument.presentationml.presentation'
+          ) || file.type.includes('vnd.ms-powerpoint')
         ? NaturalTypeEnum.PPT
         : 'other';
 

+ 6 - 6
src/views/natural-resources/components/share-resources/index.module.less

@@ -43,7 +43,7 @@
       .n-button {
         height: 37px;
         padding: 0 24px;
-        font-size: max(18px, 14px);
+        font-size: max(18px, 13Px);
         color: rgba(0, 0, 0, .6);
 
         &.n-button--primary-type {
@@ -61,7 +61,7 @@
 
     .n-form-item {
       .n-form-item-label {
-        font-size: max(17px, 13px);
+        font-size: max(17px, 13Px);
         font-weight: 600;
         color: #131415;
         line-height: 24px;
@@ -69,7 +69,7 @@
 
       .n-button {
         height: 32px;
-        font-size: max(17px, 13px);
+        font-size: max(17px, 12Px);
         border-radius: 8px;
         color: rgba(0, 0, 0, 0.6);
       }
@@ -91,7 +91,7 @@
     right: 0px;
     width: 360px;
     height: 42px;
-    font-size: 16px;
+    font-size: max(18px, 13Px);
     --n-height: 42px !important;
 
     img {
@@ -108,7 +108,7 @@
 
       .n-button {
         height: 34px;
-        font-size: 15px;
+        font-size: max(16px, 12Px);
         font-weight: 500;
         width: auto;
       }
@@ -125,7 +125,7 @@
     .addTrain {
       height: 37px;
       border-radius: 8px;
-      font-size: 18px;
+      font-size: max(18px, 13Px);
       background-color: #E8F4FF;
       color: #0378EC;
 

+ 2 - 2
src/views/prepare-lessons/components/resource-main/components/resource-item/resource-search-group/index.module.less

@@ -15,7 +15,7 @@
       border-radius: 8px;
       min-height: 40px;
       height: 40px;
-      font-size: 15px;
+      font-size: max(15px, 12Px);
       --n-height: 40px !important;
     }
 
@@ -50,7 +50,7 @@
     .n-button {
       height: 28px;
       padding: 0 13px;
-      font-size: 15px;
+      font-size: max(15px, 11Px);
       color: rgba(0, 0, 0, .6);
 
       &.n-button--primary-type {

+ 1 - 1
src/views/prepare-lessons/components/resource-main/components/select-music/resource-search-group/index.module.less

@@ -15,7 +15,7 @@
       border-radius: 8px;
       min-height: 40px;
       height: 40px;
-      font-size: 15px;
+      font-size: max(15px, 12Px);
       --n-height: 40px !important;
     }
   }

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

@@ -13,7 +13,7 @@
 
     .n-tabs-tab {
       color: #8B8D98;
-      font-size: max(16px, 13Px);
+      font-size: max(18px, 13Px);
       padding-top: 12px;
       padding-bottom: 6px;
       line-height: 22px;
@@ -45,13 +45,14 @@
   }
 
   .iconScreen {
+    margin-top: 6px;
     position: absolute;
     right: 20px;
     font-size: 18px;
     color: var(--n-color);
     font-weight: bold;
-    width: 18px;
-    height: 18px;
+    width: 22px;
+    height: 22px;
     cursor: pointer;
   }
 

+ 12 - 8
src/views/prepare-lessons/model/attend-class/index.module.less

@@ -14,10 +14,10 @@
 
     .n-base-selection,
     .n-input {
-      height: 52px;
-      min-height: 52px;
-      --n-height: 52px !important;
-      font-size: 18px;
+      // height: 52px;
+      // min-height: 52px;
+      // --n-height: 52px !important;
+      // font-size: 18px;
       border-radius: 8px !important;
     }
   }
@@ -67,6 +67,10 @@
       align-items: center;
       // justify-content: space-between;
     }
+
+    .n-thing-main__content {
+      margin-top: 8Px !important;
+    }
   }
 
 
@@ -74,7 +78,7 @@
   .title {
     display: flex;
     align-items: center;
-    font-size: 20px !important;
+    font-size: max(20px, 14Px) !important;
     font-weight: 600 !important;
     color: #131415 !important;
     line-height: 28px;
@@ -109,8 +113,8 @@
   }
 
   .content {
-    margin-top: 12px !important;
-    font-size: 16px;
+    margin-top: 2px !important;
+    font-size: max(16px, 12Px);
     color: #777777;
   }
-}
+}

+ 3 - 3
src/views/xiaoku-ai/index.module.less

@@ -41,7 +41,7 @@
       align-items: center;
       justify-content: center;
       height: 100%;
-      font-size: max(18px, 16px);
+      font-size: max(18px, 13Px);
       color: #999999;
       line-height: 25px;
     }
@@ -53,7 +53,7 @@
         min-width: 102px;
         height: 37px;
         padding: 0 24px;
-        font-size: max(18px, 16px);
+        font-size: max(18px, 13Px);
       }
     }
   }
@@ -192,7 +192,7 @@
 
   .itemName {
     margin-top: 16px;
-    font-size: 16px;
+    font-size: max(16px, 12Px);
     line-height: 22px;
     font-weight: 500;
     color: #333;

+ 2 - 2
src/views/xiaoku-ai/index.tsx

@@ -142,12 +142,12 @@ export default defineComponent({
       const activeItem = data.tagChildren[columnIndex].list[index];
       if (oldActiveItem && oldActiveItem.id !== activeItem.id) {
         forms.musicTagIds = forms.musicTagIds.filter(
-          item => item !== oldActiveItem.id
+          (item: any) => item !== oldActiveItem.id
         );
       }
       if (forms.musicTagIds.includes(activeItem.id)) {
         forms.musicTagIds = forms.musicTagIds.filter(
-          item => item !== activeItem.id
+          (item: any) => item !== activeItem.id
         );
         data.tagChildren[columnIndex].activeIndex = -1;
       } else {