lex 2 سال پیش
والد
کامیت
5a5600a667
36فایلهای تغییر یافته به همراه163 افزوده شده و 55 حذف شده
  1. BIN
      src/common/images/icon-checkbox-ring.png
  2. 1 1
      src/components/o-upload-all/index.tsx
  3. 1 1
      src/components/o-video/index.module.less
  4. 11 4
      src/school/approval-manage/agency/index.tsx
  5. 5 0
      src/school/approval-manage/index.module.less
  6. 9 5
      src/school/approval-manage/subsidy/exercise-detail.tsx
  7. 14 9
      src/school/approval-manage/subsidy/index.tsx
  8. 5 1
      src/school/companion-teacher/companion-detail.module.less
  9. 6 2
      src/school/companion-teacher/index.module.less
  10. 1 0
      src/school/manage-teacher/index.module.less
  11. 1 0
      src/school/manage-teacher/manage-detail.module.less
  12. 36 7
      src/school/orchestra-story/index.module.less
  13. 9 3
      src/school/orchestra-story/index.tsx
  14. 3 2
      src/school/orchestra/compontent/information.module.less
  15. 1 1
      src/school/orchestra/compontent/information.tsx
  16. 1 1
      src/school/orchestra/compontent/photo.module.less
  17. 6 1
      src/school/orchestra/compontent/plan.module.less
  18. 2 2
      src/school/orchestra/compontent/plan.tsx
  19. 6 0
      src/school/orchestra/index.module.less
  20. 1 1
      src/school/orchestra/modal/subject-list.tsx
  21. 3 1
      src/school/orchestra/modal/teacher-list.module.less
  22. 1 1
      src/school/orchestra/orchestra-detail.module.less
  23. 1 1
      src/school/orchestra/orchestra-detail.tsx
  24. 10 4
      src/school/practice-rewards/detail.tsx
  25. 1 0
      src/school/practice-rewards/index.module.less
  26. 1 1
      src/school/practice-rewards/index.tsx
  27. 2 2
      src/school/train-planning/component/course-preview/index.module.less
  28. 6 1
      src/school/train-planning/component/course-preview/index.tsx
  29. 1 1
      src/school/train-planning/component/practice/index.module.less
  30. 4 1
      src/school/train-planning/component/standard/index.tsx
  31. 1 0
      src/school/train-planning/component/train-content/index.module.less
  32. 1 1
      src/school/train-planning/index.module.less
  33. 4 0
      src/school/train-planning/modal/timer/index.module.less
  34. 1 0
      src/school/train-planning/modal/timer/index.tsx
  35. 6 0
      src/styles/index.less
  36. 1 0
      src/views/mine-orchestra/orchestra-deeds/index.module.less

BIN
src/common/images/icon-checkbox-ring.png


+ 1 - 1
src/components/o-upload-all/index.tsx

@@ -144,7 +144,7 @@ export default defineComponent({
         }
         const signUrl = state.platformApi + '/open/getUploadSign'
         const tempName = file.name || ''
-        const fileName = tempName && tempName.replace(/ /gi, '_')
+        const fileName = this.path + (tempName && tempName.replace(/ /gi, '_'))
         const key = new Date().getTime() + fileName
         console.log(file)
 

+ 1 - 1
src/components/o-video/index.module.less

@@ -1,7 +1,7 @@
 .video-container {
   position: relative;
   width: 100%;
-  --plyr-color-main: #01c1b5;
+  --plyr-color-main: #FF8057;
 
   video {
     width: 100%;

+ 11 - 4
src/school/approval-manage/agency/index.tsx

@@ -10,6 +10,7 @@ import OFullRefresh from '@/components/o-full-refresh'
 import OEmpty from '@/components/o-empty'
 import { useRouter } from 'vue-router'
 import { approvalManageStrips } from '..'
+import { moneyFormat } from '@/helpers/utils'
 
 interface ISalaryRecord {
   /**学校补助确认记录ID */
@@ -17,7 +18,7 @@ interface ISalaryRecord {
   /**练习补助 */
   trainingSalary: number | string
   /**课程训练补助 */
-  courseSalary: number | string
+  courseSalary: number
   /**一周开始日期 */
   startDate: string
   /**一周结束日期 */
@@ -27,7 +28,7 @@ interface ISalaryRecord {
   /**结算状态 */
   withdrawalStatus: 'WAIT' | 'SETTLED' | 'PART_SETTLED' | 'SETTLE_FAIL'
   /**管理补助 */
-  manageSalary: number | string
+  manageSalary: number
   /**已发课程训练补助 */
   issueCourseSalary: number | string
   /**已发管理补助 */
@@ -142,7 +143,10 @@ export default defineComponent({
                         <GridItem>
                           <div class={styles.gridItem}>
                             <div class={styles.gridItemTop}>
-                              <span class={styles.topNum}>{item.manageSalary}</span>元
+                              <span class={styles.topNum}>
+                                {moneyFormat(item.manageSalary || 0)}
+                              </span>
+                              元
                             </div>
                             <div>管理补助</div>
                           </div>
@@ -150,7 +154,10 @@ export default defineComponent({
                         <GridItem>
                           <div class={styles.gridItem}>
                             <div class={styles.gridItemTop}>
-                              <span class={styles.topNum}>{item.courseSalary}</span>元
+                              <span class={styles.topNum}>
+                                {moneyFormat(item.courseSalary || 0)}
+                              </span>
+                              元
                             </div>
                             <div>训练补助</div>
                           </div>

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

@@ -45,6 +45,9 @@
   margin: 0 13px 12px 13px;
   overflow: hidden;
   background: #fff;
+  .teacherListCell {
+    padding-bottom: 18px;
+  }
   :global {
     .van-cell {
       padding-top: 16px;
@@ -104,6 +107,7 @@
     }
     .topNum {
       font-size: 19px;
+      font-family: 'DINA';
     }
   }
 }
@@ -184,6 +188,7 @@
   .itemContentTitleDetail {
     padding-left: 2px;
     font-size: 14px;
+    font-weight: 500;
   }
   .itemContentLabel {
     padding-left: 2px;

+ 9 - 5
src/school/approval-manage/subsidy/exercise-detail.tsx

@@ -10,6 +10,7 @@ import Details from './details'
 import OHeader from '@/components/o-header'
 import OSticky from '@/components/o-sticky'
 import { courseEmnu } from '@/constant'
+import { moneyFormat } from '@/helpers/utils'
 
 export const courseSalaryRecordDetailItem = ref<ICourseSalaryRecordDetailItem>()
 
@@ -80,7 +81,7 @@ export default defineComponent({
                       <div class={styles.gridItem}>
                         <div class={styles.gridItemTop}>
                           <span class={styles.topNum} style={{ color: '#333' }}>
-                            {data.record.expectSalary || 0}
+                            {moneyFormat(data.record.expectSalary || 0)}
                           </span>
                         </div>
@@ -88,7 +89,10 @@ export default defineComponent({
                       </div>
                       <div class={styles.gridItem}>
                         <div class={styles.gridItemTop}>
-                          <span class={styles.topNum}>{data.record.actualSalary || 0}</span>元
+                          <span class={styles.topNum}>
+                            {moneyFormat(data.record.actualSalary || 0)}
+                          </span>
+                          元
                         </div>
                         <div class={styles.valeLabel}>实际补助</div>
                       </div>
@@ -129,7 +133,7 @@ export default defineComponent({
                     <div class={styles.gridItem}>
                       <div class={styles.gridItemTop}>
                         <span class={styles.topNum} style={{ color: '#333' }}>
-                          {item.expectSalary || 0}
+                          {moneyFormat(item.expectSalary || 0)}
                         </span>
                       </div>
@@ -140,7 +144,7 @@ export default defineComponent({
                     <div class={styles.gridItem}>
                       <div class={styles.gridItemTop}>
                         <span class={styles.topNum} style={{ color: '#333' }}>
-                          {item.reduceSalary || 0}
+                          {moneyFormat(item.reduceSalary || 0)}
                         </span>
                       </div>
@@ -150,7 +154,7 @@ export default defineComponent({
                   <GridItem>
                     <div class={styles.gridItem}>
                       <div class={styles.gridItemTop}>
-                        <span class={styles.topNum}>{item.actualSalary || 0}</span>课元
+                        <span class={styles.topNum}>{moneyFormat(item.actualSalary || 0)}</span>课元
                       </div>
                       <div>实际补助</div>
                     </div>

+ 14 - 9
src/school/approval-manage/subsidy/index.tsx

@@ -10,6 +10,7 @@ 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'
+import { moneyFormat } from '@/helpers/utils'
 
 export default defineComponent({
   name: 'approval-manage-subsidy',
@@ -22,7 +23,7 @@ export default defineComponent({
     const data = reactive({
       startDate: '',
       endDate: '',
-      manageSalary: '',
+      manageSalary: '' as any,
       courseSalary: '',
       trainingSalary: '',
       /**管理补助 */
@@ -125,7 +126,7 @@ export default defineComponent({
                   <GridItem>
                     <div class={styles.gridItem}>
                       <div class={styles.gridItemTop}>
-                        <span class={styles.topNum}>{data.manageSalary || 0}</span>元
+                        <span class={styles.topNum}>{moneyFormat(data.manageSalary || 0)}</span>元
                       </div>
                       <div>管理补助</div>
                     </div>
@@ -133,7 +134,7 @@ export default defineComponent({
                   <GridItem>
                     <div class={styles.gridItem}>
                       <div class={styles.gridItemTop}>
-                        <span class={styles.topNum}>{data.courseSalary || 0}</span>元
+                        <span class={styles.topNum}>{moneyFormat(data.courseSalary || 0)}</span>元
                       </div>
                       <div>训练补助</div>
                     </div>
@@ -181,7 +182,7 @@ export default defineComponent({
                     <div class={styles.gridItem}>
                       <div class={styles.gridItemTop}>
                         <span class={styles.topNum} style={{ color: '#333' }}>
-                          {data.manageSalaryInfo.standardSalary || 0}
+                          {moneyFormat(data.manageSalaryInfo.standardSalary || 0)}
                         </span>
                         元/周
                       </div>
@@ -202,7 +203,9 @@ export default defineComponent({
                   <GridItem>
                     <div class={styles.gridItem}>
                       <div class={styles.gridItemTop}>
-                        <span class={styles.topNum}>{data.manageSalaryInfo.actualSalary || 0}</span>
+                        <span class={styles.topNum}>
+                          {moneyFormat(data.manageSalaryInfo.actualSalary || 0)}
+                        </span>
                       </div>
                       <div>实际补助</div>
@@ -276,7 +279,7 @@ export default defineComponent({
                   <div class={styles.gridItem}>
                     <div class={styles.gridItemTop}>
                       <span class={styles.topNum} style={{ color: '#333' }}>
-                        {data.courseSalaryInfo.singleSubsidyStandard || 0}
+                        {moneyFormat(data.courseSalaryInfo.singleSubsidyStandard || 0)}
                       </span>
                       元/人
                     </div>
@@ -287,7 +290,7 @@ export default defineComponent({
                   <div class={styles.gridItem}>
                     <div class={styles.gridItemTop}>
                       <span class={styles.topNum} style={{ color: '#333' }}>
-                        {data.courseSalaryInfo.musicSubsidyStandard || 0}
+                        {moneyFormat(data.courseSalaryInfo.musicSubsidyStandard || 0)}
                       </span>
                       元/天
                     </div>
@@ -298,7 +301,7 @@ export default defineComponent({
                   <div class={styles.gridItem}>
                     <div class={styles.gridItemTop}>
                       <span class={styles.topNum} style={{ color: '#333' }}>
-                        {data.courseSalaryInfo.ensembleSubsidyStandard || 0}
+                        {moneyFormat(data.courseSalaryInfo.ensembleSubsidyStandard || 0)}
                       </span>
                     </div>
@@ -312,6 +315,7 @@ export default defineComponent({
                     <Cell
                       center
                       title={teacher.userName}
+                      class={styles.teacherListCell}
                       isLink
                       to={`/subsidy-exercise-detail?id=${recordId.value}&userId=${teacher.userId}`}
                     >
@@ -322,7 +326,8 @@ export default defineComponent({
                         value: () => (
                           <div class={styles.gridItem}>
                             <div class={styles.gridItemTop}>
-                              <span class={styles.topNum}>{teacher.salary || 0}</span>元
+                              <span class={styles.topNum}>{moneyFormat(teacher.salary || 0)}</span>
+                              元
                             </div>
                             <div class={styles.valeLabel}>实际补助</div>
                           </div>

+ 5 - 1
src/school/companion-teacher/companion-detail.module.less

@@ -168,7 +168,11 @@
 
 .companionCell {
   padding: 15px;
-
+  :global {
+    .van-cell__title {
+      flex-basis: 45%;
+    }
+  }
   .className {
     font-size: 16px;
     font-weight: 600;

+ 6 - 2
src/school/companion-teacher/index.module.less

@@ -9,12 +9,14 @@
   display: flex;
   & > span {
     flex-shrink: 0;
+    font-weight: 500;
   }
   .tagSubject {
     margin-right: 10px;
     margin-top: 2px;
-    margin-bottom: 2px;
+    margin-bottom: 8px;
     padding: 1px 8px;
+    font-weight: 500;
   }
 }
 
@@ -23,7 +25,7 @@
   :global {
     .van-cell__title {
       flex: 1 auto;
-      flex-basis: 20%;
+      flex-basis: 14%;
     }
   }
 
@@ -52,9 +54,11 @@
       font-size: 20px;
       font-weight: bold;
       color: #f67146;
+      font-family: 'DINA';
       line-height: 24px;
     }
     .numText {
+      padding-top: 3px;
       font-size: 12px;
       color: #333333;
       line-height: 17px;

+ 1 - 0
src/school/manage-teacher/index.module.less

@@ -24,6 +24,7 @@
     max-width: 200px;
   }
   .phone {
+    padding-top: 2px;
     font-size: 14px;
     color: #777777;
     line-height: 20px;

+ 1 - 0
src/school/manage-teacher/manage-detail.module.less

@@ -36,6 +36,7 @@
     max-width: 220px;
   }
   .phone {
+    padding-top: 2px;
     font-size: 14px;
     color: #777777;
     line-height: 20px;

+ 36 - 7
src/school/orchestra-story/index.module.less

@@ -2,13 +2,37 @@
   margin: 12px 13px 0;
   overflow: hidden;
   border-radius: 10px;
-  :global {
-    .van-cell {
-      font-size: 16px;
-      color: #333333;
-      padding: 16px 12px;
-    }
+  .select {
+    height: 45px;
+    
+      .icon {
+        width: 17px;
+        height: 17px;
+        margin-right: 4px;
+        flex-shrink: 0;
+      }
+    
+      :global {
+        .van-cell__title {
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+        }
+    
+        .van-cell__right-icon {
+          color: #333;
+          transform: rotate(90deg);
+          margin: 0 0 0 4px;
+        }
+      }
   }
+  // :global {
+  //   .van-cell {
+  //     font-size: 16px;
+  //     color: #333333;
+  //     padding: 16px 12px;
+  //   }
+  // }
 }
 
 .storySteps {
@@ -23,6 +47,10 @@
         border-width: 0 !important;
       }
     }
+    .van-step__line {
+      background-color: #e7e7e7;
+      width: 1px;
+    }
   }
 
   .stepTimes {
@@ -35,6 +63,7 @@
 
     .stepTime {
       font-family: 'DINA';
+      padding-bottom: 6px;
     }
 
     .stepEdit {
@@ -56,7 +85,7 @@
     padding-top: 8px;
     font-size: 14px;
     color: #666666;
-    line-height: 20px;
+    line-height: 22px;
   }
 
   .storySwipe {

+ 9 - 3
src/school/orchestra-story/index.tsx

@@ -25,6 +25,7 @@ import OEmpty from '@/components/o-empty'
 import dayjs from 'dayjs'
 import OVideo from '@/components/o-video'
 import baseEvent from '@/base-event'
+import iconOrchestra from '@/views/mine-orchestra/images/icon-or.png'
 
 export default defineComponent({
   name: 'orchestra-story',
@@ -155,7 +156,7 @@ export default defineComponent({
           {{
             right: () => (
               <span
-                style={{ color: 'var(--van-primary)' }}
+                style={{ color: 'var(--van-primary)', fontWeight: '500' }}
                 onClick={() => {
                   router.push('/story-operation')
                 }}
@@ -170,11 +171,16 @@ export default defineComponent({
           <div style={{ width: '100%' }}>
             <CellGroup inset class={styles.cellGroup}>
               <Cell
-                title={state.selectOrchestra.text || ' '}
                 isLink
                 center
                 onClick={() => (state.orchestraStatus = true)}
-              ></Cell>
+                class={styles.select}
+              >
+                {{
+                  icon: () => <img class={styles.icon} src={iconOrchestra} />,
+                  title: () => <div class="van-ellipsis">{state.selectOrchestra.text || ' '}</div>
+                }}
+              </Cell>
             </CellGroup>
           </div>
         )}

+ 3 - 2
src/school/orchestra/compontent/information.module.less

@@ -5,7 +5,7 @@
   overflow: hidden;
 
   .title {
-    font-size: 26px;
+    font-size: 24px;
     font-weight: bold;
     color: #333;
     i {
@@ -29,7 +29,8 @@
 
 .gridClass {
   .title {
-    font-size: 24px;
+    font-size: 22px;
+    font-family: 'DINA';
   }
   .teacher {
     font-size: 18px;

+ 1 - 1
src/school/orchestra/compontent/information.tsx

@@ -271,7 +271,7 @@ export default defineComponent({
 
     return () => (
       <>
-        <div class={'searchGroup'}>
+        <div class={['searchGroup', 'van-hairline--top']}>
           <div
             class={['searchItem', state.timeShow ? 'searchItem-active' : '']}
             onClick={() => (state.timeShow = true)}

+ 1 - 1
src/school/orchestra/compontent/photo.module.less

@@ -71,7 +71,7 @@
       background: #eaeaea;
       width: 170px;
       height: 170px;
-      border-radius: 10px;
+      border-radius: 4px;
       overflow: hidden;
       background-color: #eaeaea;
       background-repeat: no-repeat;

+ 6 - 1
src/school/orchestra/compontent/plan.module.less

@@ -48,6 +48,10 @@
     }
   }
 
+  .gridCell {
+    padding-top: 15px;
+    padding-bottom: 16px;
+  }
   .img {
     width: 45px;
     height: 45px;
@@ -59,6 +63,7 @@
     font-weight: bold;
     color: #f67146;
     line-height: 24px;
+    font-family: 'DINA';
   }
   .courseware {
     font-size: 16px;
@@ -67,7 +72,7 @@
     line-height: 24px;
   }
   .teacherDesc {
-    padding-top: 2px;
+    padding-top: 6px;
     font-size: 12px;
     color: #777777;
     line-height: 17px;

+ 2 - 2
src/school/orchestra/compontent/plan.tsx

@@ -208,7 +208,7 @@ export default defineComponent({
     })
     return () => (
       <div>
-        <div class={['searchGroup']}>
+        <div class={['searchGroup', 'van-hairline--top']}>
           <div
             class={['searchItem', state.timeShow ? 'searchItem-active' : '']}
             onClick={() => (state.timeShow = true)}
@@ -239,7 +239,7 @@ export default defineComponent({
                     <i class={styles.line}></i>
                     {item.name}
                   </div>
-                  <Cell center>
+                  <Cell center class={styles.gridCell}>
                     {{
                       icon: () => (
                         <Image

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

@@ -8,6 +8,12 @@
     display: flex;
     align-items: center;
     font-size: 16px;
+    font-weight: 600;
+  }
+
+  p {
+    font-size: 14px;
+    color: #777;
   }
 }
 

+ 1 - 1
src/school/orchestra/modal/subject-list.tsx

@@ -3,7 +3,7 @@ import { Button, Checkbox, CheckboxGroup, Icon, Image } from 'vant'
 import { defineComponent, onMounted, reactive, ref, watch } from 'vue'
 import styles from './subject-list.module.less'
 import checkboxCheck from '@/common/images/icon-checkbox-check.png'
-import checkboxDefault from '@/common/images/icon-checkbox-default.png'
+import checkboxDefault from '@/common/images/icon-checkbox-ring.png'
 import OSticky from '@/components/o-sticky'
 
 export default defineComponent({

+ 3 - 1
src/school/orchestra/modal/teacher-list.module.less

@@ -34,12 +34,14 @@
   display: flex;
   & > span {
     flex-shrink: 0;
+    font-weight: 500;
   }
   .tagSubject {
     margin-right: 10px;
     margin-top: 2px;
-    margin-bottom: 2px;
+    margin-bottom: 8px;
     padding: 1px 8px;
+    font-weight: 500;
   }
 }
 

+ 1 - 1
src/school/orchestra/orchestra-detail.module.less

@@ -4,7 +4,7 @@
   --van-tab-font-size: 16px;
   :global {
     .van-tab {
-      font-weight: 400;
+      // font-weight: 400;
     }
     .van-tabs__wrap {
       // padding-bottom: 3px;

+ 1 - 1
src/school/orchestra/orchestra-detail.tsx

@@ -50,7 +50,7 @@ export default defineComponent({
             document.documentElement.style.setProperty('--header-height', height + 'px')
           }}
         >
-          <OHeader />
+          <OHeader border={false} />
         </OSticky>
         <Tabs
           sticky

+ 10 - 4
src/school/practice-rewards/detail.tsx

@@ -7,6 +7,7 @@ import request from '@/helpers/request'
 import OFullRefresh from '@/components/o-full-refresh'
 import OEmpty from '@/components/o-empty'
 import { useRoute } from 'vue-router'
+import { moneyFormat } from '@/helpers/utils'
 
 export default defineComponent({
   name: 'practice-detail',
@@ -154,7 +155,7 @@ export default defineComponent({
               <div class={styles.gridItem}>
                 <div class={styles.gridItemTop}>
                   <span class={styles.topNum} style={{ color: '#333' }}>
-                    {state.statistics.standardSalary}
+                    {moneyFormat(state.statistics.standardSalary || 0)}
                   </span>
                   元/人
                 </div>
@@ -175,7 +176,10 @@ export default defineComponent({
             <GridItem>
               <div class={styles.gridItem}>
                 <div class={styles.gridItemTop}>
-                  <span class={styles.topNum}>{state.statistics.actualSalary}</span>元
+                  <span class={styles.topNum}>
+                    {moneyFormat(state.statistics.actualSalary || 0)}
+                  </span>
+                  元
                 </div>
                 <div>奖励金额</div>
               </div>
@@ -185,7 +189,7 @@ export default defineComponent({
 
         <div class={'searchGroup-single'} style="padding-top: 0 !important;">
           <div
-            class={['searchItem', state.subjectStatus && styles['searchItem-active']]}
+            class={['searchItem', state.subjectStatus && 'searchItem-active']}
             onClick={() => {
               state.subjectStatus = !state.subjectStatus
             }}
@@ -219,7 +223,9 @@ export default defineComponent({
                         <div class={styles.userName}>{item.nickname}</div>
                         <div class={styles.subjectNames}>
                           {item.subjectNameList.map((item: any) => (
-                            <Tag type="primary">{item}</Tag>
+                            <Tag textColor="#F67146" color="#FFE7DA">
+                              {item}
+                            </Tag>
                           ))}
                         </div>
                       </div>

+ 1 - 0
src/school/practice-rewards/index.module.less

@@ -122,6 +122,7 @@
     font-size: 24px;
     margin-right: 2px;
     font-weight: bold;
+    font-family: 'DINA';
   }
   & + .gridItem {
     margin-left: 26px;

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

@@ -167,7 +167,7 @@ export default defineComponent({
                   <div class={styles.gridItem}>
                     <div class={styles.gridItemTop}>
                       <span class={styles.topNum} style={{ color: '#333' }}>
-                        {item.totalSalary}
+                        {moneyFormat(item.totalSalary || 0)}
                       </span>
                     </div>

+ 2 - 2
src/school/train-planning/component/course-preview/index.module.less

@@ -123,7 +123,7 @@
     font-weight: bold;
     color: #333333;
     line-height: 35px;
-    // font-family: 'DINA';
+    font-family: 'DINA';
     &.conflictType {
       color: #f44541;
     }
@@ -133,7 +133,7 @@
     font-size: 12px;
     padding: 2px 4px;
     border-radius: 3px;
-    margin-left: 8px;
+    margin-right: 8px;
     margin-bottom: 15px;
   }
 

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

@@ -305,7 +305,11 @@ export default defineComponent({
                 title: () => (
                   <div class={styles.teacherInfo}>
                     <p class={[styles.teacherName, 'van-ellipsis']}>{item.teacherName}</p>
-                    <Tag color="#FFE3DA" textColor="#F67146">
+                    <Tag
+                      color="#FFE3DA"
+                      textColor="#F67146"
+                      style={{ fontWeight: '500', padding: '1px 6px' }}
+                    >
                       {item.className}
                     </Tag>
                   </div>
@@ -341,6 +345,7 @@ export default defineComponent({
                         学生冲突
                       </Tag>
                     )}
+
                     {item.conflictType && item.conflictType.includes('DIFF_SCHOOL_TEACHER') && (
                       <Tag
                         class={styles.conflict}

+ 1 - 1
src/school/train-planning/component/practice/index.module.less

@@ -1,6 +1,6 @@
 .tips {
   display: flex;
-  align-items: center;
+  
   margin: 12px 13px;
   background: #ffebdd;
   border-radius: 10px;

+ 4 - 1
src/school/train-planning/component/standard/index.tsx

@@ -250,14 +250,17 @@ export default defineComponent({
             title="训练时长"
             value={forms.trainTimer + '分钟'}
             v-slots={{
-              'right-icon': () => <span></span>
+              'right-icon': () => <Icon class="van-cell__right-icon" name="arrow" color="#fff" />
             }}
           ></Cell>
           <Field
             label="训练周次"
+            isLink
+            clickable={false}
             placeholder="请选择训练周次"
             modelValue={weekFormat(forms.week)}
             inputAlign="right"
+            class="form-control-icon"
             readonly
           />
           <Cell

+ 1 - 0
src/school/train-planning/component/train-content/index.module.less

@@ -39,6 +39,7 @@
       padding: 0 5px;
       font-size: 20px;
       color: #f67146;
+      font-family: 'DINA';
     }
   }
 }

+ 1 - 1
src/school/train-planning/index.module.less

@@ -4,7 +4,7 @@
   --van-tab-font-size: 16px;
   :global {
     .van-tab {
-      font-weight: 400;
+      // font-weight: 400;
     }
     .van-tabs__wrap {
       // padding-bottom: 3px;

+ 4 - 0
src/school/train-planning/modal/timer/index.module.less

@@ -10,6 +10,10 @@
   margin: 0 13px 12px;
   border-radius: 8px;
   overflow: hidden;
+  .cellTitle {
+    font-size: 16px;
+    font-weight: 400;
+  }
 
   .cellIcon {
     font-size: 18px;

+ 1 - 0
src/school/train-planning/modal/timer/index.tsx

@@ -240,6 +240,7 @@ export default defineComponent({
           <Cell
             center
             title={'训练开始时间'}
+            titleClass={styles.cellTitle}
             value={state.selectTime ? dayjs(state.selectTime).format('HH:mm') : ''}
             isLink
             onClick={() => (state.selectTimeStatus = true)}

+ 6 - 0
src/styles/index.less

@@ -155,6 +155,12 @@ body {
 //     padding-top: 15px;
 //   }
 // }
+.form-control-icon {
+  .van-cell__right-icon {
+    color: #fff !important;
+  }
+}
+
 
 .sticky {
   position: relative;

+ 1 - 0
src/views/mine-orchestra/orchestra-deeds/index.module.less

@@ -34,6 +34,7 @@
 
     .stepTime {
       font-family: 'DINA';
+      padding-bottom: 6px;
     }
 
     .stepEdit {