Browse Source

修改样式

lex 2 years ago
parent
commit
5a8f4d6f00

+ 1 - 0
src/school/approval-manage/agency/index.tsx

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

+ 14 - 0
src/school/approval-manage/index.module.less

@@ -174,6 +174,9 @@
     margin-right: 2px;
     font-family: 'DINA';
   }
+  .small {
+    font-size: 20px;
+  }
   & + .gridItem {
     margin-left: 26px;
   }
@@ -287,6 +290,13 @@
   padding: 15px 25px;
   background: #fff;
   z-index: 10;
+
+  :global {
+    .van-button {
+      font-size: 18px;
+      font-weight: 500;
+    }
+  }
 }
 
 .rewardItem, .itemCourseName {
@@ -295,4 +305,8 @@
       flex: 0 auto;
     }
   }
+}
+
+.recordLabelClass {
+  font-family: 'DINA';
 }

+ 3 - 2
src/school/approval-manage/subsidy/details.tsx

@@ -82,6 +82,7 @@ export default defineComponent({
                 center
                 class={styles.listItem}
                 title="补助标准"
+                valueClass={styles.recordLabelClass}
                 value={`${state.record.standardSalary || 0}元/天`}
               />
 
@@ -91,7 +92,7 @@ export default defineComponent({
                     border={false}
                     center
                     class={styles.listItem}
-                    valueClass={styles.valueColor}
+                    valueClass={[styles.valueColor, styles.recordLabelClass]}
                     title={item.reason}
                     value={`${moneyFormat(item.salary)}元`}
                   />
@@ -126,7 +127,7 @@ export default defineComponent({
                     </div>
                     <div class={styles.itemContentLabel}>{item.orchestraName}</div>
                     <div
-                      class={styles.itemContentTitleDetail}
+                      class={[styles.itemContentTitleDetail, styles.recordLabelClass]}
                       style={{
                         color:
                           item.coursewarePlayTime >= item.adviseStudyTimeSecond

+ 6 - 3
src/school/approval-manage/subsidy/exercise-detail.tsx

@@ -133,7 +133,7 @@ export default defineComponent({
                   <GridItem>
                     <div class={styles.gridItem}>
                       <div class={styles.gridItemTop}>
-                        <span class={styles.topNum} style={{ color: '#333' }}>
+                        <span class={[styles.topNum, styles.small]} style={{ color: '#333' }}>
                           {moneyFormat(item.expectSalary || 0)}
                         </span>
@@ -144,7 +144,7 @@ export default defineComponent({
                   <GridItem>
                     <div class={styles.gridItem}>
                       <div class={styles.gridItemTop}>
-                        <span class={styles.topNum} style={{ color: '#333' }}>
+                        <span class={[styles.topNum, styles.small]} style={{ color: '#333' }}>
                           {moneyFormat(item.reduceSalary || 0)}
                         </span>
@@ -155,7 +155,10 @@ export default defineComponent({
                   <GridItem>
                     <div class={styles.gridItem}>
                       <div class={styles.gridItemTop}>
-                        <span class={styles.topNum}>{moneyFormat(item.actualSalary || 0)}</span>课元
+                        <span class={[styles.topNum, styles.small]}>
+                          {moneyFormat(item.actualSalary || 0)}
+                        </span>
+                        课元
                       </div>
                       <div>实际补助</div>
                     </div>

+ 13 - 11
src/school/approval-manage/subsidy/index.tsx

@@ -118,7 +118,7 @@ export default defineComponent({
                   {{
                     title: () => (
                       <div class={styles.itemTitle}>
-                        <span>
+                        <span class={styles.recordLabelClass}>
                           {data.startDate} 至 {data.endDate}
                         </span>
                         <span class={styles.itemTag}>补助周期</span>
@@ -185,7 +185,7 @@ export default defineComponent({
                   <GridItem>
                     <div class={styles.gridItem}>
                       <div class={styles.gridItemTop}>
-                        <span class={styles.topNum} style={{ color: '#333' }}>
+                        <span class={[styles.topNum, styles.small]} style={{ color: '#333' }}>
                           {moneyFormat(data.manageSalaryInfo.standardSalary || 0)}
                         </span>
                         元/周
@@ -196,7 +196,7 @@ export default defineComponent({
                   <GridItem>
                     <div class={styles.gridItem}>
                       <div class={styles.gridItemTop}>
-                        <span class={styles.topNum} style={{ color: '#333' }}>
+                        <span class={[styles.topNum, styles.small]} style={{ color: '#333' }}>
                           {data.manageSalaryInfo.coursewareNum || 0}
                         </span>
                         课时
@@ -207,7 +207,7 @@ export default defineComponent({
                   <GridItem>
                     <div class={styles.gridItem}>
                       <div class={styles.gridItemTop}>
-                        <span class={styles.topNum}>
+                        <span class={[styles.topNum, styles.small]}>
                           {moneyFormat(data.manageSalaryInfo.actualSalary || 0)}
                         </span>
@@ -235,7 +235,7 @@ export default defineComponent({
                   <GridItem>
                     <div class={styles.gridItem}>
                       <div class={styles.gridItemTop}>
-                        <span class={styles.topNum}>
+                        <span class={[styles.topNum, styles.small]}>
                           {data.practiceSalaryInfo.standardSalary || 0}
                         </span>
                         元/人
@@ -246,7 +246,7 @@ export default defineComponent({
                   <GridItem>
                     <div class={styles.gridItem}>
                       <div class={styles.gridItemTop}>
-                        <span class={styles.topNum}>{data.practiceSalaryInfo.targetNum || 0}</span>
+                        <span class={[styles.topNum, styles.small]}>{data.practiceSalaryInfo.targetNum || 0}</span>
                       </div>
                       <div>练习达标人数</div>
@@ -255,7 +255,7 @@ export default defineComponent({
                   <GridItem>
                     <div class={styles.gridItem}>
                       <div class={styles.gridItemTop}>
-                        <span class={styles.topNum}>
+                        <span class={[styles.topNum, styles.small]}>
                           {data.practiceSalaryInfo.actualSalary || 0}
                         </span>
@@ -282,7 +282,7 @@ export default defineComponent({
                 <GridItem>
                   <div class={styles.gridItem}>
                     <div class={styles.gridItemTop}>
-                      <span class={styles.topNum} style={{ color: '#333' }}>
+                      <span class={[styles.topNum, styles.small]} style={{ color: '#333' }}>
                         {moneyFormat(data.courseSalaryInfo.singleSubsidyStandard || 0)}
                       </span>
                       元/人
@@ -293,7 +293,7 @@ export default defineComponent({
                 <GridItem>
                   <div class={styles.gridItem}>
                     <div class={styles.gridItemTop}>
-                      <span class={styles.topNum} style={{ color: '#333' }}>
+                      <span class={[styles.topNum, styles.small]} style={{ color: '#333' }}>
                         {moneyFormat(data.courseSalaryInfo.musicSubsidyStandard || 0)}
                       </span>
                       元/天
@@ -304,7 +304,7 @@ export default defineComponent({
                 <GridItem>
                   <div class={styles.gridItem}>
                     <div class={styles.gridItemTop}>
-                      <span class={styles.topNum} style={{ color: '#333' }}>
+                      <span class={[styles.topNum, styles.small]} style={{ color: '#333' }}>
                         {moneyFormat(data.courseSalaryInfo.ensembleSubsidyStandard || 0)}
                       </span>
@@ -330,7 +330,9 @@ export default defineComponent({
                         value: () => (
                           <div class={styles.gridItem}>
                             <div class={styles.gridItemTop}>
-                              <span class={styles.topNum}>{moneyFormat(teacher.salary || 0)}</span>
+                              <span class={[styles.topNum, styles.small]}>
+                                {moneyFormat(teacher.salary || 0)}
+                              </span>
                             </div>
                             <div class={styles.valeLabel}>实际补助</div>

+ 3 - 3
src/school/attendance/modals/studentAtt-item.module.less

@@ -51,11 +51,11 @@
       justify-content: space-between;
       text-align: center;
       .itemBottomMain {
-        font-size: 26px;
-        font-weight: bold;
+        font-size: 24px;
         color: #333333;
-        line-height: 35px;
+        line-height: 30px;
         font-family: 'DINA';
+        font-family: DINAlternate-Bold, DINAlternate;
         margin-bottom: 2px;
       }
       .itemBottomSub {

+ 8 - 0
src/school/attendance/modals/teacherAtt-item.module.less

@@ -78,10 +78,12 @@
       .attInfoDot {
         text-align: left;
         padding: 12px;
+        width: 100%;
         .attInfoDotTitle {
           width: 100%;
           display: flex;
           flex-direction: row;
+          justify-content: space-between;
           margin-bottom: 7px;
           align-items: center;
           font-size: 14px;
@@ -104,6 +106,12 @@
     }
     .passWrap,
     .goWrap {
+      &:first-child {
+        margin-right: 5px;
+      }
+      &:last-child {
+          margin-left: 5px
+        }
       flex: 1;
       display: flex;
       flex-direction: row;

+ 1 - 1
src/school/companion-teacher/index.module.less

@@ -15,7 +15,7 @@
     margin-right: 10px;
     margin-top: 2px;
     margin-bottom: 8px;
-    padding: 1px 8px;
+    padding: 3px 8px 2px;
     font-weight: 500;
   }
 }

+ 4 - 1
src/school/orchestra/compontent/information.module.less

@@ -15,6 +15,7 @@
     }
     span {
       font-family: DINA;
+      font-family: DINAlternate-Bold, DINAlternate;
     }
   }
   .red {
@@ -31,11 +32,13 @@
   .title {
     font-size: 22px;
     font-family: 'DINA';
+    font-family: DINAlternate-Bold, DINAlternate;
   }
   .teacher {
-    font-size: 18px;
+    font-size: 16px;
     line-height: 24px;
     max-width: 95px;
+    font-size: 500;
   }
 
   .className {

+ 6 - 0
src/school/orchestra/index.module.less

@@ -9,6 +9,12 @@
     align-items: center;
     font-size: 16px;
     font-weight: 600;
+
+    :global {
+      .van-tag {
+        padding: 2px 8px 1px;
+      }
+    }
   }
 
   p {

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

@@ -119,7 +119,7 @@
   }
   .topNum {
     color: #f67146;
-    font-size: 24px;
+    font-size: 22px;
     margin-right: 2px;
     font-weight: bold;
     font-family: 'DINA';
@@ -231,7 +231,7 @@
       span {
         font-size: 19px;
         font-family: DINA;
-        font-weight: bold;
+        // font-weight: bold;
         color: #333333;
         line-height: 22px;
       }

+ 1 - 1
src/school/practice-rewards/index.tsx

@@ -141,7 +141,7 @@ export default defineComponent({
                 {{
                   title: () => (
                     <div class={styles.itemTitle}>
-                      <span>
+                      <span style={{ fontFamily: 'DINA' }}>
                         {dayjs(item.startTime).format('YYYY-MM-DD')} 至{' '}
                         {dayjs(item.endTime).format('YYYY-MM-DD')}
                       </span>