lex 1 year ago
parent
commit
fb0e2497e7

+ 42 - 6
src/components/layout/index.module.less

@@ -5,17 +5,20 @@
   flex-direction: row;
   background: #f1f5ff;
   overflow: hidden;
+
   .WrapcoreView {
-    .WrapcoreViewInfo {
-      border-radius: 20px;
-      background-color: #fff;
-      overflow: hidden;
-    }
+    // .WrapcoreViewInfo {
+    // border-radius: 20px;
+    // background-color: #fff;
+    // overflow: hidden;
+    // }
+
     padding: 32px;
     height: calc(100vh - 64px);
     overflow-y: auto;
   }
 }
+
 .silder {
   width: 100px;
   background: #3044ca;
@@ -24,8 +27,10 @@
   display: flex;
   flex-direction: column;
   align-items: center;
+
   .logoWrap {
     margin-top: 22px;
+
     .logo {
       img {
         width: 62px;
@@ -33,6 +38,7 @@
       }
     }
   }
+
   .sliderList {
     margin-top: 37px;
   }
@@ -48,6 +54,7 @@
   margin-bottom: 18px;
   justify-content: center;
   border-radius: 20px;
+
   .radiusIcon {
     img {
       width: 24px;
@@ -58,6 +65,7 @@
     right: -8px;
     top: -26px;
   }
+
   p {
     margin-top: 4px;
     font-size: 14px;
@@ -65,6 +73,7 @@
     color: #ffffff;
     line-height: 20px;
   }
+
   &:hover {
     background-color: rgba(255, 255, 255, 0.1);
   }
@@ -73,13 +82,16 @@
 .silderItem.isActiveItem {
   background-color: #f1f5ff;
   border-radius: 20px 0px 0px 20px;
+
   p {
     color: #21225d;
   }
 }
+
 .Wrapcore {
   height: 100%;
   flex: 1;
+
   .layoutTop {
     height: 64px;
     background-color: #fff;
@@ -89,29 +101,36 @@
     flex-direction: row;
     align-items: center;
     justify-content: space-between;
+
     .layoutLeft {
       display: flex;
       flex-direction: row;
       align-items: center;
+
       .schoolIcon {
         margin-right: 8px;
+
         img {
           width: 32px;
           height: 32px;
         }
       }
+
       p {
         font-size: 18px;
         font-weight: 600;
         color: #131415;
       }
     }
+
     .layoutRight {
       display: flex;
       flex-direction: row;
       align-items: center;
+
       .messageBadge {
         margin-right: 24px;
+
         .messageIcon {
           width: 32px;
           height: 32px;
@@ -124,21 +143,25 @@
         background-color: #dfdfdf;
         margin-right: 24px;
       }
+
       .mesgWrap {
         display: flex;
         flex-direction: row;
         align-items: center;
+
         .teacherIcon {
           width: 32px;
           height: 32px;
           border-radius: 50%;
           overflow: hidden;
         }
+
         .rotueLeft {
           transform: rotate(-90deg);
           transition: 0.2s;
           margin-left: 10px;
         }
+
         .rotueRight {
           transform: rotate(90deg);
           margin-left: 10px;
@@ -148,12 +171,14 @@
     }
   }
 }
+
 :global {
   .n-popover {
     overflow: hidden;
     border-radius: 16px;
   }
 }
+
 .propWrap {
   background-color: var(--n-color);
   border-radius: 16px;
@@ -162,12 +187,14 @@
   background: #ffffff;
   box-shadow: 0px 2px 17px 0px rgba(0, 0, 0, 0.08);
   padding: 20px !important;
+
   .teacherInfo {
     display: flex;
     flex-direction: row;
     align-items: center;
     border-bottom: 1px solid #f2f2f2;
     padding-bottom: 20px;
+
     .teacherIcon {
       width: 48px;
       height: 48px;
@@ -175,6 +202,7 @@
       border: 1px solid #ffffff;
       overflow: hidden;
     }
+
     .teacherName {
       font-size: 22px;
       font-weight: 600;
@@ -182,11 +210,13 @@
       margin-left: 16px;
     }
   }
+
   .propWrapList {
     padding-bottom: 17px;
     border-bottom: 1px solid #f2f2f2;
     margin-top: 16px;
   }
+
   .propWrapItem {
     display: flex;
     flex-direction: row;
@@ -194,27 +224,33 @@
     height: 50px;
     line-height: 50px;
     cursor: pointer;
+
     &:hover {
       background: #f5f6fa;
       border-radius: 10px;
     }
   }
+
   .smallIcon {
     width: 22px;
     height: 23px;
     margin-right: 21px;
     margin-left: 10px;
   }
+
   .smallTitle {
     font-size: 18px;
     font-weight: 600;
     color: #333333;
   }
+
   .logoutInfo {
     margin-top: 16px;
   }
 }
+
 :global {
+
   .fade-slide-leave-active,
   .fade-slide-enter-active {
     transition: all 0.3s;
@@ -229,4 +265,4 @@
     opacity: 0;
     transform: translateX(30px);
   }
-}
+}

+ 16 - 20
src/components/layout/index.tsx

@@ -6,29 +6,25 @@ export default defineComponent({
   name: 'layoutView',
   setup() {
     return () => (
-      <>
+      <div class={styles.wrap}>
         <div>
-          <div class={styles.wrap}>
-            <div>
-              <LayoutSilder></LayoutSilder>
-            </div>
-            <div class={styles.Wrapcore}>
-              <LayoutTop></LayoutTop>
-              <div class={styles.WrapcoreView}>
-                <div class={styles.WrapcoreViewInfo}>
-                  <router-view>
-                    {(obj: any) => (
-                      <Transition name="fade-slide" mode="out-in">
-                        <obj.Component />
-                      </Transition>
-                    )}
-                  </router-view>
-                </div>
-              </div>
-            </div>
+          <LayoutSilder></LayoutSilder>
+        </div>
+        <div class={styles.Wrapcore}>
+          <LayoutTop></LayoutTop>
+          <div class={styles.WrapcoreView}>
+            {/* <div class={styles.WrapcoreViewInfo}> */}
+            <router-view>
+              {(obj: any) => (
+                <Transition name="fade-slide" mode="out-in">
+                  <obj.Component />
+                </Transition>
+              )}
+            </router-view>
+            {/* </div> */}
           </div>
         </div>
-      </>
+      </div>
     );
   }
 });

+ 7 - 1
src/views/prepare-lessons/model/attend-class/index.tsx

@@ -2,14 +2,20 @@ import { defineComponent } from 'vue';
 import styles from './index.module.less';
 import { NInput, NScrollbar, NSelect, NThing } from 'naive-ui';
 import iconSearch from '../../images/icon-search.png';
+import { useRouter } from 'vue-router';
 
 export default defineComponent({
   name: 'attend-class',
   emits: ['close'],
   setup(props, { emit }) {
+    const router = useRouter();
     const onAttendClass = (i: any) => {
       emit('close');
-      window.open(window.location.origin + '/attend-class');
+
+      const { href } = router.resolve({
+        path: '/attend-class'
+      });
+      window.open(href, +new Date() + '');
     };
     return () => (
       <div class={styles.attendClass}>

+ 12 - 0
src/views/prepare-lessons/model/resource-search-group/index.module.less

@@ -12,6 +12,18 @@
     width: 18px;
     height: 19px;
   }
+
+  :global {
+
+    .n-base-selection,
+    .n-input {
+      border-radius: 8px;
+      min-height: 40px;
+      height: 40px;
+      font-size: 15px;
+      --n-height: 40px !important;
+    }
+  }
 }
 
 .inputSearch {

+ 21 - 1
src/views/setting/index.module.less

@@ -1,7 +1,11 @@
 @img: './images';
+
 .listWrap {
   min-height: 805px;
   padding: 32px;
+  background-color: #fff;
+  border-radius: 20px;
+
   .customTabs {
     :global {
       .n-tabs-tab--active {
@@ -10,16 +14,19 @@
         font-weight: 600 !important;
         color: #131415 !important;
       }
+
       .n-tabs-tab {
         font-size: 18px;
         padding: 8px 0 !important;
         font-weight: 400;
         min-width: 50px;
         color: #8b8d98;
+
         &:hover {
           color: #198cfe !important;
         }
       }
+
       .n-tabs-bar {
         // background-color: red !important;
         width: 50px !important;
@@ -30,22 +37,27 @@
     }
   }
 }
+
 .infoWrap {
   height: 100%;
   padding-top: 100px;
   display: flex;
   flex-direction: column;
   align-items: center;
+
   .teacherInfoWrap {
     display: flex;
     flex-direction: column;
     align-items: center;
+
     .teacherHeadWrap {
       position: relative;
+
       .headerD {
         width: 237px;
         height: 142px;
       }
+
       .defultHeade {
         width: 116px;
         height: 116px;
@@ -56,6 +68,7 @@
         left: 61px;
       }
     }
+
     .headerInfo {
       .headerTitle {
         font-size: 22px;
@@ -69,12 +82,14 @@
         flex-direction: row;
         justify-content: center;
         align-items: center;
+
         .sexIcon {
           width: 12px;
           height: 21px;
           margin-left: 5px;
         }
       }
+
       .headerSubTitle {
         font-size: 16px;
         font-weight: 400;
@@ -83,22 +98,27 @@
       }
     }
   }
+
   .setInfo {
     margin-top: 64px;
     width: 1172px;
+
     :global {
       .n-form-item-label {
         font-size: 15px;
         color: rgba(0, 0, 0, 0.8);
       }
+
       .n-input.n-input--disabled {
         background-color: #f5f6fa;
         color: rgba(0, 0, 0, 0.4);
         border: none;
       }
+
       .n-input {
         border-radius: 8px;
       }
+
       .n-input__input-el {
         height: 55px;
         line-height: 55px;
@@ -106,4 +126,4 @@
       }
     }
   }
-}
+}