更新修改样式

src/components/o-dialog/index.module.less

@@ -18,6 +18,7 @@
 }
 
 .oDialog {
+  // margin-top: env(safe-area-inset-top);
   :global {
     .van-dialog__header {
       padding-top: 20px;
@@ -25,8 +26,8 @@
     .van-dialog__message {
       font-size: 16px;
       color: #333;
-      font-weight: 500;
-      line-height: 22px;
+      font-weight: 400;
+      line-height: 24px;
     }
     .van-dialog__cancel,
     .van-dialog__confirm {

src/components/o-dialog/index.tsx

@@ -36,6 +36,10 @@ export default defineComponent({
     messageAlign: {
       type: String as PropType<'left' | 'center' | 'right'>,
       default: 'center'
+    },
+    dialogMarginTop: {
+      type: String,
+      default: '0px'
     }
   },
   emits: ['cancel', 'confirm', 'update:show'],
@@ -54,6 +58,9 @@ export default defineComponent({
     return () => (
       <Dialog
         class={styles.oDialog}
+        style={{
+          marginTop: props.dialogMarginTop
+        }}
         v-model:show={state.show}
         message={props.message}
         messageAlign={props.messageAlign}

src/components/o-header/index.module.less

@@ -5,6 +5,11 @@
     .van-icon {
       color: inherit;
     }
+    .van-nav-bar__title {
+      font-size: 18px;
+      font-weight: 500;
+      color: #333;
+    }
     .van-nav-bar__right {
       & > div {
         line-height: 0;

src/router/routes-school.ts

@@ -186,7 +186,7 @@ export default [
         name: 'attendance',
         component: () => import('@/school/attendance/index'),
         meta: {
-          title: '异常考勤'
+          title: '考勤管理'
         }
       },
       {

src/school/approval-manage/course-adjust.module.less

@@ -18,8 +18,14 @@
         font-weight: 400;
         color: #333333;
       }
+      .van-field__control {
+        font-family: 'DINA';
+      }
     }
   }
+  .numFamily {
+    font-family: 'DINA';
+  }
 }
 
 // .btnWrap {

src/school/approval-manage/course-adjust.tsx

@@ -173,11 +173,14 @@ export default defineComponent({
               <Cell title="乐团名称" value={courseDetail.value.orchestraName} />
               <Cell title="课程类型">
                 {{
-                  value: () => (
-                    <Tag type="primary" size="medium">
-                      {courseEmnu[courseDetail.value.type]}
-                    </Tag>
-                  )
+                  value: () =>
+                    courseDetail.value.type ? (
+                      <Tag type="primary" size="large">
+                        {courseEmnu[courseDetail.value.type]}
+                      </Tag>
+                    ) : (
+                      ''
+                    )
                 }}
               </Cell>
               <Cell
@@ -194,6 +197,7 @@ export default defineComponent({
                 readonly
                 isLink
                 placeholder="请选择上课日期"
+                valueClass={styles.numFamily}
                 onClick={() => (state.showPopoverTime = true)}
                 modelValue={forms.classDate ? dayjs(forms.classDate).format('YYYY-MM-DD') : ''}
               />
@@ -221,7 +225,11 @@ export default defineComponent({
                   state.showPopoverCourseTime = true
                 }}
               />
-              <Cell title="课程时长" value={(courseDetail.value.singleCourseTime || 0) + '分钟'} />
+              <Cell
+                title="课程时长"
+                valueClass={styles.numFamily}
+                value={(courseDetail.value.singleCourseTime || 0) + '分钟'}
+              />
             </CellGroup>
           </div>
           <OSticky position="bottom">

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

@@ -23,7 +23,7 @@
 .rightTip {
   :global {
     .van-nav-bar__right {
-      background: rgba(239, 135, 97, 1);
+      background: #FF8057;
       color: #fff;
       border-radius: 50%;
       width: 22px;
@@ -70,7 +70,8 @@
   .itemTitle {
     display: flex;
     align-items: center;
-    font-size: 16px;
+    font-size: 15px;
+    font-weight: 500;
     .titleIcon {
       width: 18px;
       height: 18px;
@@ -174,6 +175,7 @@
     align-items: center;
     justify-content: space-between;
     font-size: 16px;
+    font-weight: 600;
     color: #333;
     padding-bottom: 6px;
     line-height: 22px;

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

@@ -9,6 +9,8 @@ import OFullRefresh from '@/components/o-full-refresh'
 import OHeader from '@/components/o-header'
 import OSticky from '@/components/o-sticky'
 import dayjs from 'dayjs'
+import { moneyFormat } from '@/helpers/utils'
+import ODialog from '@/components/o-dialog'
 
 export default defineComponent({
   name: 'subsidy-grant-detail',
@@ -95,8 +97,8 @@ export default defineComponent({
                 <GridItem>
                   <div class={styles.gridItem}>
                     <div class={styles.gridItemTop}>
-                      <span class={styles.topNum} style={{ color: '#333' }}>
-                        {data.manageSalary.standardSalary || 0}
+                      <span class={styles.topNum} style={{ color: '#333', fontFamily: 'DINA' }}>
+                        {moneyFormat(data.manageSalary.standardSalary || 0)}
                       </span>
                       元/周
                     </div>
@@ -117,7 +119,10 @@ export default defineComponent({
                 <GridItem>
                   <div class={styles.gridItem}>
                     <div class={styles.gridItemTop}>
-                      <span class={styles.topNum}>{data.manageSalary.actualSalary || 0}</span>元
+                      <span class={styles.topNum} style={{ fontFamily: 'DINA' }}>
+                        {moneyFormat(data.manageSalary.actualSalary || 0)}
+                      </span>
+                      元
                     </div>
                     <div>实际补助</div>
                   </div>
@@ -153,29 +158,14 @@ export default defineComponent({
             ))}
           </div>
         </OFullRefresh>
-        <Dialog v-model:show={dialog.value} confirmButtonText="我知道了">
-          <div class={[styles.item, styles.tipItem]}>
-            <Cell center border={false}>
-              {{
-                title: () => (
-                  <div class={styles.itemTitle}>
-                    <div class={styles.titleLine}></div>
-                    <span>补助标准</span>
-                  </div>
-                )
-              }}
-            </Cell>
-            <div class={styles.tipContent}>
-              1、管理补助每个学期最多发放16次，且仅在有配置课件课程的周次发放
-              <br />
-              2、若本周有配置课件的课程，则需在乐团剪影中上传6张训练照片，若不足6张，则本周次管理补助扣除
-              <br />
-              3、若未在本学期时间内发布2篇乐团资讯，则下一学期管理补助按标准金额的80%发放
-              <br />
-              4、若本学期管理补助是按标准金额的80%发放，只要在本学期内发布2篇或以上乐团资讯，则下学期恢复正常管理补助标准
-            </div>
-          </div>
-        </Dialog>
+        <ODialog
+          title="补助标准"
+          message="1、管理补助每个学期最多发放16次，且仅在有配置课件课程的周次发放 \n 2、若本周有配置课件的课程，则需在乐团剪影中上传6张训练照片，若不足6张，则本周次管理补助扣除 \n 3、若未在本学期时间内发布2篇乐团资讯，则下一学期管理补助按标准金额的80%发放 \n 4、若本学期管理补助是按标准金额的80%发放，只要在本学期内发布2篇或以上乐团资讯，则下学期恢复正常管理补助标准"
+          v-model:show={dialog.value}
+          dialogMarginTop="env(safe-area-inset-top)"
+          messageAlign="left"
+          confirmButtonText="我知道了"
+        />
       </div>
     )
   }

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

@@ -9,6 +9,7 @@ import OFullRefresh from '@/components/o-full-refresh'
 import OHeader from '@/components/o-header'
 import OSticky from '@/components/o-sticky'
 import iconTeacher from '@/common/images/icon_teacher.png'
+import ODialog from '@/components/o-dialog'
 
 export default defineComponent({
   name: 'approval-manage-subsidy',
@@ -346,31 +347,15 @@ export default defineComponent({
             </div>
           </div>
         )}
-        <Dialog v-model:show={dialog.value} confirmButtonText="我知道了">
-          <div class={[styles.item, styles.tipItem]}>
-            <Cell center border={false}>
-              {{
-                title: () => (
-                  <div class={styles.itemTitle}>
-                    <div class={styles.titleLine}></div>
-                    <span>补助发放规则</span>
-                  </div>
-                )
-              }}
-            </Cell>
-            <div class={styles.tipContent}>
-              1、每周一凌晨生成上一周实际补助数据
-              <br />
-              2、每周一24点前完成补助确认，则该补助将会在当周周五发放
-              <br />
-              3、超过周一24点确认，则延后到下周周五发放
-              <br />
-              4、如遇法定节假日，则统一延后到下一周五发放
-              <br />
-              5、未绑定银行卡导致无法发放时，将在绑定银行卡后的下一周五，一次性将已确认且未发放的补助金额发放
-            </div>
-          </div>
-        </Dialog>
+
+        <ODialog
+          title="补助发放规则"
+          message="1、每周一凌晨生成上一周实际补助数据\n2、每周一24点前完成补助确认，则该补助将会在当周周五发放\n3、超过周一24点确认，则延后到下周周五发放\n4、如遇法定节假日，则统一延后到下一周五发放\n5、未绑定银行卡导致无法发放时，将在绑定银行卡后的下一周五，一次性将已确认且未发放的补助金额发放"
+          v-model:show={dialog.value}
+          dialogMarginTop="env(safe-area-inset-top)"
+          messageAlign="left"
+          confirmButtonText="我知道了"
+        />
       </div>
     )
   }

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

@@ -78,6 +78,7 @@
           text-overflow: ellipsis;
           white-space: nowrap;
           font-size: 14px;
+          padding-top: 2px;
           font-weight: 400;
           color: #777777;
           line-height: 20px;
@@ -121,6 +122,9 @@
         flex-direction: row;
         align-items: center;
         // justify-content: space-between;
+        .textWidth {
+          width: 52px;
+        }
         span {
           margin-left: 6px;
           border-radius: 10px;
@@ -134,6 +138,7 @@
         display: flex;
         flex-direction: row;
         align-items: center;
+        justify-content: space-between;
         font-size: 14px;
         font-weight: 500;
         .locP {
@@ -217,6 +222,9 @@
       margin-right: 6px;
     }
   }
+  .cross {
+    font-size: 19px;
+  }
 }
 .bottomConent {
   padding: 20px 15px 57px;

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

@@ -117,7 +117,7 @@ export default defineComponent({
                 </div>
                 <p class={styles.leftTimer}>
                   {dayjs(teacherAttInfo.value?.startTime).format('YYYY-MM-DD HH:mm')}
-                  {'-'}
+                  {'~'}
                   {dayjs(teacherAttInfo.value?.endTime).format('HH:mm')}
                 </p>
               </div>
@@ -180,14 +180,19 @@ export default defineComponent({
                   />
                 </div>
                 <p class={styles.signTime}>
-                  {teacherAttInfo.value?.signInTime
-                    ? teacherAttType[teacherAttInfo.value?.signInStatus]
-                    : ''}
-
+                  {teacherAttInfo.value?.signInTime ? (
+                    <div class={styles.textWidth}>
+                      {teacherAttInfo.value?.signInStatus === 'NORMAL'
+                        ? '签到时间'
+                        : teacherAttType[teacherAttInfo.value?.signInStatus]}
+                    </div>
+                  ) : (
+                    ''
+                  )}
                   {teacherAttInfo.value?.signInTime ? (
                     <span>{dayjs(teacherAttInfo.value?.signInTime).format('HH:mm:ss')}</span>
                   ) : (
-                    <span>未签到</span>
+                    '未签到'
                   )}
                 </p>
               </div>
@@ -235,7 +240,7 @@ export default defineComponent({
                           : styles.error
                       ]}
                     >
-                      查看定位 <Icon name="arrow" class={styles.arrow}></Icon>
+                      查看定位<Icon name="arrow" class={styles.arrow}></Icon>
                     </p>
                   ) : null}
                 </div>
@@ -251,7 +256,7 @@ export default defineComponent({
               <div class={styles.attInfoDot}>
                 <div class={styles.attInfoDotTitle}>
                   <p>
-                    下课时间<span>{dayjs(teacherAttInfo.value?.endTime).format('HH:mm')}</span>
+                    下课时间 <span>{dayjs(teacherAttInfo.value?.endTime).format('HH:mm')}</span>
                   </p>
                   <img
                     src={teacherAttInfo.value?.signOutStatus === 'NORMAL' ? successIcon : errorIcon}
@@ -259,9 +264,15 @@ export default defineComponent({
                   />
                 </div>
                 <p class={styles.signTime}>
-                  {teacherAttInfo.value?.signOutTime
-                    ? teacherAttType[teacherAttInfo.value?.signOutStatus]
-                    : ''}
+                  {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>
@@ -312,11 +323,14 @@ export default defineComponent({
                             : styles.error
                         ]}
                       >
-                        查看定位 <Icon name="arrow" class={styles.arrow}></Icon>
+                        查看定位<Icon name="arrow" class={styles.arrow}></Icon>
                       </p>
                     </>
                   ) : (
-                    <p>暂无定位</p>
+                    <>
+                      <p>暂无定位</p>
+                      <p></p>
+                    </>
                   )}
                 </div>
               </div>

src/school/attendance/index.module.less

@@ -12,3 +12,13 @@
   transition: all 0.1;
   transform: rotate(180deg);
 }
+.stickyAttendance {
+  :global {
+    .van-tab--active {
+      color: var(--van-primary)
+    }
+    .van-tabs__line {
+      bottom: 20px;
+    }
+  }
+}

src/school/attendance/index.tsx

@@ -7,6 +7,7 @@ import { defineComponent, onMounted, reactive, ref, nextTick } from 'vue'
 import { useRouter } from 'vue-router'
 import AttendStudent from './components/attend-student'
 import AttendTeacher from './components/attend-teacher'
+import styles from './index.module.less'
 const activeName = ref('student')
 export default defineComponent({
   name: 'school-attendance',
@@ -28,7 +29,15 @@ export default defineComponent({
           <OHeader border={false}></OHeader>
         </OSticky>
 
-        <Tabs v-model:active={activeName.value} sticky swipeable offsetTop={state.heightV}>
+        <Tabs
+          v-model:active={activeName.value}
+          sticky
+          swipeable
+          offsetTop={state.heightV}
+          lineHeight={4}
+          lineWidth={16}
+          class={styles.stickyAttendance}
+        >
           <Tab name="student" title="学生考勤">
             <AttendStudent toHeight={state.heightV} />
           </Tab>

src/school/attendance/modals/student-cell.module.less

@@ -46,23 +46,28 @@
         line-height: 22px;
       }
       .statusTag {
-        width: 48px;
+        width: 40px;
         height: 20px;
         border-radius: 4px;
-        font-size: 14px;
+        font-size: 12px;
         font-weight: 500;
         line-height: 20px;
-        color: #ffffff;
+        color: #F67146;
+        margin-top: 3px;
+        background-color: #FFE8E0;
         text-align: center;
       }
       .LATE {
-        background-color: #8f80ff;
+        background-color: #EEEAFE;
+        color: #7D41EA;
       }
       .LEAVE {
-        background-color: #64a9ff;
+        background-color: #E2EFFF;
+        color: #529EFE;
       }
       .TRUANCY {
-        background-color: #ff5c5f;
+        background-color: #FFE2E2;
+        color: #FF5C5F;
       }
     }
     .msgIcon {

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

@@ -51,10 +51,11 @@
       justify-content: space-between;
       text-align: center;
       .itemBottomMain {
-        font-size: 30px;
+        font-size: 26px;
         font-weight: bold;
         color: #333333;
         line-height: 35px;
+        font-family: 'DINA';
         margin-bottom: 2px;
       }
       .itemBottomSub {
@@ -64,8 +65,8 @@
         line-height: 20px;
       }
       img {
-        width: 50px;
-        height: 50px;
+        width: 45px;
+        height: 45px;
         margin-right: 16px;
       }
     }

src/school/attendance/modals/studentAtt-item.tsx

@@ -29,14 +29,14 @@ export default defineComponent({
           </div>
           <div class={styles.itemWrapBottom}>
             <div class={styles.passWrap}>
-              <img src={passIcon} alt="" />
+              <img src={goIcon} alt="" />
               <div>
                 <p class={styles.itemBottomMain}>{props.item.leaveNum}</p>
                 <p class={styles.itemBottomSub}>请假人数</p>
               </div>
             </div>
             <div class={styles.goWrap}>
-              <img src={goIcon} alt="" />
+              <img src={passIcon} alt="" />
               <div>
                 <p class={styles.itemBottomMain}>{props.item.truancyNum}</p>
                 <p class={styles.itemBottomSub}>旷课人数</p>

src/school/attendance/modals/teacherAtt-item.module.less

@@ -62,7 +62,8 @@
           white-space: nowrap;
           overflow: hidden;
           text-overflow: ellipsis;
-          font-size: 12px;
+          font-size: 13px;
+          padding-top: 2px;
           font-weight: 400;
           color: #777777;
           line-height: 17px;
@@ -83,6 +84,8 @@
           flex-direction: row;
           margin-bottom: 7px;
           align-items: center;
+          font-size: 14px;
+          color: #333333;
           img {
             width: 18px;
             height: 18px;

src/school/attendance/modals/teacherAtt-item.tsx

@@ -28,7 +28,7 @@ export default defineComponent({
               </div>
               <p class={styles.leftTimer}>
                 {dayjs(props.item.startTime).format('YYYY-MM-DD HH:mm')}
-                {'-'}
+                {'~'}
                 {dayjs(props.item.endTime).format('HH:mm')}
               </p>
             </div>

src/school/companion-teacher/companion-detail.module.less

@@ -13,6 +13,7 @@
     margin-right: 10px;
     margin-top: 2px;
     margin-bottom: 2px;
+    padding: 1px 8px;
   }
 }
 .sectionCellGroup {

src/school/companion-teacher/companion-teacher-register.tsx

@@ -111,7 +111,7 @@ export default defineComponent({
         })
         // state.submitStatus = true
         window.location.href =
-          'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485261&idx=1&sn=70c79a832a609bf9fae01c9e90fb4f69&chksm=c12c2593f65bac85d26362bca470f6abc2bfc087d9f4dcf87c00094420bdf5a3acb1b870199b#rd'
+          'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485329&idx=2&sn=2927feae23d59514daf21cd07657c209&chksm=c12c254ff65bac598b636ffa4b88cb35999ad48aaef0b4c31c8c20804d83f514e2b60251b7c7#rd'
       } catch {
         // showToast('保存失败，请重试')
       }

src/school/companion-teacher/compontent/teacher.module.less

@@ -31,6 +31,7 @@
     margin-right: 10px;
     margin-top: 2px;
     margin-bottom: 2px;
+    padding: 1px 8px;
   }
 }
 

src/school/companion-teacher/compontent/teacher.tsx

@@ -90,7 +90,7 @@ export default defineComponent({
     return () => (
       <div class={!form.listState.dataShow && 'emptyRootContainer'}>
         <OSticky position="top">
-          <OHeader title="交接伴学指导" desotry={false} />
+          <OHeader title="交接伴学指导" desotry={false} border={false} />
           <OSearch
             placeholder="请输入伴学指导姓名"
             // inputBackground="white"

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

@@ -14,6 +14,7 @@
     margin-right: 10px;
     margin-top: 2px;
     margin-bottom: 2px;
+    padding: 1px 8px;
   }
 }
 

src/school/manage-teacher/manage-teacher-register.tsx

@@ -95,7 +95,7 @@ export default defineComponent({
         })
         // state.submitStatus = true
         window.location.href =
-          'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485261&idx=1&sn=70c79a832a609bf9fae01c9e90fb4f69&chksm=c12c2593f65bac85d26362bca470f6abc2bfc087d9f4dcf87c00094420bdf5a3acb1b870199b#rd'
+          'https://mp.weixin.qq.com/s?__biz=MzkxMDMwOTI5Nw==&mid=2247485329&idx=1&sn=4791a51fa540f461d76308abdd8c40c8&chksm=c12c254ff65bac59b8d1d4138ecefe3344ca1f4d080fde8eee7a8c2d6be29e8fd1a5dbe82811#rd'
       } catch {
         //
       }

src/school/mass-message/component/class-list/index.module.less

@@ -18,6 +18,7 @@
     font-size: 26px;
     font-weight: bold;
     color: #333;
+    font-family: 'DINA';
     i {
       font-style: normal;
       font-size: 12px;
@@ -38,24 +39,27 @@
   .img {
     width: 40px;
     height: 40px;
-    margin-right: 12px;
+    margin-right: 8px;
     border-radius: 50%;
     overflow: hidden;
   }
   .teacherName {
     display: flex;
     align-items: center;
-    font-size: 16px;
-    font-weight: 600;
-    color: #333333;
-    line-height: 22px;
+    
     .name {
       padding: 0;
       max-width: 120px;
+      font-size: 16px;
+      font-weight: 600;
+      color: #333333;
+      line-height: 22px;
     }
     :global {
       .van-tag {
-        margin-left: 6px;
+        margin-left: 8px;
+        height: 17px;
+          border-radius: 4px;
       }
     }
   }

src/school/mass-message/component/manage-list/index.module.less

@@ -44,5 +44,6 @@
     margin-right: 10px;
     margin-top: 2px;
     margin-bottom: 2px;
+    padding: 1px 8px;
   }
 }

src/school/mass-message/component/student-list/index.module.less

@@ -44,5 +44,6 @@
     margin-right: 10px;
     margin-top: 2px;
     margin-bottom: 2px;
+    padding: 1px 8px;
   }
 }

src/school/mass-message/component/teacher-list/teacher-list.module.less

@@ -1,7 +1,7 @@
 .cellTeacher {
   .img {
-    width: 48px;
-    height: 48px;
+    width: 40px;
+    height: 40px;
     overflow: hidden;
     border-radius: 50%;
     margin-right: 12px;
@@ -44,5 +44,6 @@
     margin-right: 10px;
     margin-top: 2px;
     margin-bottom: 2px;
+    padding: 1px 8px;
   }
 }

src/school/mass-message/component/teacher-list/teacher-list.tsx

@@ -157,7 +157,7 @@ export default defineComponent({
           <OSearch
             // inputBackground="white"
             // background="#F8F8F8"
-            placeholder="伴学指导姓名/手机号"
+            placeholder="伴学指导姓名"
             onSearch={(val: any) => {
               forms.params.keyword = val
               onSearch()

src/school/mass-message/create-message.tsx

@@ -1,7 +1,7 @@
 import OPopup from '@/components/o-popup'
 import { sendType } from '@/constant'
 import request from '@/helpers/request'
-import { getOssUploadUrl } from '@/state'
+import { getOssUploadUrl, state } from '@/state'
 import dayjs from 'dayjs'
 import umiRequest from 'umi-request'
 import {
@@ -32,6 +32,7 @@ import OSticky from '@/components/o-sticky'
 import { useRoute, useRouter } from 'vue-router'
 import OActionSheet from '@/components/o-action-sheet'
 import { formatterDatePicker } from '@/helpers/utils'
+import OUploadAll from '@/components/o-upload-all'
 
 export default defineComponent({
   name: 'create-message',
@@ -367,14 +368,20 @@ export default defineComponent({
           <Cell title="上传附件">
             {{
               label: () => (
-                <Uploader
-                  style={{ marginTop: '12px' }}
-                  v-model={forms.attachments}
-                  afterRead={afterRead}
-                  beforeRead={beforeRead}
-                  beforeDelete={beforeDelete}
-                  accept="image/*"
+                // <Uploader
+                //   style={{ marginTop: '12px' }}
+                //   v-model={forms.attachments}
+                //   afterRead={afterRead}
+                //   beforeRead={beforeRead}
+                //   beforeDelete={beforeDelete}
+                //   accept="image/*"
+                //   maxCount={9}
+                //   disabled={formDisabled.value}
+                // />
+                <OUploadAll
+                  v-model:modelValue={forms.attachments}
                   maxCount={9}
+                  bucket={forms.bucket}
                   disabled={formDisabled.value}
                 />
               )

src/school/mass-message/index.module.less

@@ -9,7 +9,7 @@
   }
 
   .waitSend {
-    font-weight: 600;
+    font-weight: 500;
     color: var(--van-primary-color);
     font-size: 14px;
 
@@ -38,7 +38,7 @@
   }
 
   .time {
-    font-weight: 600;
+    font-weight: 500;
     .clockO {
       font-size: 15px;
       font-weight: 600;
@@ -51,7 +51,7 @@
     text-align: left;
     color: #333;
     line-height: 21px;
-    padding-bottom: 4px;
+    margin-bottom: 6px;
   }
 }
 
@@ -62,7 +62,7 @@
   --van-tab-font-size: 16px;
   :global {
     .van-tab {
-      font-weight: 400;
+      // font-weight: 400;
     }
     .van-tabs__wrap {
       // padding-bottom: 3px;

src/school/mass-message/select-sned.tsx

@@ -76,14 +76,14 @@ export default defineComponent({
         id="select-send-message"
       >
         <Tabs sticky lineWidth={20} lineHeight={4} v-model:active={state.tabValue} swipeable>
-          <Tab title="班级" name="class">
+          <Tab title="班级列表" name="class">
             <ClassList
               height={state.height}
               bottomHeight={state.bottomHeight}
               v-model:selectItem={state.selectClass}
             />
           </Tab>
-          <Tab title="学员" name="student">
+          <Tab title="学员列表" name="student">
             <StudentList
               height={state.height}
               bottomHeight={state.bottomHeight}

src/school/orchestra/modal/teacher-list.module.less

@@ -39,6 +39,7 @@
     margin-right: 10px;
     margin-top: 2px;
     margin-bottom: 2px;
+    padding: 1px 8px;
   }
 }
 

src/school/ranking-list/components/day-bang.tsx

@@ -178,7 +178,7 @@ export default defineComponent({
     }
     return () => (
       <div
-        class={!showContact.value && 'emptyRootContainer'}
+        class={[!showContact.value && 'emptyRootContainer', styles.bangContainer]}
         style={{ minHeight: `calc(100vh - ${toTop.value}px)` }}
       >
         {/* <OSticky position="top" background="#FFF"> */}
@@ -240,7 +240,7 @@ export default defineComponent({
             </List>
           </OFullRefresh>
         ) : (
-          <OEmpty />
+          <OEmpty tips="暂无排行" />
         )}
 
         <Popup

src/school/ranking-list/components/timer-bang.module.less

@@ -29,3 +29,11 @@
     vertical-align: text-top;
   }
 }
+
+.bangContainer {
+  :global {
+    .van-list__finished-text {
+      font-size: 12px;
+    }
+  }
+}

src/school/ranking-list/components/timer-bang.tsx

@@ -177,7 +177,7 @@ export default defineComponent({
     }
     return () => (
       <div
-        class={!showContact.value && 'emptyRootContainer'}
+        class={[!showContact.value && 'emptyRootContainer', styles.bangContainer]}
         style={{ minHeight: `calc(100vh - ${toTop.value}px)` }}
       >
         {/* <OSticky position="top" background="#FFF"> */}
@@ -217,47 +217,6 @@ export default defineComponent({
               <i class="arrow"></i>
             </div>
           </div>
-          {/* <div class={styles.chioseWrap}>
-            <div style={{ padding: '0 13px', background: '#FFF' }}>
-              <div
-                class={styles.searchBand}
-                onClick={() => {
-                  state.showPopoverTime = true
-                }}
-              >
-                {forms.timeName}
-                <Icon name={state.showPopoverTime ? 'arrow-up' : 'arrow-down'} />
-              </div>
-            </div>
-
-            <div
-              style={{
-                padding: '0 13px',
-                background: '#FFF'
-              }}
-            >
-              <div
-                class={styles.searchBand}
-                onClick={() => {
-                  state.showPopoverOrchestra = true
-                }}
-              >
-                <div class={['van-ellipsis', styles.bandName]}>{forms.orchestraName}</div>
-                <Icon name={state.showPopoverOrchestra ? 'arrow-up' : 'arrow-down'} />
-              </div>
-            </div>
-            <div style={{ padding: '0 13px', background: '#FFF' }}>
-              <div
-                class={styles.searchBand}
-                onClick={() => {
-                  state.showPopoverSubject = true
-                }}
-              >
-                {forms.subjectName}
-                <Icon name={state.showPopoverSubject ? 'arrow-up' : 'arrow-down'} />
-              </div>
-            </div>
-          </div> */}
         </Sticky>
         {/* </OSticky> */}
 
@@ -276,7 +235,7 @@ export default defineComponent({
             </List>
           </OFullRefresh>
         ) : (
-          <OEmpty />
+          <OEmpty tips="暂无排行" />
         )}
 
         <Popup

src/school/school-detail/eidt-school.tsx

@@ -74,16 +74,13 @@ export default defineComponent({
         return
       }
       try {
-        const { data } = await request.post('/api-school/school/update', {
+        await request.post('/api-school/school/update', {
           hideLoading: false,
           data: {
             ...forms
           }
         })
-        showToast('修改成功')
-        setTimeout(() => {
-          router.go(-1)
-        }, 500)
+        router.go(-1)
       } catch (e: any) {
         showToast(e.message)
       }
@@ -229,12 +226,19 @@ export default defineComponent({
               ref={schoolImageRef}
             />
           </div>
-          <div class={styles.wall}></div>
-          <div class={styles.bottomWrap}>
+          <OSticky position="bottom">
+            <div class="btnGroup">
+              <Button type="primary" round block onClick={submitInfo}>
+                确认修改
+              </Button>
+            </div>
+          </OSticky>
+          {/* <div class={styles.wall}></div> */}
+          {/* <div class={styles.bottomWrap}>
             <Button type="primary" size="large" onClick={submitInfo}>
               确认修改
             </Button>
-          </div>
+          </div> */}
         </div>
       </>
     )

src/school/school-detail/index.module.less

@@ -112,6 +112,7 @@
   }
 }
 .schoolEidtWrap {
+  overflow: hidden;
   .eidtWrap {
     margin: 12px 0 12px;
     :global {
@@ -122,6 +123,7 @@
         font-size: 16px;
         color: #333;
         line-height: 22px;
+        font-size: 500;
       }
     }
   }
@@ -153,7 +155,6 @@
   font-size: 16px;
   font-weight: 500;
   color: #333333;
-  line-height: 22px;
 }
 .addDet {
   width: 100%;

src/school/school-detail/modals/teacher-item.module.less

@@ -21,8 +21,8 @@
     align-items: center;
 
     .headerWrap {
-      width: 48px;
-      height: 48px;
+      width: 40px;
+      height: 40px;
       border-radius: 50%;
       margin-right: 10px;
       overflow: hidden;
@@ -66,6 +66,7 @@
     line-height: 20px;
     p {
       width: 48px;
+      padding-top: 2px;
       margin-bottom: 6px;
     }
     .statusTagWrap {

src/styles/index.less

@@ -109,7 +109,7 @@
   -moz-osx-font-smoothing: grayscale;
   color: #2c3e50;
   min-height: 100vh;
-  font-family: PingFangSC-Regular, PingFang SC;
+  // font-family: PingFangSC-Regular, PingFang SC;
 }
 
 body {
@@ -126,7 +126,7 @@ body {
   padding: 0 25px;
   padding-bottom: calc(20px + env(safe-area-inset-bottom));
   .van-button {
-    font-size: 16px !important;
+    font-size: 18px !important;
     font-weight: 500;
   }
 }

src/views/information/help-center/detail.tsx

@@ -28,12 +28,14 @@ export default defineComponent({
     })
     return () => (
       <>
-        {route.query.source == 'music' ? <NavBar leftArrow leftText="返回" border={false} onClickLeft={() => router.back()} /> : null}
+        {route.query.source == 'music' ? (
+          <NavBar leftArrow leftText="返回" border={false} onClickLeft={() => router.back()} />
+        ) : null}
         <div class={styles.detail}>
           <div class={styles.title}>{detail.value.title}</div>
           <div class={styles.who}>
             <span>管乐团</span>
-            {detail.value.createTime}
+            {detail.value.updateTime}
           </div>
 
           <div class={styles.content} v-html={detail.value.content}></div>

src/views/unit-test/practice-mode/index.tsx

@@ -561,11 +561,19 @@ export default defineComponent({
                       <p class={styles.name}>错题数</p>
                     </GridItem>
                   </Grid>
-                  <div class={styles.practiceTips}>
-                    继续努力！
-                    <br />
-                    争取在测验中获得高分！
-                  </div>
+                  {state.overResult.rate >= 100 ? (
+                    <div class={styles.practiceTips}>
+                      你真棒！
+                      <br />
+                      本知识点你已经完全掌握啦！
+                    </div>
+                  ) : (
+                    <div class={styles.practiceTips}>
+                      继续努力！
+                      <br />
+                      争取在测验中获得高分！
+                    </div>
+                  )}
                 </div>
               )
             }}

src/views/unit-test/unit-list/index.module.less

@@ -123,7 +123,8 @@
       padding-bottom: 10px;
       .van-tab {
         &:nth-child(1) {
-          padding-left: 0;
+          // padding-left: 0;
+          margin-left: -0.21333rem;
         }
       }
     }

src/views/unit-test/unit-list/models/unit-student-list.tsx

@@ -211,7 +211,7 @@ export default defineComponent({
                           </div>
                         </div>
 
-                        <p class={styles.phone}>{item.submitTime}</p>
+                        {item.submitTime ? <p class={styles.phone}>{item.submitTime}</p> : ''}
                       </div>
                     )
                     // value: () => (

src/views/unit-test/unit-list/models/unit-student.module.less

@@ -3,6 +3,7 @@
   min-width: 32px;
   line-height: 20px;
   justify-content: center;
+  font-weight: 500;
 }
 
 .radioItem {
@@ -74,6 +75,7 @@
       max-width: 200px;
     }
     .phone {
+      padding-top: 4px;
       font-size: 13px;
       color: #777777;
       line-height: 18px;

src/views/unit-test/unit-list/unitDetail.tsx

@@ -11,6 +11,7 @@ import UnitListItem from './models/unit-list-item'
 import UnitStudentList from './models/unit-student-list'
 import { state } from '@/state'
 import request from '@/helpers/request'
+import ODialog from '@/components/o-dialog'
 export default defineComponent({
   name: 'unitDetail',
   setup() {
@@ -124,31 +125,13 @@ export default defineComponent({
           </div>
         </OSticky>
 
-        <Dialog
-          class="exercisDetailDialog"
+        <ODialog
           v-model:show={showTip.value}
-          title="提示框"
+          title="学生分类"
+          message="根据学生入团的批次对不同训练阶段的学生进行分类，不同训练阶段的学生可布置不同标准的课后作业和阶段自测内容。\n\n单团学生：最新进入本乐团的学员\n双团学生：较早进入本乐团的学员\n多团学生：最早进入本乐团的学员"
+          messageAlign="left"
           confirmButtonText="我知道了"
-          v-slots={{
-            title: () => (
-              <div class={styles.DialogTitle}>
-                <span></span>
-                <p>学生分类</p>
-              </div>
-            ),
-            default: () => (
-              <div class={styles.DialogConent}>
-                <p>
-                  根据学生入团的批次对不同训练阶段的学生进行分类，不同训练阶段的学生可布置不同标准的课后作业和阶段自测内容。
-                </p>
-                <br />
-                <p>单团学生：最新进入本乐团的学员</p>
-                <p>双团学生：较早进入本乐团的学员</p>
-                <p>多团学生：最早进入本乐团的学员</p>
-              </div>
-            )
-          }}
-        ></Dialog>
+        />
       </div>
     )
   }