lex 1 سال پیش
والد
کامیت
df022c95c3

+ 1 - 1
dev-dist/sw.js

@@ -104,7 +104,7 @@ define(['./workbox-5357ef54'], function (workbox) {
     workbox.strategies.NetworkFirst()
   );
   workbox.routing.registerRoute(
-    new RegExp('.*.html|css|js'),
+    new RegExp('.*.html|css|js|json'),
     workbox.strategies.NetworkFirst()
   );
 });

+ 27 - 19
src/views/attend-class/index.tsx

@@ -89,6 +89,7 @@ import bottomIconPre from './image/bottom_icon3.png';
 import bottomIconNext from './image/bottom_icon4.png';
 import rightHideIcon from './image/right_hide_icon.png';
 import SelectResources from '../prepare-lessons/model/select-resources';
+import TheNoticeBar from '/src/components/TheNoticeBar';
 
 export type ToolType = 'init' | 'pen' | 'whiteboard';
 export type ToolItem = {
@@ -1547,25 +1548,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>
 

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

@@ -237,7 +237,7 @@ export default defineComponent({
             ))}
           </NSpace>
           {props.isDisabled ? null : (
-            <NSpace size={6}>
+            <NSpace size={12}>
               <n-button
                 quaternary
                 disabled={props.isDelete}

+ 1 - 1
src/views/classList/index.module.less

@@ -452,7 +452,7 @@
     }
 
     p {
-      font-size: 16px;
+      font-size: max(16px, 12Px);
       line-height: 22px;
       color: #777;
 

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

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

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

+ 6 - 2
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="我的收藏">