Merge branch 'iteration-0906' into jenkins

src/views/home/api.ts

@@ -12,7 +12,7 @@ export const courseSchedulePage = (params: any) => {
 /**
  * 首页 - 年级班级列表
  */
-export const classGroupList = (params: any) => {
+export const classGroupList = (params?: any) => {
   return request.post('/edu-app/classGroup/list', {
     data: params
   });

src/views/home/index.module.less

@@ -646,6 +646,7 @@
             --n-font-size: 15px !important;
             --n-border: 1px solid #DEDEDE !important;
             --n-border-radius: 8px !important;
+            max-width: 130px;
           }
         }
       }

src/views/home/index.tsx

@@ -115,7 +115,7 @@ export default defineComponent({
     // 获取年级班级
     const getClassList = async () => {
       try {
-        const { data } = await classGroupList({ removeZeroClass: true });
+        const { data } = await classGroupList();
         const cList = data || [];
         const gradeList: any = [];
         const popSelectOptions: any = [];
@@ -245,7 +245,8 @@ export default defineComponent({
               lessonCourseware.lessonCoursewareDetailName +
               ' | ' +
               lessonCourseware.lessonCoursewareKnowledgeDetailName,
-            image: item.teacherAvatar
+            image: item.teacherAvatar,
+            subjectName: item.subjectName
           });
         });
 
@@ -496,11 +497,13 @@ export default defineComponent({
                             'classDetailTabs',
                             'attendclass'
                           );
+                          console.log(forms.classSelect);
                           router.push({
                             path: '/classDetail',
                             query: {
                               name: forms.classSelect.name,
-                              id: forms.classSelect.currentClass
+                              id: forms.classSelect.currentClass,
+                              gradeYear: forms.classSelect.gradeYear
                             }
                           });
                         }}>