修改样式

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

@@ -21,20 +21,20 @@
   }
 }
 .rightTip {
-  :global {
-    .van-nav-bar__right {
-      background: #FF8057;
-      color: #fff;
-      border-radius: 50%;
-      width: 22px;
-      height: 22px;
-      padding: 0;
-      justify-content: center;
-      top: 50%;
-      right: 13px;
-      transform: translateY(-50%);
-    }
-  }
+  // :global {
+  //   .van-nav-bar__right {
+  //     background: #FF8057;
+  //     color: #fff;
+  //     border-radius: 50%;
+  //     width: 22px;
+  //     height: 22px;
+  //     padding: 0;
+  //     justify-content: center;
+  //     top: 50%;
+  //     right: 13px;
+  //     transform: translateY(-50%);
+  //   }
+  // }
 }
 .wrap {
   padding: 12px 0;
@@ -76,11 +76,16 @@
     font-size: 15px;
     font-weight: 500;
     .titleIcon {
-      width: 18px;
-      height: 18px;
-      margin-right: 6px;
-    }
+        width: 18px;
+        height: 18px;
+        margin-right: 6px;
+      }
+      .timesinfo {
+
+        font-family: Avenir, Helvetica, Arial, sans-serif;
+      }
   }
+     
   .itemTag {
     padding: 0 8px;
     height: 19px;
@@ -165,8 +170,9 @@
   }
   .topNum {
     color: #f67146;
-    font-size: 22px;
+    font-size: 24px;
     margin-right: 2px;
+    font-family: 'DINA';
   }
   & + .gridItem {
     margin-left: 26px;
@@ -232,6 +238,7 @@
       justify-content: space-between;
       margin-bottom: 6px;
       font-size: 14px;
+      color: #333333;
       & > img {
         width: 18px;
         height: 18px;

src/school/approval-manage/index.tsx

@@ -26,7 +26,7 @@ export default defineComponent({
             document.documentElement.style.setProperty('--header-height', height + 'px')
           }}
         >
-          <OHeader />
+          <OHeader border={false} />
         </OSticky>
         <Tabs
           v-model:active={activeName.value}

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

@@ -49,7 +49,7 @@ export default defineComponent({
           state.record.courseScheduleTeacherAttendanceList.forEach((n: any) => {
             n.times =
               (n?.startTime ? dayjs(n.startTime).format('YYYY-MM-DD HH:mm') : '') +
-              ' ～ ' +
+              '～' +
               (n?.endTime ? dayjs(n.endTime).format('HH:mm') : '')
             n.signInTime = n?.signInTime?.split(' ')[1]
             n.signOutTime = n?.signOutTime?.split(' ')[1]

src/school/approval-manage/subsidy/grant-detail.tsx

@@ -1,4 +1,4 @@
-import { Cell, Dialog, Grid, GridItem, Sticky } from 'vant'
+import { Cell, Dialog, Grid, GridItem, Icon, Sticky } from 'vant'
 import { defineComponent, onMounted, reactive, ref } from 'vue'
 import styles from '../index.module.less'
 import iconTime from '../images/icon-time.png'
@@ -11,6 +11,7 @@ import OSticky from '@/components/o-sticky'
 import dayjs from 'dayjs'
 import { moneyFormat } from '@/helpers/utils'
 import ODialog from '@/components/o-dialog'
+import questIcon from '@/school/images/quest-icon.png'
 
 export default defineComponent({
   name: 'subsidy-grant-detail',
@@ -61,8 +62,11 @@ export default defineComponent({
         >
           <OHeader
             class={styles.rightTip}
-            rightText="?"
+            // rightText="?"
             onClickRight={() => (dialog.value = true)}
+            v-slots={{
+              right: () => <Icon name={questIcon} size={22} color="#333" />
+            }}
           ></OHeader>
         </OSticky>
         <OFullRefresh
@@ -97,7 +101,7 @@ export default defineComponent({
                 <GridItem>
                   <div class={styles.gridItem}>
                     <div class={styles.gridItemTop}>
-                      <span class={styles.topNum} style={{ color: '#333', fontFamily: 'DINA' }}>
+                      <span class={styles.topNum} style={{ color: '#333' }}>
                         {moneyFormat(data.manageSalary.standardSalary || 0)}
                       </span>
                       元/周
@@ -119,7 +123,7 @@ export default defineComponent({
                 <GridItem>
                   <div class={styles.gridItem}>
                     <div class={styles.gridItemTop}>
-                      <span class={styles.topNum} style={{ fontFamily: 'DINA' }}>
+                      <span class={styles.topNum}>
                         {moneyFormat(data.manageSalary.actualSalary || 0)}
                       </span>
                       元
@@ -137,7 +141,7 @@ export default defineComponent({
                       <div class={styles.itemTitle}>
                         <img class={styles.titleIcon} src={iconTime} />
                         {item.startTime && item.endTime ? (
-                          <span>
+                          <span class={styles.timesinfo}>
                             {dayjs(item.startTime).format('YYYY-MM-DD HH:mm')}~
                             {dayjs(item.endTime).format('HH:mm')}
                           </span>

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

@@ -1,4 +1,4 @@
-import { Button, Cell, Dialog, Grid, GridItem, showConfirmDialog, Sticky } from 'vant'
+import { Button, Cell, Dialog, Grid, GridItem, Icon, showConfirmDialog, Sticky } from 'vant'
 import { defineComponent, onMounted, reactive, ref } from 'vue'
 import styles from '../index.module.less'
 import iconA from '../images/icon-photo.png'
@@ -11,6 +11,7 @@ import OSticky from '@/components/o-sticky'
 import iconTeacher from '@/common/images/icon_teacher.png'
 import ODialog from '@/components/o-dialog'
 import { moneyFormat } from '@/helpers/utils'
+import questIcon from '@/school/images/quest-icon.png'
 
 export default defineComponent({
   name: 'approval-manage-subsidy',
@@ -97,7 +98,10 @@ export default defineComponent({
         >
           <OHeader
             class={styles.rightTip}
-            rightText="?"
+            // rightText="?"
+            v-slots={{
+              right: () => <Icon name={questIcon} size={22} color="#333" />
+            }}
             onClickRight={() => (dialog.value = true)}
             title={route.query.display ? '补助详情' : '补助确认'}
           ></OHeader>

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

@@ -108,6 +108,7 @@
         margin-bottom: 12px;
         align-items: center;
         justify-content: space-between;
+        color: #333;
         img {
           width: 18px;
           height: 18px;
@@ -123,7 +124,7 @@
         align-items: center;
         // justify-content: space-between;
         .textWidth {
-          width: 52px;
+          min-width: 54px;
         }
         span {
           margin-left: 6px;
@@ -141,6 +142,7 @@
         justify-content: space-between;
         font-size: 14px;
         font-weight: 500;
+        color: #333;
         .locP {
           margin-left: 5px;
           font-size: 12px;

src/school/attendance/components/teacher-attendDetail.tsx

@@ -265,17 +265,14 @@ export default defineComponent({
                 </div>
                 <p class={styles.signTime}>
                   {teacherAttInfo.value?.signOutTime ? (
-                    <div class={styles.textWidth}>
-                      {teacherAttInfo.value?.signOutStatus === 'NORMAL'
-                        ? '签退时间'
-                        : teacherAttType[teacherAttInfo.value?.signOutStatus]}
-                    </div>
-                  ) : (
-                    ''
-                  )}
-
-                  {teacherAttInfo.value?.signOutTime ? (
-                    <span>{dayjs(teacherAttInfo.value?.signOutTime).format('HH:mm:ss')}</span>
+                    <>
+                      <div class={styles.textWidth}>
+                        {teacherAttInfo.value?.signOutStatus === 'NORMAL'
+                          ? '签退时间'
+                          : teacherAttType[teacherAttInfo.value?.signOutStatus]}
+                      </div>
+                      <span>{dayjs(teacherAttInfo.value?.signOutTime).format('HH:mm:ss')}</span>
+                    </>
                   ) : (
                     '未签退'
                   )}

src/student/trade-record/index.module.less

@@ -60,7 +60,6 @@
     font-size: 20px;
     font-weight: bold;
     color: #fc1a19;
-    line-height: 16px;
     span {
       font-size: 14px;
     }

src/styles/index.less

@@ -107,7 +107,7 @@
   font-family: Avenir, Helvetica, Arial, sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  color: #2c3e50;
+  color: #333;
   min-height: 100vh;
   // font-family: PingFangSC-Regular, PingFang SC;
 }

src/views/exercise-record/exercis-detail.module.less

@@ -87,6 +87,7 @@
         font-weight: 400;
         color: #333333;
         line-height: 17px;
+        text-align: center;
       }
     }
   }

src/views/exercise-record/index.module.less

@@ -19,3 +19,11 @@
     }
   }
 }
+
+.recordSearch {
+  :global {
+    .van-search {
+      padding-bottom: 0;
+    }
+  }
+}

src/views/exercise-record/index.tsx

@@ -200,6 +200,7 @@ export default defineComponent({
             {/* <OHeader onHeaderBack={onBack}></OHeader> */}
             <OSearch
               placeholder="请输入学生姓名"
+              class={styles.recordSearch}
               onSearch={(val: any) => {
                 forms.keyword = val
                 refreshing.value = true