Merge branch 'master' into jenkins

src/school/approval-manage/agency/index.tsx

@@ -128,7 +128,7 @@ export default defineComponent({
                         center
                         label={`${item.startDate} 至 ${item.endDate}`}
                         isLink
-                        labelClass={styles.recordLabelClass}
+                        labelClass={styles.recordLabelClass2}
                         to={'/approval-manage-subsidy?display=1&salaryId=' + (item.id || '')}
                       >
                         {{

src/school/approval-manage/index.module.less

@@ -146,6 +146,7 @@
       .van-cell__value {
         font-size: 15px;
         color: #333;
+        font-family: PingFangSC-Medium, PingFang SC;
       }
     }
   }
@@ -306,7 +307,9 @@
     }
   }
 }
-
+.recordLabelClass2 {
+  font-family: PingFangSC-Regular, PingFang SC;
+}
 .recordLabelClass {
   font-family: 'DINA';
 }

src/school/approval-manage/subsidy/details.tsx

@@ -92,7 +92,7 @@ export default defineComponent({
                     border={false}
                     center
                     class={styles.listItem}
-                    valueClass={[styles.valueColor, styles.recordLabelClass]}
+                    valueClass={[styles.valueColor]}
                     title={item.reason}
                     value={`${moneyFormat(item.salary)}元`}
                   />

src/school/attendance/components/teacher-attendDetail.module.less

@@ -131,7 +131,6 @@
           border-radius: 10px;
           font-size: 18px;
           color: #333;
-          font-weight: 600;
         }
       }
       .attRang {

src/school/practice-rewards/index.module.less

@@ -220,6 +220,12 @@
     }
     .subjectNames {
       line-height: 1.2;
+      :global {
+        .van-tag {
+          padding: 2px 6px 1px;
+          font-size: 500;
+        }
+      }
     }
   }
 

src/school/train-planning/component/course-preview/index.tsx

@@ -308,7 +308,7 @@ export default defineComponent({
                     <Tag
                       color="#FFE3DA"
                       textColor="#F67146"
-                      style={{ fontWeight: '500', padding: '1px 6px' }}
+                      style={{ fontWeight: '500', padding: '2px 6px 1px' }}
                     >
                       {item.className}
                     </Tag>