更新

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

@@ -23,6 +23,14 @@
     position: absolute;
     left: 0;
     bottom: 0;
+    >div{
+      background: url("@/views/attend-class/image/leftBom.png") no-repeat !important;
+      background-size: 100% 100% !important;
+      &:last-child{
+        background: url("@/views/attend-class/image/rightBom.png") no-repeat !important;
+        background-size: 100% 100% !important;
+      }
+    }
   }
 }
 .maxCard {

src/components/card-preview/index.tsx

@@ -109,7 +109,11 @@ export default defineComponent({
             />
           )}
           {item.value.type === 'MUSIC' && (
-            <MusicModal class={styles.musicPreview} item={item.value} />
+            <MusicModal
+              class={styles.musicPreview}
+              item={item.value}
+              from={props.from}
+            />
           )}
           {item.value.type === 'SONG' && (
             <SongModal item={item.value} isDownload={props.isDownload} />

src/components/card-preview/music-modal/index.tsx

@@ -10,6 +10,11 @@ export default defineComponent({
     item: {
       type: Object,
       default: () => ({})
+    },
+    /** 从哪里使用 */
+    from: {
+      type: String,
+      default: ''
     }
   },
   setup(props) {
@@ -21,7 +26,7 @@ export default defineComponent({
     //   : location.origin;
     const src = `${vaildMusicScoreUrl()}/instrument?v=${+new Date()}&modelType=practise&id=${
       props.item.content
-    }&Authorization=${userStore.getToken}`;
+    }&Authorization=${userStore.getToken}&platform=pc`;
     return () => (
       <div class={styles.musicScore}>
         <iframe

src/components/card-preview/song-modal/index.module.less

@@ -95,8 +95,8 @@
 
   .actionBtn {
     display: flex;
-    width: 52px;
-    height: 52px;
+    width: 40px;
+    height: 40px;
     padding: 0;
     background: transparent;
     cursor: pointer;
@@ -109,8 +109,8 @@
 
 
   .iconReplay {
-    width: 31px;
-    height: 29px;
+    width: 40px;
+    height: 40px;
     background-color: transparent;
     cursor: pointer;
     margin-left: 22px;
@@ -141,4 +141,4 @@
   pointer-events: none;
   transform: translateY(100%);
   transition: all .5s;
-}
+}

src/components/card-preview/video-modal/index.module.less

@@ -63,8 +63,8 @@
 
     .actionBtn {
       display: flex;
-      width: 52px;
-      height: 52px;
+      width: 40px;
+      height: 40px;
       padding: 0;
       background: transparent;
       cursor: pointer;
@@ -78,8 +78,8 @@
 
     .actionBtnSpeed {
       position: relative;
-      width: 32px;
-      height: 32px;
+      width: 40px;
+      height: 40px;
       background-color: transparent;
       cursor: pointer;
 
@@ -91,8 +91,8 @@
 
 
     .iconReplay {
-      width: 32px;
-      height: 32px;
+      width: 40px;
+      height: 40px;
       background-color: transparent;
       cursor: pointer;
       margin: 0 22px;
@@ -343,4 +343,4 @@
 //       }
 //     }
 //   }
-// }
+// }

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

@@ -532,6 +532,7 @@
 
   :global {
     .bom_drag{
+      height: 36px;
       position: absolute;
       bottom: 0;
       left: 0;
@@ -733,6 +734,9 @@
     .select-resource{
       padding-bottom: 0;
       height: 50vh;
+      .spaceSectionBox{
+        width: calc(100% - 360px) !important;
+      }
       .list_container{
         --listContainerHeight:50vh;
         .selresources_item_Wrap{
@@ -812,3 +816,25 @@
     box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.1);
   }
 }
+:global{
+  .chapterConBoxClass_drag,.resourcesConBoxClass_drag{
+    .n-card-header .n-card-header__main{
+      text-align: left;
+      position: relative;
+      font-weight: 600;
+      font-size: 18px;
+      color: #131415;
+      padding-left: 30px;
+      &::before{
+        content: "";
+        position: absolute;
+        width: 5px;
+        height: 15px;
+        background: #198CFE;
+        left: 15px;
+        top: 50%;
+        transform: translateY(-50%);
+      }
+    }
+  }
+}

src/views/attend-class/index.tsx

@@ -325,6 +325,7 @@ export default defineComponent({
       // 点名返回
       if (ev.data?.api === 'callBack') {
         closeStudyTool();
+        studyData.callShow = false;
       }
 
       if (ev.data?.api === 'onLogin') {
@@ -829,6 +830,7 @@ export default defineComponent({
           handleSwipeChange(popupData.activeIndex + 1);
           return;
         }
+        if (!isDownArrow.value) return;
         data.nextEndShow = true;
       }
     };
@@ -2072,7 +2074,10 @@ export default defineComponent({
             callStudents={studyData.callStudentList}
             show={studyData.type === 'call'}
             type={studyData.type}
-            close={() => closeStudyTool()}
+            close={() => {
+              closeStudyTool();
+              studyData.callShow = false;
+            }}
           />
         )}
 

src/views/attend-class/model/chapter/index.tsx

@@ -3,12 +3,15 @@ import {
   defineComponent,
   onMounted,
   reactive,
-  toRefs,
+  toRef,
   watch,
-  ComputedRef
+  ComputedRef,
+  ref
 } from 'vue';
+
 import styles from './index.module.less';
 import { NScrollbar, useMessage } from 'naive-ui';
+import deepClone from '/src/helpers/deep-clone';
 
 export default defineComponent({
   name: 'chapter-modal',
@@ -25,7 +28,8 @@ export default defineComponent({
   emits: ['handleSelect'],
   setup(props, { emit }) {
     const message = useMessage();
-    const { treeList, itemActive } = toRefs(props);
+    const itemActive = toRef(props, 'itemActive');
+    const treeList = ref(deepClone(props.treeList));
 
     const formatParentId = (id: any, list: any, ids = [] as any) => {
       for (const item of list) {

src/views/attend-class/model/source-list/index.module.less

@@ -65,6 +65,9 @@
     padding-top: 20px;
     .rightscrollBar{
       :global{
+        .n-scrollbar-container{
+          height: calc(100% - 42px);
+        }
         .n-scrollbar-content{
           padding: 0 14px;
           display: flex;

src/views/home/index.tsx

@@ -159,7 +159,7 @@ export default defineComponent({
                   const origin = /(localhost|192)/.test(location.host)
                     ? 'https://test.lexiaoya.cn'
                     : location.origin;
-                  const src = `${origin}/classroom-app/#/tempo-practice?Authorization=${userStore.getToken}&win=pc`;
+                  const src = `${origin}/classroom-app/#/tempo-practice?Authorization=${userStore.getToken}&win=pc&platform=modal&back=show`;
                   if (window.matchMedia('(display-mode: standalone)').matches) {
                     state.application = window.matchMedia(
                       '(display-mode: standalone)'

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

@@ -61,7 +61,7 @@
   .assignHomeworkStuBoxClass_drag{
     .assignStudent{
       >div{
-        padding-bottom: 10px;
+        padding-bottom: 36px;
       }
     }
   }

src/views/prepare-lessons/model/select-resources/select-item/class-search-group/index.tsx

@@ -244,7 +244,7 @@ export default defineComponent({
           )} */}
 
           <NFormItem label="声部：">
-            <NSpace class={[styles.spaceSection, styles.spaceSection2]}>
+            <NSpace class={[styles.spaceSection, styles.spaceSection2,"spaceSectionBox"]}>
               {catchStore.getSubjectInstruments.map((subject: any) =>
                 subject.instruments && subject.instruments.length > 1 ? (
                   <NPopselect