Merge remote-tracking branch 'origin/startLogin' into online

src/custom-plugins/guide-page/lessons-guide.tsx

@@ -107,8 +107,8 @@ export default defineComponent({
             height: px2vw(302)
           },
           btnsStyle: {
-            bottom: px2vw(30),
-            left: px2vw(-90),
+            top:px2vw(-205),
+            left: px2vw(-22),
           },
 
           eleRectPadding:{
@@ -145,7 +145,6 @@ export default defineComponent({
       step: 0
     });
     const tipShow = ref(false);
-
     const guideInfo = ref({} as any)
     const getAllGuidance = async()=>{
       try{

src/views/classList/index.tsx

@@ -136,17 +136,17 @@ export default defineComponent({
         {
           title: '班级名称',
           key: 'name',
-          width: '20%'
+
         },
         {
           title: '班级声部',
           key: 'subjectName',
-          width: '20%'
+
         },
         {
           title: '学生人数',
           key: 'preStudentNum',
-          width: '20%'
+
         },
         {
           title: '上次学习',
@@ -431,10 +431,11 @@ export default defineComponent({
         <NModal
           v-model:show={state.showaddClass}
           style={{ width: '500px' }}
+          display-directive='if'
           preset="card"
           class={['modalTitle background']}
           title={'创建班级'}>
-          {state.showaddClass ? (
+
             <CreateClass
               gradeNumList={state.gradeNumList}
               classArray={classArray}
@@ -442,22 +443,23 @@ export default defineComponent({
               onGetList={() => getList()}
               onClose={() => (state.showaddClass = false)}
             />
-          ) : null}
+
         </NModal>
         <NModal
           v-model:show={state.showResetClass}
           style={{ width: '500px' }}
+          display-directive='if'
           preset="card"
           class={['modalTitle background']}
           title={'修改声部'}>
-          {state.showResetClass ? (
+
             <ResetSubject
               activeRow={state.activeRow}
               subjectList={state.subjectList}
               onGetList={() => getList()}
               onClose={() => (state.showResetClass = false)}
             />
-          ) : null}
+
         </NModal>
 
         <NModal

src/views/prepare-lessons/components/lesson-main/index.tsx

@@ -12,12 +12,11 @@ export default defineComponent({
     return () => (
       <div class={styles['lesson-main']}>
         <NTabs
-          animated
           defaultValue="courseware"
           paneClass={styles.paneTitle}
           justifyContent="center"
           paneWrapperClass={styles.paneWrapperContainer}
-          onUpdate:value={(val: string) => {
+          onUpdate: value={(val: string) => {
             prepareStore.setTabType(val);
           }}>
           <NTabPane name="courseware" tab="课件" displayDirective="show">
@@ -26,7 +25,7 @@ export default defineComponent({
           <NTabPane
             name="train"
             tab="作业"
-            displayDirective="show"
+            displayDirective="if"
             v-slots={{ tab: () => <span id="lessons-4">作业</span> }}
             {...{ id: 'lessons-4' }}>
             <Train />

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

@@ -121,9 +121,9 @@ export default defineComponent({
           }
         });
         forms.trainList = tempCourse || [];
-        setTimeout(() => {
+        setTimeout(()=>{
           showGuide.value = true;
-        }, 500);
+        },500)
       } catch {
         //
       }
@@ -217,6 +217,8 @@ export default defineComponent({
       // checkSubjectIds();
 
       await getList();
+
+
     });
     return () => (
       <div class={styles.coursewareModal}>