Merge branch 'iteration-large-fontsize' into iteration-large-version

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/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 {
@@ -29,8 +32,8 @@
 
   .active,
   .default {
-    width: max(18px, 16px);
-    height: max(18px, 16px);
+    width: max(16px, 14Px);
+    height: max(16px, 14Px);
   }
 
   &:global(.n-input--focus) {
@@ -56,4 +59,4 @@
       }
     }
   }
-}
+}

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;
@@ -113,13 +119,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;
@@ -180,7 +186,7 @@
     z-index: 9;
     width: 58px;
     height: 29px;
-    border-top-left-radius: 13px;
+    border-top-left-radius: 14px;
   }
 
   // 添加
@@ -188,8 +194,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;

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/layout/layoutTop.tsx

@@ -39,7 +39,10 @@ export default defineComponent({
     const users = useUserStore();
     const showWord = ref(false);
     const { info } = storeToRefs(users);
+    const userInfoStatus = ref(false);
+    const classRecordStatus = ref(false);
     const gotoPerson = () => {
+      userInfoStatus.value = false;
       router.push({ path: '/setting', query: { activeTab: 'person' } });
     };
     const gotoSchool = () => {
@@ -48,6 +51,7 @@ export default defineComponent({
     const suggestionOptionRef = ref();
     const resetPwd = () => {
       showWord.value = true;
+      userInfoStatus.value = false;
     };
     const body = document.querySelector('body');
     if (body) {
@@ -156,6 +160,7 @@ export default defineComponent({
               width={380}
               class={styles.popoverClassModel}
               placement={'bottom'}
+              v-model:show={classRecordStatus.value}
               trigger="click"
               displayDirective="show"
               v-slots={{
@@ -174,7 +179,11 @@ export default defineComponent({
                   </NTooltip>
                 )
               }}>
-              <ClassModal />
+              <ClassModal
+                onConfirm={() => {
+                  classRecordStatus.value = false;
+                }}
+              />
             </NPopover>
             <NTooltip showArrow={false}>
               {{
@@ -221,6 +230,7 @@ export default defineComponent({
             <NPopover
               show-arrow={false}
               trigger="click"
+              v-model:show={userInfoStatus.value}
               onUpdate:show={val => {
                 showHeadFlag.value = val;
               }}
@@ -270,7 +280,6 @@ export default defineComponent({
                 </div>
                 <div class={styles.propWrapList}>
                   <div class={styles.propWrapItem} onClick={() => gotoPerson()}>
-                    {' '}
                     <NImage
                       class={styles.smallIcon}
                       src={personIcon}
@@ -283,7 +292,6 @@ export default defineComponent({
                       onClick={() => {
                         gotoSchool();
                       }}>
-                      {' '}
                       <NImage
                         class={styles.smallIcon}
                         src={schoolDot}

src/components/pagination/index.module.less

@@ -1,4 +1,5 @@
 .pagination {
   margin-top: 12px;
   justify-content: flex-end;
-}
+  --n-item-size: max(40px, 36Px) !important;
+}

src/components/pagination/index.tsx

@@ -11,6 +11,7 @@ import {
   watch
 } from 'vue';
 import { useRoute } from 'vue-router';
+import styles from './index.module.less';
 
 export default defineComponent({
   name: 'table-container',
@@ -155,10 +156,7 @@ export default defineComponent({
 
     return () => (
       <NPagination
-        style={{
-          marginTop: '12px',
-          justifyContent: 'flex-end'
-        }}
+        class={styles.pagination}
         v-model:page={props.page}
         displayOrder={['quick-jumper', 'pages', 'size-picker']}
         pageCount={pageCount.value}

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,44 @@ body {
 .n-image-preview-toolbar .n-base-icon {
   margin: 0 8px;
   padding: 0;
+}
+
+.n-breadcrumb .n-breadcrumb-item {
+  font-size: max(16px, 12Px) !important;
+}
+
+.n-base-selection,
+.n-input {
+  --n-height: max(40px, 36Px) !important;
+  --n-border-radius: 8px !important;
+  font-size: max(15px, 13Px) !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

@@ -294,7 +294,7 @@
       .n-drawer-header__main {
         position: relative;
         z-index: 2;
-        font-size: 18px;
+        font-size: max(18px, 13Px);
         font-weight: 600;
         color: #131415;
         max-width: 220px;
@@ -415,7 +415,7 @@
     }
 
     .n-base-select-menu .n-base-select-option {
-      font-size: 18px !important;
+      font-size: max(15px, 12Px) !important;
     }
   }
 
@@ -690,7 +690,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;
@@ -796,7 +796,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;

src/views/attend-class/index.tsx

@@ -90,6 +90,7 @@ import bottomIconNext from './image/bottom_icon4.png';
 import rightHideIcon from './image/right_hide_icon.png';
 import SelectResources from '../prepare-lessons/model/select-resources';
 import { getStudentAfterWork } from '../studentList/api';
+import TheNoticeBar from '/src/components/TheNoticeBar';
 
 export type ToolType = 'init' | 'pen' | 'whiteboard';
 export type ToolItem = {
@@ -852,7 +853,7 @@ export default defineComponent({
       }
     };
     document.body.addEventListener('keyup', (e: KeyboardEvent) => {
-      // console.log(e, 'e');
+      console.log(e, 'e');
       if (e.code === 'ArrowLeft') {
         // if (popupData.activeIndex === 0) return;
         setModalOpen();
@@ -1596,25 +1597,32 @@ export default defineComponent({
           class={styles.drawerContainer}
           onAfterLeave={handleClosePopup}
           showMask={false}>
-          <NDrawerContent title={activeName.value || '资源列表'} closable>
-            <div ref={drawerCardRef} id="drawerCardRef">
-              {data.knowledgePointList.map((item: any, index: number) => {
-                return (
-                  <div class={[styles.cardContainer, 'drawerCardItemRef']}>
-                    <CardType
-                      item={item}
-                      isActive={popupData.activeIndex === index}
-                      isCollect={false}
-                      isShowCollect={false}
-                      onClick={(item: any) => {
-                        popupData.open = false;
-                        toggleMaterial(item.id);
-                      }}
-                    />
-                  </div>
-                );
-              })}
-            </div>
+          <NDrawerContent closable>
+            {{
+              header: () => (
+                <TheNoticeBar text={activeName.value || '资源列表'} />
+              ),
+              default: () => (
+                <div ref={drawerCardRef} id="drawerCardRef">
+                  {data.knowledgePointList.map((item: any, index: number) => {
+                    return (
+                      <div class={[styles.cardContainer, 'drawerCardItemRef']}>
+                        <CardType
+                          item={item}
+                          isActive={popupData.activeIndex === index}
+                          isCollect={false}
+                          isShowCollect={false}
+                          onClick={(item: any) => {
+                            popupData.open = false;
+                            toggleMaterial(item.id);
+                          }}
+                        />
+                      </div>
+                    );
+                  })}
+                </div>
+              )
+            }}
           </NDrawerContent>
         </NDrawer>
 

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

@@ -19,7 +19,7 @@
   padding: 0 5px;
   cursor: pointer;
   border-radius: 10px;
-  font-size: max(17px, 13px);
+  font-size: max(17px, 12Px);
 
   &:hover {
     background: #F5F6FA;
@@ -75,7 +75,7 @@
 
   &.childItem {
     padding-left: 30px;
-    font-size: 15px;
+    font-size: max(15px, 12Px);
 
     .title {
       color: #131415;

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/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

@@ -288,14 +288,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>
@@ -304,12 +306,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;
@@ -452,7 +452,7 @@
     }
 
     p {
-      font-size: 16px;
+      font-size: max(16px, 12Px);
       line-height: 22px;
       color: #777;
 
@@ -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/classList/index.tsx

@@ -270,11 +270,19 @@ export default defineComponent({
                     </NButton>
                   )}
 
+                  {/* <p
+                      style={{ color: '#EA4132', cursor: 'pointer' }}
+                      onClick={() => {
+                        state.removeVisiable = true;
+                        state.removeRow = row;
+                      }}>
+                      删除
+                    </p> */}
                   {!(row.preStudentNum > 0) ? (
                     <NButton
-                      disabled={!row.upgradeFlag}
                       type="error"
                       color="#EA4132"
+                      textColor="#EA4132"
                       text
                       onClick={() => {
                         state.removeVisiable = true;
@@ -282,15 +290,7 @@ export default defineComponent({
                       }}>
                       删除
                     </NButton>
-                  ) : // <p
-                  //   style={{ color: '#EA4132', cursor: 'pointer' }}
-                  //   onClick={() => {
-                  //     state.removeVisiable = true;
-                  //     state.removeRow = row;
-                  //   }}>
-                  //   删除
-                  // </p>
-                  null}
+                  ) : null}
                   {row.imGroupId ? null : (
                     <NButton
                       type="primary"

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/components/practiceData.tsx

@@ -116,8 +116,6 @@ export default defineComponent({
           return item.practiceUserCount;
         });
 
-        console.log('trainingStatDetailList', payForm.timeList);
-
         setChart();
       } catch (e) {
         console.log(e);
@@ -243,12 +241,14 @@ export default defineComponent({
             <div class={styles.TrainDataTopLeft}>
               <div class={styles.TrainDataItem}>
                 <p class={styles.TrainDataItemTitle}>
-                  <span>
-                    <NNumberAnimation
-                      from={0}
-                      to={payForm.practiceUserCount}></NNumberAnimation>
-                  </span>
-                  人
+                  <div>
+                    <span>
+                      <NNumberAnimation
+                        from={0}
+                        to={payForm.practiceUserCount}></NNumberAnimation>
+                    </span>
+                    人
+                  </div>
                 </p>
                 <p class={styles.TrainDataItemsubTitle}>练习人数</p>
               </div>
@@ -262,7 +262,7 @@ export default defineComponent({
                           to={getMinutes(
                             payForm.practiceDurationAvg
                           )}></NNumberAnimation>
-                      </span>{' '}
+                      </span>
                       分
                     </div>
                   ) : null}
@@ -273,7 +273,7 @@ export default defineComponent({
                         to={getSecend(
                           payForm.practiceDurationAvg
                         )}></NNumberAnimation>
-                    </span>{' '}
+                    </span>
                     秒
                   </div>
                 </p>

src/views/home/components/trainData.tsx

@@ -406,74 +406,89 @@ export default defineComponent({
             <div class={styles.TrainDataTopLeft}>
               <div class={styles.TrainDataItem}>
                 <p class={styles.TrainDataItemTitle}>
-                  <span>
-                    <NNumberAnimation
-                      from={0}
-                      to={totalDateRef.value.trainingCount}></NNumberAnimation>
-                  </span>
-                  次
+                  <div>
+                    <span>
+                      <NNumberAnimation
+                        from={0}
+                        to={
+                          totalDateRef.value.trainingCount
+                        }></NNumberAnimation>
+                    </span>
+                    次
+                  </div>
                 </p>
                 <p class={styles.TrainDataItemsubTitle}>作业次数</p>
               </div>
               <div class={styles.TrainDataItem}>
                 <p class={styles.TrainDataItemTitle}>
-                  <span>
-                    <NNumberAnimation
-                      from={0}
-                      to={
-                        totalDateRef.value.totalStudentCount
-                      }></NNumberAnimation>
-                  </span>
-                  人次
+                  <div>
+                    <span>
+                      <NNumberAnimation
+                        from={0}
+                        to={
+                          totalDateRef.value.totalStudentCount
+                        }></NNumberAnimation>
+                    </span>
+                    人次
+                  </div>
                 </p>
                 <p class={styles.TrainDataItemsubTitle}>应交总人次</p>
               </div>
               <div class={styles.TrainDataItem}>
                 <p class={styles.TrainDataItemTitle}>
-                  <span>
-                    <NNumberAnimation
-                      from={0}
-                      to={
-                        totalDateRef.value.submitStudentCount
-                      }></NNumberAnimation>
-                  </span>
-                  人次
+                  <div>
+                    <span>
+                      <NNumberAnimation
+                        from={0}
+                        to={
+                          totalDateRef.value.submitStudentCount
+                        }></NNumberAnimation>
+                    </span>
+                    人次
+                  </div>
                 </p>
                 <p class={styles.TrainDataItemsubTitle}>提交总人次</p>
               </div>
               <div class={styles.TrainDataItem}>
                 <p class={styles.TrainDataItemTitle}>
-                  <span>
-                    {' '}
-                    <NNumberAnimation
-                      from={0}
-                      to={
-                        totalDateRef.value.qualifiedStudentCount
-                      }></NNumberAnimation>
-                  </span>
-                  人次
+                  <div>
+                    <span>
+                      <NNumberAnimation
+                        from={0}
+                        to={
+                          totalDateRef.value.qualifiedStudentCount
+                        }></NNumberAnimation>
+                    </span>
+                    人次
+                  </div>
                 </p>
                 <p class={styles.TrainDataItemsubTitle}>合格总人次</p>
               </div>
               <div class={styles.TrainDataItem}>
                 <p class={styles.TrainDataItemTitle}>
-                  <span>
-                    <NNumberAnimation
-                      from={0}
-                      to={totalDateRef.value.trainingRate}></NNumberAnimation>
+                  <div>
+                    <span>
+                      <NNumberAnimation
+                        from={0}
+                        to={totalDateRef.value.trainingRate}></NNumberAnimation>
+                    </span>
                     %
-                  </span>
+                  </div>
                 </p>
                 <p class={styles.TrainDataItemsubTitle}>作业提交率</p>
               </div>
               <div class={styles.TrainDataItem}>
                 <p class={styles.TrainDataItemTitle}>
-                  <span>
-                    <NNumberAnimation
-                      from={0}
-                      to={totalDateRef.value.qualifiedRate}></NNumberAnimation>
+                  <div>
+                    <span>
+                      <NNumberAnimation
+                        from={0}
+                        to={
+                          totalDateRef.value.qualifiedRate
+                        }></NNumberAnimation>
+                    </span>
                     %
-                  </span>
+                  </div>
                 </p>
                 <p class={styles.TrainDataItemsubTitle}>作业合格率</p>
               </div>

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;
   }
 }
 
@@ -468,17 +473,16 @@
           display: flex;
           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;
           width: 100%;
-          justify-content: center;
+          justify-content: flex-start;
 
           span {
             font-family: 'DINA';
-            font-size: 26px;
+            font-size: max(26px, 18Px);
             font-weight: 600;
             color: #131415;
             line-height: 28px;
@@ -488,7 +492,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;
@@ -667,7 +671,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/home/modals/class-modal/index.tsx

@@ -16,7 +16,8 @@ import { gradeToCN } from '/src/utils/contants';
 
 export default defineComponent({
   name: 'class-modal',
-  setup() {
+  emits: ['confirm'],
+  setup(props, { emit }) {
     const router = useRouter();
     const userStore = useUserStore();
     const forms = reactive({
@@ -315,6 +316,7 @@ export default defineComponent({
                   // setTabsCaches('attendclass', 'tabName', {
                   //   path: '/classDetail'
                   // });
+                  emit('confirm');
                   sessionStorage.setItem('classDetailTabs', 'attendclass');
                   router.push({
                     path: '/classDetail',

src/views/login/index.module.less

@@ -63,7 +63,7 @@
     padding: 60px;
 
     .colLogo {
-      width: 232px;
+      width: 213px;
       height: 79px;
       // margin-bottom: 110px;
     }
@@ -368,4 +368,4 @@
     cursor: pointer;
   }
 
-}
+}

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;
 

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;
 

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;
   }
 

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';
 

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;
 

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;
     }
 
@@ -158,7 +164,7 @@
   .tipsLeft {
     display: flex;
     align-items: center;
-    font-size: 16px;
+    font-size: max(16px, 12Px);
     color: rgba(0, 0, 0, 0.88);
 
 
@@ -174,7 +180,7 @@
   }
 
   .btnNoTips {
-    font-size: 16px;
+    font-size: max(16px, 12Px);
     font-weight: 500;
     color: #1677FF;
     cursor: pointer;

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

@@ -9,16 +9,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;
     }
@@ -98,21 +102,71 @@
       &::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;
       }
     }
 
     .n-base-selection-input {
-      padding-left: 8px !important;
+      padding-left: 8px;
     }
 
     .n-base-selection .n-base-selection-overlay {
       left: 24px;
     }
   }
+
+  :global {
+    .n-base-selection {
+      --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: max(18px, 13Px);
+      font-weight: 600 !important;
+      padding: 0 27px;
+    }
+
+    .n-button--default-type {
+      background: #E8F4FF;
+      color: #0378EC;
+
+      &:not(.n-button--disabled):hover {
+        background: #E8F4FF;
+      }
+
+      .n-button__border {
+        border: 1px solid #198CFE;
+      }
+    }
+
+    .n-button--error-type {
+      background: #FDEBED !important;
+      color: #EC3A4E !important;
+
+      &:not(.n-button--disabled):hover,
+      &:not(.n-button--disabled):active {
+        background: #FDEBED;
+        color: #EC3A4E;
+      }
+
+      .n-button__border {
+        border: 1px solid #EC3A4E;
+      }
+    }
+  }
 }
 
 .btnItem {
@@ -121,7 +175,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

@@ -15,9 +15,10 @@
       border-radius: 8px;
       min-height: 40px;
       height: 40px;
-      font-size: 15px;
+      font-size: max(15px, 12Px);
       --n-height: 40px !important;
     }
+
     .n-space {
       flex-wrap: nowrap !important;
     }
@@ -49,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 {

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;
     }
   }

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(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;
   }
 

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;
   }
-}
+}

src/views/prepare-lessons/model/select-resources/index.tsx

@@ -53,10 +53,14 @@ export default defineComponent({
           onUpdate:value={(val: string) => {
             tabType.value = val;
           }}>
-          <NTabPane name="myResources" tab="我的资源">
+          <NTabPane
+            name="myResources"
+            tab={props.from === 'class' ? '我的曲目' : '我的资源'}>
             <SelectItem type="myResources" from={props.from} />
           </NTabPane>
-          <NTabPane name="shareResources" tab="共享资源">
+          <NTabPane
+            name="shareResources"
+            tab={props.from === 'class' ? '共享曲目' : '共享资源'}>
             <SelectItem type="shareResources" from={props.from} />
           </NTabPane>
           <NTabPane name="myCollect" tab="我的收藏">

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;
@@ -265,7 +270,7 @@
     .n-tag {
       --n-border-radius: 6px !important;
       --n-height: 26px !important;
-      --n-font-size: 13px !important;
+      --n-font-size: max(13px, 12Px) !important;
       --n-padding: 0 14px !important;
     }
   }
@@ -502,13 +507,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%;
@@ -524,7 +530,7 @@
       border-radius: 8px;
 
       .n-base-selection-label {
-        height: 57px;
+        height: max(50px, 40Px);
       }
     }
 
@@ -540,7 +546,7 @@
 
   .btn {
     --n-padding: 0 36px !important;
-    --n-height: 45px !important;
+    // --n-height: 45px !important;
     --n-border-radius: 8px !important;
   }
 }
@@ -562,12 +568,13 @@
   }
 
   .studentRemove {
-    padding: 0 40px;
+    padding: 32px 40px 46px;
 
     p {
-      font-size: max(18px, 14px);
+      font-size: max(18px, 14Px);
       color: #777777;
       line-height: 30px;
+      text-align: center;
 
       span {
         color: #EA4132;
@@ -576,7 +583,7 @@
   }
 
   .btnGroup {
-    padding: 32px 0;
+    padding: 32px 0 0;
 
     :global {
       .n-button {

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

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

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;

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 {

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

@@ -9,6 +9,10 @@
   }
 
   :global {
+    .n-breadcrumb .n-breadcrumb-item {
+      font-size: max(16px, 12Px) !important;
+    }
+
     .n-breadcrumb>ul {
       display: flex;
       align-items: center;
@@ -87,6 +91,21 @@
       height: 100%;
       line-height: 100%;
     }
+
+
+    .n-button {
+      --n-height: 37px !important;
+      height: 37px;
+      padding: 0 24px;
+      font-size: max(18px, 13Px);
+
+      &.n-button--primary-type {
+        font-weight: bold !important;
+        color: #fff;
+      }
+    }
+
+
   }
 }
 
@@ -207,7 +226,7 @@
     height: 60px;
     border-radius: 8px;
     margin-right: 12px;
-    box-shadow: 0 0 10px 4px rgba(27, 35, 55, .1);
+    // box-shadow: 0 0 10px 4px rgba(27, 35, 55, .1);
     overflow: hidden;
     flex-shrink: 0;
 
@@ -238,7 +257,7 @@
     align-items: flex-start;
 
     .titleName {
-      font-size: 16px;
+      font-size: max(18px, 13Px);
       font-weight: 600;
       color: #131415;
       line-height: 28px;
@@ -246,7 +265,7 @@
     }
 
     .titleDes {
-      font-size: 14px;
+      font-size: max(14px, 11Px);
       font-weight: 400;
       color: #777777;
       line-height: 20px;
@@ -260,7 +279,7 @@
   .btn {
     margin-left: auto;
     width: 84px;
-    height: 40px;
+    height: 36px;
     background: linear-gradient(to right, #44CAFF, #259DFE);
     border: none;
     padding: 0;
@@ -268,6 +287,7 @@
     flex-shrink: 0;
     min-width: 62px;
     min-height: 30px;
+    font-size: max(18px, 12Px);
 
     :global {
       .n-button__content {

src/views/xiaoku-music/index.tsx

@@ -290,6 +290,7 @@ export default defineComponent({
                         round
                         textColor={data.tagIndex === item.id ? '#fff' : '#000'}
                         color={data.tagIndex === item.id ? '#198CFE' : '#fff'}
+                        type={data.tagIndex === item.id ? 'primary' : 'default'}
                         onClick={() => {
                           data.tagIndex = item.id;
                           data.reshing = true;