Merge branch 'iteration-0905' into jenkins

src/views/classList/components/classRecord.module.less

@@ -64,6 +64,16 @@
       color: #777777;
       line-height: 26px;
     }
+
+    .subjectName {
+      font-size: 14px;
+      font-weight: 400;
+      color: #FFFFFF;
+      background: #198CFE;
+      border-radius: 5px;
+      padding: 1px 8px;
+      margin-right: 4px;
+    }
   }
 
 }

src/views/classList/components/classRecord.tsx

@@ -131,6 +131,11 @@ export default defineComponent({
                   <div class={styles.userInfo}>
                     <h2>{item.teacherName}</h2>
                     <p>
+                      {item.subjectName && (
+                        <span class={styles.subjectName}>
+                          {item.subjectName}
+                        </span>
+                      )}
                       {item.lessonCourseware.lessonCoursewareName} |{' '}
                       {item.lessonCourseware.lessonCoursewareDetailName}|{' '}
                       {

src/views/home/index.module.less

@@ -785,9 +785,19 @@
 
       .teachGroupItemInfo {
         font-size: 13px;
-        line-height: 18px;
+        line-height: 26px;
         color: rgba(0, 0, 0, 0.5);
       }
+
+      .subjectName {
+        font-size: 14px;
+        font-weight: 400;
+        color: #FFFFFF;
+        background: #198CFE;
+        border-radius: 5px;
+        padding: 1px 8px;
+        margin-right: 4px;
+      }
     }
   }
 }

src/views/home/modals/teachItem.tsx

@@ -21,7 +21,12 @@ export default defineComponent({
               {props.item.teacherName} <span>{props.item.classGroup}</span>
             </p>
 
-            <p class={styles.teachGroupItemInfo}>{props.item.conent}</p>
+            <p class={styles.teachGroupItemInfo}>
+              {props.item.subjectName && (
+                <span class={styles.subjectName}>{props.item.subjectName}</span>
+              )}
+              {props.item.conent}
+            </p>
           </div>
         </div>
       </>