更新

src/components/CDatePicker/index.module.less

@@ -4,10 +4,10 @@
   :global {
     .n-input {
       width: 353px;
-      height: 43px;
-      line-height: 43px;
+      // height: 43px;
+      // line-height: 43px;
       border-radius: 8px;
-      font-size: 15px;
+      // font-size: 15px;
       font-weight: 400;
       color: #333333;
 
@@ -18,11 +18,14 @@
   }
 
   .dateIcons {
-    width: 20px;
-    height: 19px;
+    // width: 20px;
+    // height: 19px;
+    width: max(16px, 14Px);
+    height: max(16px, 14Px);
     position: absolute;
     z-index: 500;
     left: 15px;
-    top: 11px;
+    --n-height: max(40px, 36Px) !important;
+    top: max(11px, 11Px);
   }
 }

src/components/CSelect/index.module.less

@@ -8,14 +8,17 @@
     .n-select {
       width: 100%;
       min-width: 180px;
+
       .n-base-selection-label {
-        height: 43px;
-        line-height: 43px;
+        // height: 43px;
+        // line-height: 43px;
       }
+
       .n-base-selection__border {
         border-radius: 8px;
         overflow: hidden;
       }
+
       .n-base-selection__state-border {
         border-radius: 8px;
         overflow: hidden;
@@ -23,18 +26,22 @@
     }
   }
 }
+
 .CSelectWrap.CSelectInitWrap {
   :global {
     .n-select {
       width: 180px !important;
+
       .n-base-selection-label {
-        height: 43px;
-        line-height: 43px;
+        // height: 43px;
+        // line-height: 43px;
       }
+
       .n-base-selection__border {
         border-radius: 8px;
         overflow: hidden;
       }
+
       .n-base-selection__state-border {
         border-radius: 8px;
         overflow: hidden;
@@ -52,4 +59,4 @@
 //     background: #198cfe;
 //     color: #fff;
 //   }
-// }
+// }

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

@@ -12,6 +12,12 @@
   border-radius: 14px;
   background: linear-gradient(270deg, #DBF1FF 0%, #E7F9FF 100%) !important;
 
+  // :global {
+  //   .n-card-cover {
+  //     border-radius: 14px !important;
+  //   }
+  // }
+
   // 图片禁止拖动
   img {
     -moz-user-select: none;
@@ -112,13 +118,13 @@
     align-items: center;
 
     .titleType {
-      width: 36px;
-      height: 17px;
+      width: max(36px, 28Px);
+      height: max(17px, 13Px);
     }
 
     .titleContent {
       padding-left: 6px;
-      font-size: 16px;
+      font-size: max(16px, 12Px);
       max-width: 160px;
       color: #131415;
       font-weight: 600 !important;
@@ -179,7 +185,7 @@
     z-index: 9;
     width: 58px;
     height: 29px;
-    border-top-left-radius: 13px;
+    border-top-left-radius: 14px;
   }
 
   // 添加

src/components/layout/index.module.less

@@ -70,7 +70,7 @@
 
   p {
     margin-top: 4px;
-    font-size: 14px;
+    font-size: max(14px, 10Px);
     font-weight: 600;
     color: #ffffff;
     line-height: 20px;
@@ -421,7 +421,7 @@
     display: flex;
     flex-direction: column;
     align-items: center;
-    font-size: 12px;
+    font-size: max(12px, 11Px);
     cursor: pointer;
     text-align: center;
 

src/components/searchInput/index.module.less

@@ -1,10 +1,11 @@
 .searchInput {
-  height: 43px;
+  // height: 43px;
   border-radius: 8px;
+
   :global {
     .n-input__input-el {
-      line-height: 43px;
-      height: 43px;
+      // line-height: 43px;
+      // height: 43px;
     }
   }
 
@@ -12,4 +13,4 @@
     width: 16px;
     height: 17px;
   }
-}
+}

src/styles/index.less

@@ -23,8 +23,8 @@ body {
 // 搜索框前面放大镜样式重置
 .icon-search-input {
   display: inline-block;
-  width: 18px;
-  height: 18px;
+  width: max(16px, 14Px);
+  height: max(16px, 14Px);
   background: url('../common/images/icon_search.png') no-repeat center;
   background-size: contain;
 }
@@ -42,7 +42,7 @@ body {
 // }
 
 .n-base-select-menu .n-base-select-option {
-  font-size: 15px;
+  font-size: max(15px, 12Px);
 }
 
 @font-face {
@@ -90,22 +90,25 @@ body {
 }
 
 .searchBtn {
-  width: 90px;
-  height: 43px;
+  // width: 90px;
+  // height: 43px;
   background: #198cfe;
   border-radius: 8px;
-  line-height: 41px;
+  // line-height: 41px;
   font-weight: 600 !important;
-  font-size: 18px;
+  // font-size: max(18px, 13Px);
 }
 
 .resetBtn {
-  width: 90px;
-  height: 43px;
+  // width: 90px;
   border-radius: 8px;
-  line-height: 41px;
   font-weight: 600 !important;
-  font-size: 18px;
+  // font-size: max(18px, 13Px);
+}
+
+.resetBtn,
+.searchBtn {
+  --n-padding: 0 28px !important;
 }
 
 // .n-data-table {
@@ -330,7 +333,7 @@ body {
   color: rgba(113, 113, 114, 1) !important;
   border: none;
   min-height: 54px;
-  font-size: 15px;
+  font-size: max(15px, 12Px);
 }
 
 .n-data-table.n-data-table--bordered .n-data-table-wrapper {
@@ -340,7 +343,16 @@ body {
 .n-data-table-tr .n-data-table-td .n-button__content,
 .n-data-table .n-data-table-td {
   font-weight: bold;
-  font-size: 15px;
+  font-size: max(15px, 12Px);
+}
+
+.n-tooltip {
+  --n-padding: 6px 12px !important;
+  --n-border-radius: 6px !important;
+
+  .n-popover__content {
+    font-size: max(14px, 12Px);
+  }
 }
 
 
@@ -358,4 +370,39 @@ body {
 .n-image-preview-toolbar .n-base-icon {
   margin: 0 8px;
   padding: 0;
+}
+
+.n-base-selection,
+.n-input {
+  --n-height: max(40px, 36Px) !important;
+  --n-border-radius: 8px !important;
+}
+
+.n-button {
+  font-size: max(18px, 13Px);
+  --n-height: max(40px, 36Px) !important;
+}
+
+.n-base-selection-input,
+.n-input .n-input__input-el,
+.n-input .n-input__textarea-el {
+  font-size: max(15px, 13Px) !important;
+}
+
+.n-base-selection .n-base-selection-label .n-base-selection-label__render-label {
+  font-size: max(15px, 13Px) !important;
+}
+
+.n-form-item-label__text {
+  font-size: max(15px, 13Px);
+}
+
+.n-date-panel-actions__suffix {
+  .n-button {
+    font-size: 12Px;
+    height: 32px !important;
+    line-height: 32px;
+    padding: 0 13px !important;
+    border-radius: 6px;
+  }
 }

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

@@ -411,7 +411,7 @@
     }
 
     .n-base-select-menu .n-base-select-option {
-      font-size: 18px !important;
+      font-size: max(15px, 12Px) !important;
     }
   }
 

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

@@ -27,7 +27,7 @@
   .title {
     display: flex;
     align-items: center;
-    font-size: 18px;
+    font-size: max(18px, 13Px);
     font-weight: 600;
     color: #131415;
 
@@ -46,7 +46,7 @@
     padding: 0 12px;
     height: 32px;
     background: linear-gradient(270deg, #23c3ff 0%, #007afe 100%);
-    font-size: 16px;
+    font-size: max(16px, 12Px);
     font-weight: 600;
     color: #ffffff;
     line-height: 22px;
@@ -145,7 +145,7 @@
     transition: all 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275);
 
     .disPreviewDivide {
-      font-size: 15px;
+      font-size: max(15px, 13Px);
       color: #fff;
     }
 
@@ -153,22 +153,33 @@
       .n-progress-graph-circle-rail {
         stroke: #8b8b8b !important;
       }
+
+      .n-progress {
+        width: max(120px, 105Px) !important;
+      }
     }
 
     .BProgress {
       color: #fff;
+      margin-top: -4px;
+
 
       h4 {
-        font-size: 20px;
+        font-size: max(28px, 20Px);
         font-family: 'DINA';
-        font-weight: bold;
         text-align: center;
 
         span {
-          font-size: 12px;
+          font-size: max(13px, 11Px);
           font-weight: 400;
+          padding-left: 4px;
+
         }
       }
+
+      p {
+        font-size: max(14px, 12Px);
+      }
     }
   }
 
@@ -192,7 +203,7 @@
 
   :global {
     .n-tag {
-      font-size: 14px;
+      font-size: max(14px, 12Px);
       font-weight: 500;
       color: #0378ec;
       line-height: 20px;
@@ -206,13 +217,13 @@
 
   .operation {
     display: flex;
-    height: 28px;
+    height: 34px;
     padding: 0;
     border-radius: 50%;
 
     img {
-      height: 28px;
-      width: 28px;
+      height: 34px;
+      width: 34px;
     }
   }
 }

src/views/attend-class/model/train-type/index.tsx

@@ -295,7 +295,7 @@ export default defineComponent({
           !props.isCLassWork &&
           props.item.trainingType === 'EVALUATION' ? (
             <>
-              <NSpace size={6}>
+              <NSpace size={12}>
                 <n-button
                   quaternary
                   disabled={props.isDelete}

src/views/classList/components/classRecord.module.less

@@ -20,7 +20,7 @@
   border-bottom: 1px solid rgba(0, 0, 0, 0.05);
 
   .time {
-    font-size: 20px;
+    font-size: max(20px, 14Px);
     color: #131415;
     line-height: 28px;
   }
@@ -29,16 +29,17 @@
     color: #2089FF;
     border-radius: 6px;
     // border: 1px solid #97C7FF;
-    font-size: 16px;
+    font-size: max(16px, 12Px);
     --n-border: 1px solid #97C7FF;
-    padding: 4px 14px;
+    padding: 2px 14px;
+    --n-height: max(28px, 24Px) !important;
   }
 }
 
 .content {
   padding: 20px;
   display: flex;
-  align-items: center;
+  align-items: flex-start;
 
   .navatar {
     width: 60px;
@@ -49,29 +50,37 @@
     margin-right: 15px;
     flex-shrink: 0;
     background-color: #fff !important;
+
+    :global {
+      img {
+        border-radius: 50%;
+      }
+    }
   }
 
   .userInfo {
+    padding-top: 4px;
+
     h2 {
-      font-size: 20px;
+      font-size: max(20px, 14Px);
       font-weight: 600;
       color: #131415;
       line-height: 28px;
     }
 
     p {
-      font-size: 16px;
+      font-size: max(16px, 12Px);
       color: #777777;
-      line-height: 26px;
+      line-height: 28px;
     }
 
     .subjectName {
-      font-size: 14px;
+      font-size: max(14px, 11Px);
       font-weight: 400;
       color: #FFFFFF;
       background: #198CFE;
       border-radius: 5px;
-      padding: 1px 8px;
+      padding: 2px 8px 2px;
       margin-right: 4px;
     }
   }

src/views/classList/components/testRecode.tsx

@@ -266,14 +266,16 @@ export default defineComponent({
               <div class={styles.TrainDataItem}>
                 <div>
                   <p class={styles.TrainDataItemTitle}>
-                    <span>
-                      <NNumberAnimation
-                        from={0}
-                        to={
-                          state.testInfo.practiceUserCount
-                        }></NNumberAnimation>
-                    </span>{' '}
-                    人
+                    <div>
+                      <span>
+                        <NNumberAnimation
+                          from={0}
+                          to={
+                            state.testInfo.practiceUserCount
+                          }></NNumberAnimation>
+                      </span>{' '}
+                      人
+                    </div>
                   </p>
                 </div>
                 <p class={styles.TrainDataItemsubTitle}>练习人数</p>
@@ -282,12 +284,14 @@ export default defineComponent({
             <NGi>
               <div class={styles.TrainDataItem}>
                 <p class={styles.TrainDataItemTitle}>
-                  <span>
-                    <NNumberAnimation
-                      from={0}
-                      to={state.testInfo.vipUserCount}></NNumberAnimation>
-                  </span>{' '}
-                  人
+                  <div>
+                    <span>
+                      <NNumberAnimation
+                        from={0}
+                        to={state.testInfo.vipUserCount}></NNumberAnimation>
+                    </span>{' '}
+                    人
+                  </div>
                 </p>
                 <p class={styles.TrainDataItemsubTitle}>会员人数</p>
               </div>

src/views/classList/index.module.less

@@ -18,12 +18,12 @@
 
 .addBtn {
   margin-bottom: 30px;
-  height: 34Px !important;
+  // height: 34Px !important;
   background: #198cfe !important;
   border-radius: 7Px !important;
-  line-height: 21Px !important;
+  // line-height: 21Px !important;
   padding: 0 18Px !important;
-  font-size: 13Px !important;
+  // font-size: 13Px !important;
   font-weight: 600 !important;
 }
 
@@ -338,7 +338,7 @@
       }
 
       .n-tabs-tab {
-        font-size: max(18px, 14Px);
+        font-size: max(18px, 14Px) !important;
         padding: 8px 0 !important;
         font-weight: 400;
         min-width: 50px;
@@ -483,9 +483,9 @@
 
   .TrainDataItemTitle {
     text-align: left;
-    font-size: 13px;
+    font-size: max(13px, 11Px);
     font-weight: 400;
-    color: #777777;
+    color: #131415;
     line-height: 18px;
     display: flex;
     flex-direction: row;
@@ -493,7 +493,7 @@
 
     span {
       font-family: 'DINA';
-      font-size: 26px;
+      font-size: max(26px, 18Px);
       font-weight: 600;
       color: #131415;
       line-height: 28px;
@@ -503,7 +503,7 @@
   .TrainDataItemsubTitle {
     margin-top: 4px;
     text-align: left;
-    font-size: 13px;
+    font-size: max(14px, 11Px);
     font-family: PingFangSC-Regular, PingFang SC;
     font-weight: 400;
     color: #777777;
@@ -643,12 +643,12 @@
 
     .workafterInfo {
       h4 {
-        font-size: 22px;
+        font-size: max(22px, 16Px);
         line-height: 30px;
         line-height: 30px;
         font-weight: 600;
         color: #131415;
-        margin-bottom: 12px;
+        margin-bottom: 6px;
         display: flex;
         flex-direction: row;
         align-items: center;
@@ -658,7 +658,7 @@
           height: 22px;
           background: #ff8a32;
           border-radius: 13px 4px 13px 4px;
-          font-size: 14px;
+          font-size: max(14px, 11Px);
           font-weight: 600;
           color: #ffffff;
           line-height: 22px;
@@ -672,7 +672,7 @@
       }
 
       p {
-        font-size: 16px;
+        font-size: max(16px, 12Px);
         line-height: 22px;
         color: #777;
 

src/views/data-module/index.module.less

@@ -39,20 +39,25 @@
 }
 
 .searchBtn {
-  width: 90px;
-  height: 43px;
+  // width: 90px;
+  // height: 43px;
   background: #198cfe;
   border-radius: 8px;
-  line-height: 41px;
+  // line-height: 41px;
   font-weight: 600 !important;
-  font-size: 18px;
+  // font-size: max(18px, 13Px);
 }
 
 .resetBtn {
-  width: 90px;
-  height: 43px;
+  // width: 90px;
+  // height: 43px;
   border-radius: 8px;
-  line-height: 41px;
+  // line-height: 41px;
   font-weight: 600 !important;
-  font-size: 18px;
+  // font-size: max(18px, 13Px);
+}
+
+.resetBtn,
+.searchBtn {
+  --n-padding: 0 28px !important;
 }

src/views/home/index.module.less

@@ -57,7 +57,7 @@
 
   .desc {
     padding: 12px 34px 30px;
-    font-size: 13Px;
+    font-size: max(18px, 12Px);
     color: rgba(0, 0, 0, 0.7);
     line-height: 25px;
     letter-spacing: 1px;
@@ -114,7 +114,7 @@
   }
 
   .userName {
-    font-size: 18Px;
+    font-size: max(24px, 17Px);
     color: #131415;
     line-height: 29px;
     font-weight: bold;

src/views/home/index2.module.less

@@ -427,22 +427,27 @@
   }
 
   .searchBtn {
-    width: 90px;
-    height: 43px;
+    // width: 90px;
+    // height: 43px;
     background: #198cfe;
     border-radius: 8px;
-    line-height: 41px;
+    // line-height: 41px;
     font-weight: 600 !important;
-    font-size: 18px;
+    // font-size: max(18px, 13Px);
   }
 
   .resetBtn {
-    width: 90px;
-    height: 43px;
+    // width: 90px;
+    // height: 43px;
     border-radius: 8px;
-    line-height: 41px;
+    // line-height: 41px;
     font-weight: 600 !important;
-    font-size: 18px;
+    // font-size: max(18px, 13Px);
+  }
+
+  .resetBtn,
+  .searchBtn {
+    --n-padding: 0 28px !important;
   }
 }
 
@@ -667,7 +672,7 @@
   }
 
   .n-empty {
-    --n-font-size: 14px !important;
+    --n-font-size: max(16px, 14Px) !important;
   }
 }
 

src/views/home/modals/class-modal/index.module.less

@@ -53,7 +53,7 @@
   }
 
   .n-empty {
-    --n-font-size: 14px !important;
+    --n-font-size: max(16px, 14Px) !important;
   }
 }
 

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

@@ -22,7 +22,7 @@
   border-radius: 10px;
   padding: 0 16px;
   margin: 0 20px 12px;
-  font-size: max(18px, 14px);
+  font-size: max(18px, 13Px);
   font-weight: 600;
   color: #131415;
   line-height: 25px;
@@ -56,7 +56,7 @@
   padding: 0 5px;
   cursor: pointer;
   border-radius: 10px;
-  font-size: max(17px, 13px);
+  font-size: max(17px, 12Px);
 
   &:hover {
     background: #F5F6FA;
@@ -112,7 +112,7 @@
 
   &.childItem {
     padding-left: 30px;
-    font-size: 15px;
+    font-size: max(15px, 12Px);
 
     .title {
       color: #131415;

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

@@ -16,8 +16,9 @@
         &::before {
           margin-left: 12px;
           content: ' ';
-          width: 24px;
-          height: 24px;
+          width: max(20px, 14Px);
+          height: max(20px, 14Px);
+          flex-shrink: 0;
           background: url('../../../images/icon-class-name.png') no-repeat center;
           background-size: contain;
         }
@@ -54,8 +55,9 @@
         &::before {
           margin-left: 12px;
           content: ' ';
-          width: 24px;
-          height: 24px;
+          width: max(20px, 14Px);
+          height: max(20px, 14Px);
+          flex-shrink: 0;
           background: url('../../../images/icon-subject-name.png') no-repeat center;
           background-size: contain;
         }
@@ -73,16 +75,20 @@
 
   :global {
     .n-base-selection {
-      --n-height: 38px !important;
+      --n-height: max(40px, 36Px) !important;
       width: 160px;
       font-size: 15px;
       border-radius: 8px !important;
     }
 
+    .n-base-selection-input__content {
+      font-size: max(15px, 13Px);
+    }
+
     .n-button {
       border-radius: 8px;
       height: 38px;
-      font-size: 17px;
+      font-size: max(18px, 13Px);
       font-weight: 600 !important;
       padding: 0 27px;
     }
@@ -133,7 +139,7 @@
 
     .btnTitle {
       flex-shrink: 0;
-      font-size: 18px;
+      font-size: max(18px, 13Px);
       font-weight: 600;
     }
 

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

@@ -18,6 +18,7 @@
       font-size: 15px;
       --n-height: 40px !important;
     }
+
     .n-space {
       flex-wrap: nowrap !important;
     }

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

@@ -13,7 +13,7 @@
 
     .n-tabs-tab {
       color: #8B8D98;
-      font-size: max(16px, 14Px);
+      font-size: max(16px, 13Px);
       padding-top: 12px;
       padding-bottom: 6px;
       line-height: 22px;

src/views/studentList/index.module.less

@@ -105,21 +105,26 @@
 
   .searchBtn {
     width: 90px;
-    height: 43px;
+    // height: 43px;
     background: #198cfe;
     border-radius: 8px;
-    line-height: 41px;
+    // line-height: 41px;
     font-weight: 600 !important;
-    font-size: 18px;
+    // font-size: max(18px, 13Px);
   }
 
   .resetBtn {
-    width: 90px;
-    height: 43px;
+    // width: 90px;
+    // height: 43px;
     border-radius: 8px;
-    line-height: 41px;
+    // line-height: 41px;
     font-weight: 600 !important;
-    font-size: 18px;
+    // font-size: max(18px, 13Px);
+  }
+
+  .resetBtn,
+  .searchBtn {
+    --n-padding: 0 28px !important;
   }
 }
 
@@ -146,14 +151,14 @@
           flex-direction: row;
           align-items: center;
           text-align: center;
-          font-size: 13px;
+          font-size: max(13px, 11Px);
           font-weight: 400;
-          color: #777777;
+          color: #131415;
           line-height: 18px;
 
           span {
             font-family: 'DINA';
-            font-size: 26px;
+            font-size: max(26px, 18Px);
             font-weight: 600;
             color: #131415;
             line-height: 28px;
@@ -163,7 +168,7 @@
         .TrainDataItemsubTitle {
           margin-top: 4px;
           text-align: center;
-          font-size: 13px;
+          font-size: max(14px, 11Px);
           font-family: PingFangSC-Regular, PingFang SC;
           font-weight: 400;
           color: #777777;
@@ -521,13 +526,14 @@
 
   :global {
     .n-form-item-label {
-      font-size: 15px;
+      font-size: max(15px, 12Px);
       color: #000;
     }
 
     .n-input {
-      height: 57px;
+      height: max(50px, 40Px);
       border-radius: 8px;
+      font-size: max(18px, 14Px);
 
       .n-input__input-el {
         height: 100%;
@@ -543,7 +549,7 @@
       border-radius: 8px;
 
       .n-base-selection-label {
-        height: 57px;
+        height: max(50px, 40Px);
       }
     }
 
@@ -559,7 +565,7 @@
 
   .btn {
     --n-padding: 0 36px !important;
-    --n-height: 45px !important;
+    // --n-height: 45px !important;
     --n-border-radius: 8px !important;
   }
 }

src/views/studentList/modals/update-student/index.module.less

@@ -8,7 +8,6 @@
 
     :global {
       .n-button {
-        height: 48px !important;
         min-width: 156px;
       }
     }

src/views/studentList/studentDetail.tsx

@@ -74,7 +74,7 @@ export default defineComponent({
     return () => (
       <div>
         <CBreadcrumb list={routerList.value}></CBreadcrumb>
-        <div class={[styles.listWrap,styles.infoListWrap]}>
+        <div class={[styles.listWrap, styles.infoListWrap]}>
           <div class={styles.teacherList}>
             <div class={styles.teacherHeader}>
               <div class={styles.teacherHeaderBorder}>
@@ -92,7 +92,7 @@ export default defineComponent({
               <h4 class={styles.studentGender}>
                 {state.studentInfo.nickname}{' '}
                 <NImage
-                previewDisabled
+                  previewDisabled
                   src={
                     state.studentInfo.gender ? maleIcon : femaleIcon
                   }></NImage>