修改走查样式

public/project/initiation.html

@@ -197,12 +197,12 @@
           :rules="[{ required: true, message: '请选择性别' }]">
           <template #input>
             <van-radio-group v-model="stu.sex" :disabled='checkPhone' checked-color="#FF8057" direction="horizontal">
-              <van-tag size="large" type="primary" :plain="!(stu.sex === 1)" :color="checkPhone ? '#ccc': '#FF8057'"
-                class="radioSection" round>
+              <van-tag size="large" type="primary" :color="!(stu.sex === 1) || checkPhone ? '#EAEAEA' : '#FF8057'"
+                :text-color="!(stu.sex === 1) || checkPhone ? '#AAA' : '#FFF'" class="radioSection" round>
                 <van-radio class="radioItem" :name="1"></van-radio>男生
               </van-tag>
-              <van-tag size="large" type="primary" :plain="!(stu.sex === 0)" :color="checkPhone ? '#ccc': '#FF8057'"
-                class="radioSection" round>
+              <van-tag size="large" type="primary" :color="!(stu.sex === 0) || checkPhone ? '#EAEAEA' : '#FF8057'"
+                :text-color="!(stu.sex === 0) || checkPhone ? '#AAA' : '#FFF'" class="radioSection" round>
                 <van-radio class="radioItem" :name="0"></van-radio>女生
               </van-tag>
             </van-radio-group>
@@ -229,13 +229,16 @@
           <template #input>
             <van-radio-group v-model="stu.hasLearningExperience" :disabled='checkPhone' checked-color="#FF8057"
               direction="horizontal">
-              <van-tag size="large" type="primary" :plain="!(stu.hasLearningExperience === 1)"
-                :color="checkPhone ? '#ccc': '#FF8057'" class="radioSection" round>
+              <van-tag size="large" type="primary"
+                :color="!(stu.hasLearningExperience === 1) || checkPhone ? '#EAEAEA' : '#FF8057'"
+                :text-color="!(stu.hasLearningExperience === 1) || checkPhone ? '#AAA' : '#FFF'" class="radioSection"
+                round>
                 <van-radio class="radioItem" :name="1"></van-radio>是
               </van-tag>
-              <van-tag size="large" type="primary" :plain="!(stu.hasLearningExperience === 0)"
-                :color="checkPhone ? '#ccc': '#FF8057'" class="radioSection" @click="() => stu.learningSubjectName = ''"
-                round>
+              <van-tag size="large" type="primary"
+                :color="!(stu.hasLearningExperience === 0) || checkPhone ? '#EAEAEA' : '#FF8057'"
+                :text-color="!(stu.hasLearningExperience === 0) || checkPhone ? '#AAA' : '#FFF'" class="radioSection"
+                @click="() => stu.learningSubjectName = ''" round>
                 <van-radio class="radioItem" :name="0"></van-radio>否
               </van-tag>
             </van-radio-group>
@@ -248,12 +251,14 @@
           <template #input>
             <van-radio-group v-model="stu.joinParentMeeting" :disabled='checkPhone' checked-color="#FF8057"
               direction="horizontal">
-              <van-tag size="large" type="primary" :plain="!(stu.joinParentMeeting === 1)"
-                :color="checkPhone ? '#ccc': '#FF8057'" class="radioSection" round>
+              <van-tag size="large" type="primary"
+                :color="!(stu.joinParentMeeting === 1) || checkPhone ? '#EAEAEA' : '#FF8057'"
+                :text-color="!(stu.joinParentMeeting === 1) || checkPhone ? '#AAA' : '#FFF'" class="radioSection" round>
                 <van-radio class="radioItem" :name="1"></van-radio>是
               </van-tag>
-              <van-tag size="large" type="primary" :plain="!(stu.joinParentMeeting === 0)"
-                :color="checkPhone ? '#ccc': '#FF8057'" class="radioSection" round>
+              <van-tag size="large" type="primary"
+                :color="!(stu.joinParentMeeting === 0) || checkPhone ? '#EAEAEA' : '#FF8057'"
+                :text-color="!(stu.joinParentMeeting === 0) || checkPhone ? '#AAA' : '#FFF'" class="radioSection" round>
                 <van-radio class="radioItem" :name="0"></van-radio>否
               </van-tag>
             </van-radio-group>

public/project/preRegister.html

@@ -197,12 +197,12 @@
           :rules="[{ required: true, message: '请选择性别' }]">
           <template #input>
             <van-radio-group v-model="stu.sex" :disabled='checkPhone' checked-color="#9A64FF" direction="horizontal">
-              <van-tag size="large" type="primary" :plain="!(stu.sex === 1)" :color="checkPhone ? '#ccc': '#9A64FF'"
-                class="radioSection" round>
+              <van-tag size="large" type="primary" :color="!(stu.sex === 1) || checkPhone ? '#EAEAEA' : '#64A9FF'"
+                :text-color="!(stu.sex === 1) || checkPhone ? '#AAA' : '#FFF'" class="radioSection" round>
                 <van-radio class="radioItem" :name="1"></van-radio>男生
               </van-tag>
-              <van-tag size="large" type="primary" :plain="!(stu.sex === 0)" :color="checkPhone ? '#ccc': '#9A64FF'"
-                class="radioSection" round>
+              <van-tag size="large" type="primary" :color="!(stu.sex === 0)  || checkPhone? '#EAEAEA' : '#64A9FF'"
+                :text-color="!(stu.sex === 0)  || checkPhone? '#AAA' : '#FFF'" class="radioSection" round>
                 <van-radio class="radioItem" :name="0"></van-radio>女生
               </van-tag>
             </van-radio-group>
@@ -238,12 +238,16 @@
           <template #input>
             <van-radio-group v-model="stu.instrumentsPrepareMode" :disabled='checkPhone' checked-color="#9A64FF"
               direction="horizontal">
-              <van-tag size="large" type="primary" :plain="!(stu.instrumentsPrepareMode === 'GROUP_PURCHASE')"
-                :color="checkPhone ? '#ccc': '#9A64FF'" class="radioSection" round>
+              <van-tag size="large" type="primary"
+                :color="!(stu.instrumentsPrepareMode === 'GROUP_PURCHASE')  || checkPhone ? '#EAEAEA' : '#64A9FF'"
+                :text-color="!(stu.instrumentsPrepareMode === 'GROUP_PURCHASE') || checkPhone ? '#AAA' : '#FFF'"
+                class="radioSection" round>
                 <van-radio class="radioItem" name="GROUP_PURCHASE"></van-radio>团购
               </van-tag>
-              <van-tag size="large" type="primary" :plain="!(stu.instrumentsPrepareMode === 'ONESELF')"
-                :color="checkPhone ? '#ccc': '#9A64FF'" class="radioSection" round>
+              <van-tag size="large" type="primary"
+                :color="!(stu.instrumentsPrepareMode === 'ONESELF') || checkPhone ? '#EAEAEA' : '#64A9FF'"
+                :text-color="!(stu.instrumentsPrepareMode === 'ONESELF') || checkPhone ? '#AAA' : '#FFF'"
+                class="radioSection" round>
                 <van-radio class="radioItem" name="ONESELF"></van-radio>自备
               </van-tag>
             </van-radio-group>
@@ -255,11 +259,16 @@
           <template #input>
             <van-radio-group v-model="stu.learningSystemPrepareMode" :disabled='checkPhone' checked-color="#9A64FF"
               direction="horizontal">
-              <van-tag size="large" type="primary" :plain="!(stu.learningSystemPrepareMode === 'GROUP_PURCHASE')"
-                :color="checkPhone ? '#ccc': '#9A64FF'" class="radioSection" round>
+              <!-- :color="checkPhone ? '#ccc': '#9A64FF'" -->
+              <van-tag size="large" type="primary"
+                :color="!(stu.learningSystemPrepareMode === 'GROUP_PURCHASE') || checkPhone ? '#EAEAEA' : '#64A9FF'"
+                :text-color="!(stu.learningSystemPrepareMode === 'GROUP_PURCHASE') || checkPhone ? '#AAA' : '#FFF'"
+                class="radioSection" round>
                 <van-radio class="radioItem" name="GROUP_PURCHASE"></van-radio>团购
               </van-tag>
-              <van-tag size="large" type="primary" :plain="!(stu.learningSystemPrepareMode === 'ONESELF')"
+              <van-tag size="large" type="primary"
+                :color="!(stu.learningSystemPrepareMode === 'ONESELF') || checkPhone ? '#EAEAEA' : '#64A9FF'"
+                :text-color="!(stu.learningSystemPrepareMode === 'ONESELF') || checkPhone ? '#AAA' : '#FFF'"
                 :color="checkPhone ? '#ccc': '#9A64FF'" class="radioSection" round>
                 <van-radio class="radioItem" name="ONESELF"></van-radio>自备
               </van-tag>

public/project/schoolRegister.html

@@ -59,12 +59,12 @@
         <van-field required label="办学性质" name="schoolNature" :rules="[{ required: true, message: '请选择办学性质' }]">
           <template #input>
             <van-radio-group checked-color="#64A9FF" v-model="forms.schoolNature" direction="horizontal">
-              <van-tag size="large" type="primary" :plain="!(forms.schoolNature === 'PUBLIC')" color="#64A9FF"
-                class="radioSection" round>
+              <van-tag size="large" type="primary" :color="!(forms.schoolNature === 'PUBLIC') ? '#EAEAEA' : '#64A9FF'"
+                :text-color="!(forms.schoolNature === 'PUBLIC') ? '#AAA' : '#FFF'" class="radioSection" round>
                 <van-radio class="radioItem" name="PUBLIC"></van-radio>公办
               </van-tag>
-              <van-tag size="large" type="primary" :plain="!(forms.schoolNature === 'PRIVATE')" color="#64A9FF"
-                class="radioSection" round>
+              <van-tag size="large" type="primary" :color="!(forms.schoolNature === 'PRIVATE') ? '#EAEAEA' : '#64A9FF'"
+                :text-color="!(forms.schoolNature === 'PRIVATE') ? '#AAA' : '#FFF'" class="radioSection" round>
                 <van-radio class="radioItem" name="PRIVATE"></van-radio>民办
               </van-tag>
             </van-radio-group>
@@ -74,12 +74,14 @@
         <van-field required label="学年制" name="schoolSystem" :rules="[{ required: true, message: '请选择学年制' }]">
           <template #input>
             <van-radio-group checked-color="#64A9FF" v-model="forms.schoolSystem" direction="horizontal">
-              <van-tag size="large" type="primary" :plain="!(forms.schoolSystem === 'fiveYearSystem')" color="#64A9FF"
-                class="radioSection" round>
+              <van-tag size="large" type="primary"
+                :color="!(forms.schoolSystem === 'fiveYearSystem') ? '#EAEAEA' : '#64A9FF'"
+                :text-color="!(forms.schoolSystem === 'fiveYearSystem') ? '#AAA' : '#FFF'" class="radioSection" round>
                 <van-radio class="radioItem" name="fiveYearSystem"></van-radio>五年制
               </van-tag>
-              <van-tag size="large" type="primary" :plain="!(forms.schoolSystem === 'sixYearSystem')" color="#64A9FF"
-                class="radioSection" round>
+              <van-tag size="large" type="primary"
+                :color="!(forms.schoolSystem === 'sixYearSystem') ? '#EAEAEA' : '#64A9FF'"
+                :text-color="!(forms.schoolSystem === 'sixYearSystem') ? '#AAA' : '#FFF'" class="radioSection" round>
                 <van-radio class="radioItem" name="sixYearSystem"></van-radio>六年制
               </van-tag>
             </van-radio-group>

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

@@ -7,6 +7,7 @@
     }
     .van-cell__value {
       color: #333;
+      font-weight: 400;
     }
 
     .van-radio-group,

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

@@ -1,5 +1,6 @@
 import OHeader from '@/components/o-header'
 import OPopup from '@/components/o-popup'
+import OSticky from '@/components/o-sticky'
 import { postMessage } from '@/helpers/native-message'
 import request from '@/helpers/request'
 import { browser } from '@/helpers/utils'
@@ -138,8 +139,8 @@ export default defineComponent({
                   <Tag
                     size="large"
                     type="primary"
-                    plain={!(forms.changeType === 1)}
-                    color="#FF8057"
+                    color={!(forms.changeType === 1) ? '#EAEAEA' : '#FF8057'}
+                    textColor={!(forms.changeType === 1) ? '#AAA' : '#FFF'}
                     class={styles.radioSection}
                     round
                   >
@@ -148,8 +149,8 @@ export default defineComponent({
                   <Tag
                     size="large"
                     type="primary"
-                    plain={!(forms.changeType === 0)}
-                    color="#FF8057"
+                    color={!(forms.changeType === 0) ? '#EAEAEA' : '#FF8057'}
+                    textColor={!(forms.changeType === 0) ? '#AAA' : '#FFF'}
                     class={styles.radioSection}
                     round
                   >
@@ -170,7 +171,7 @@ export default defineComponent({
           />
         </CellGroup>
 
-        <OPopup position="bottom">
+        <OSticky position="bottom">
           <div class={['btnGroup btnMore']} style={{ marginTop: '20px' }}>
             <Button
               color="#ccc"
@@ -189,7 +190,7 @@ export default defineComponent({
               下一步
             </Button>
           </div>
-        </OPopup>
+        </OSticky>
 
         {/* 乐团列表 */}
         <Popup v-model:show={forms.orchestraStatus} position="bottom" round>

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

@@ -65,6 +65,7 @@
       font-weight: bold;
       color: #f67146;
       line-height: 24px;
+      font-family: 'DINA';
     }
     .numText {
       font-size: 12px;
@@ -173,6 +174,7 @@
     font-weight: bold;
     color: #f67146;
     line-height: 24px;
+    font-family: 'DINA';
   }
 
   .numTip {

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

@@ -113,7 +113,9 @@ export default defineComponent({
         <CellGroup inset class={styles.detailCellGroup}>
           <Cell center class={styles.detailCell}>
             {{
-              icon: () => <Image class={styles.img} src={state.detail.avatar || iconTeacher} />,
+              icon: () => (
+                <Image class={styles.img} src={state.detail.avatar || iconTeacher} fit="cover" />
+              ),
               title: () => (
                 <div class={styles.teacherContent}>
                   <div class={styles.content}>

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

@@ -331,8 +331,8 @@ export default defineComponent({
                     <Tag
                       size="large"
                       type="primary"
-                      plain={!(state.forms.gender === 1)}
-                      color="#FF8057"
+                      color={!(state.forms.gender === 1) ? '#EAEAEA' : '#FF8057'}
+                      textColor={!(state.forms.gender === 1) ? '#AAA' : '#FFF'}
                       class={styles.radioSection}
                       round
                     >
@@ -341,8 +341,8 @@ export default defineComponent({
                     <Tag
                       size="large"
                       type="primary"
-                      plain={!(state.forms.gender === 0)}
-                      color="#FF8057"
+                      color={!(state.forms.gender === 0) ? '#EAEAEA' : '#FF8057'}
+                      textColor={!(state.forms.gender === 0) ? '#AAA' : '#FFF'}
                       class={styles.radioSection}
                       round
                     >

src/school/companion-teacher/index.tsx

@@ -337,7 +337,11 @@ export default defineComponent({
                   <Cell center isLink class={styles.manageCell}>
                     {{
                       icon: () => (
-                        <Image class={styles.img} src={item.avatar ? item.avatar : iconTeacher} />
+                        <Image
+                          class={styles.img}
+                          src={item.avatar ? item.avatar : iconTeacher}
+                          fit="cover"
+                        />
                       ),
                       title: () => (
                         <div class={styles.teacherContent}>

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

@@ -261,8 +261,8 @@ export default defineComponent({
                     <Tag
                       size="large"
                       type="primary"
-                      plain={!(state.forms.gender === 1)}
-                      color="#64A9FF"
+                      color={!(state.forms.gender === 1) ? '#EAEAEA' : '#64A9FF'}
+                      textColor={!(state.forms.gender === 1) ? '#AAA' : '#FFF'}
                       class={styles.radioSection}
                       round
                     >
@@ -271,8 +271,8 @@ export default defineComponent({
                     <Tag
                       size="large"
                       type="primary"
-                      plain={!(state.forms.gender === 0)}
-                      color="#64A9FF"
+                      color={!(state.forms.gender === 0) ? '#EAEAEA' : '#64A9FF'}
+                      textColor={!(state.forms.gender === 0) ? '#AAA' : '#FFF'}
                       class={styles.radioSection}
                       round
                     >

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

@@ -3,6 +3,11 @@
   font-size: 14px;
   font-weight: 600;
   color: #333333;
+  .bandName {
+    display: inline-block;
+    max-width: 180px;
+    vertical-align: text-top;
+  }
 }
 
 .gridContainer {

src/school/mass-message/component/class-list/index.tsx

@@ -160,9 +160,17 @@ export default defineComponent({
     return () => (
       <div class={styles.practiceClass}>
         <Sticky position="top" offsetTop={props.height}>
-          <div style={{ padding: '12px 13px', background: '#f6f6f6' }}>
+          <div
+            style={{
+              padding: '12px 13px',
+              background: '#f6f6f6',
+              display: 'flex',
+              alignItems: 'center'
+            }}
+          >
             <div class={styles.searchBand} onClick={() => (forms.showPopover = true)}>
-              {forms.orchestraName} <Icon name={forms.showPopover ? 'arrow-up' : 'arrow-down'} />
+              <div class={['van-ellipsis', styles.bandName]}>{forms.orchestraName}</div>
+              <Icon name={forms.showPopover ? 'arrow-up' : 'arrow-down'} />
             </div>
           </div>
         </Sticky>

src/school/orchestra/create-orchestra/index.tsx

@@ -206,10 +206,10 @@ export default defineComponent({
               {{
                 value: () => (
                   <>
-                    已选
+                    已选{' '}
                     <span style={{ color: 'var(--van-primary-color)' }}>
                       {item.students?.length || 0}
-                    </span>
+                    </span>{' '}
                     名学生
                   </>
                 )

src/school/orchestra/create-orchestra/select-teacher.tsx

@@ -9,6 +9,7 @@ import { state as baseState } from '@/state'
 import { createState as state, resestState } from './create'
 import { useRouter } from 'vue-router'
 import request from '@/helpers/request'
+import ODialog from '@/components/o-dialog'
 
 export default defineComponent({
   name: 'teacher-list',
@@ -129,25 +130,17 @@ export default defineComponent({
           />
         </OPopup>
 
-        <Dialog
+        <ODialog
           v-model:show={forms.status}
-          message="乐团创建完成，是否需要排课？"
-          messageAlign="center"
+          title="创建成功"
+          messageAlign="left"
           confirmButtonText="去排课"
           cancelButtonText="暂不排课"
           showCancelButton
+          message="乐团创建完成，是否需要排课？"
           onConfirm={onConfirm}
           onCancel={onCancel}
-        >
-          {{
-            title: () => (
-              <div class={styles.dialogTitle}>
-                <i></i>
-                创建成功
-              </div>
-            )
-          }}
-        </Dialog>
+        ></ODialog>
       </div>
     )
   }

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

@@ -4,6 +4,11 @@
   font-size: 14px;
   font-weight: 600;
   color: #333333;
+  .bandName {
+    display: inline-block;
+    max-width: 180px;
+    vertical-align: text-top;
+  }
 }
 
 .studentList {

src/school/orchestra/modal/student-list.tsx

@@ -191,7 +191,14 @@ export default defineComponent({
               onSearch()
             }}
           />
-          <div style={{ padding: '8px 13px 16px', background: '#F8F8F8' }}>
+          <div
+            style={{
+              padding: '8px 13px 16px',
+              background: '#F8F8F8',
+              display: 'flex',
+              alignItems: 'center'
+            }}
+          >
             <div class={styles.searchBand} onClick={() => (state.showPopover = true)}>
               {state.class.name} <Icon name={state.showPopover ? 'arrow-up' : 'arrow-down'} />
             </div>
@@ -200,7 +207,8 @@ export default defineComponent({
               style="margin-left: 16px"
               onClick={() => (state.oPopover = true)}
             >
-              {state.orchestra.name} <Icon name={state.oPopover ? 'arrow-up' : 'arrow-down'} />
+              <div class={['van-ellipsis', styles.bandName]}>{state.orchestra.name}</div>
+              <Icon name={state.oPopover ? 'arrow-up' : 'arrow-down'} />
             </div>
           </div>
         </OSticky>
@@ -260,6 +268,7 @@ export default defineComponent({
               type="primary"
               plain
               round
+              style={{ backgroundColor: 'transparent' }}
               onClick={() => {
                 state.list.forEach((item: any) => {
                   if (!state.check.includes(item.id)) {

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

@@ -196,7 +196,7 @@ export default defineComponent({
                   state.showPopoverOrchestra = true
                 }}
               >
-                {forms.orchestraName}
+                <div class={['van-ellipsis', styles.bandName]}>{forms.orchestraName}</div>
                 <Icon name={state.showPopoverOrchestra ? 'arrow-up' : 'arrow-down'} />
               </div>
             </div>

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

@@ -8,3 +8,12 @@
   font-weight: 500;
   padding: 12px 0;
 }
+
+.searchBand {
+  display: flex;
+  .bandName {
+    display: inline-block;
+    max-width: 120px;
+    vertical-align: text-top;
+  }
+}

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

@@ -188,14 +188,19 @@ export default defineComponent({
               </div>
             </div>
 
-            <div style={{ padding: '0 13px', background: '#FFF' }}>
+            <div
+              style={{
+                padding: '0 13px',
+                background: '#FFF'
+              }}
+            >
               <div
                 class={styles.searchBand}
                 onClick={() => {
                   state.showPopoverOrchestra = true
                 }}
               >
-                {forms.orchestraName}
+                <div class={['van-ellipsis', styles.bandName]}>{forms.orchestraName}</div>
                 <Icon name={state.showPopoverOrchestra ? 'arrow-up' : 'arrow-down'} />
               </div>
             </div>

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

@@ -29,6 +29,9 @@
     .van-tabs__wrap {
       padding-bottom: 3px;
     }
+    .van-tab__text--ellipsis {
+      max-width: 200px;
+    }
   }
 }
 
@@ -120,7 +123,7 @@
     font-weight: bold;
     color: #333333;
     line-height: 35px;
-
+    font-family: 'DINA';
     &.conflictType {
       color: #f44541;
     }

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

@@ -263,7 +263,9 @@ export default defineComponent({
                 title: () => (
                   <div class={styles.teacherInfo}>
                     <p class={[styles.teacherName, 'van-ellipsis']}>{item.teacherName}</p>
-                    <Tag type="primary">{item.className}</Tag>
+                    <Tag color="#FFE3DA" textColor="#F67146">
+                      {item.className}
+                    </Tag>
                   </div>
                 ),
                 value: () => (

src/school/train-planning/component/practice/index.tsx

@@ -129,8 +129,8 @@ export default defineComponent({
                   <Tag
                     size="large"
                     type="primary"
-                    plain={!forms.classType.includes('SINGLE')}
-                    color="#FF8057"
+                    color={!forms.classType.includes('SINGLE') ? '#EAEAEA' : '#FF8057'}
+                    textColor={!forms.classType.includes('SINGLE') ? '#AAA' : '#FFF'}
                     class={styles.radioSection}
                   >
                     <Checkbox class={styles.radioItem} name={'SINGLE'}></Checkbox>声部课
@@ -138,8 +138,8 @@ export default defineComponent({
                   <Tag
                     size="large"
                     type="primary"
-                    plain={!forms.classType.includes('MUSIC_THEORY')}
-                    color="#FF8057"
+                    color={!forms.classType.includes('MUSIC_THEORY') ? '#EAEAEA' : '#FF8057'}
+                    textColor={!forms.classType.includes('MUSIC_THEORY') ? '#AAA' : '#FFF'}
                     class={styles.radioSection}
                   >
                     <Checkbox class={styles.radioItem} name={'MUSIC_THEORY'}></Checkbox>乐理课
@@ -147,8 +147,10 @@ export default defineComponent({
                   <Tag
                     size="large"
                     type="primary"
-                    plain={!forms.classType.includes('INSTRUMENTAL_ENSEMBLE')}
-                    color="#FF8057"
+                    color={
+                      !forms.classType.includes('INSTRUMENTAL_ENSEMBLE') ? '#EAEAEA' : '#FF8057'
+                    }
+                    textColor={!forms.classType.includes('INSTRUMENTAL_ENSEMBLE') ? '#AAA' : '#FFF'}
                     class={styles.radioSection}
                   >
                     <Checkbox class={styles.radioItem} name={'INSTRUMENTAL_ENSEMBLE'}></Checkbox>
@@ -197,8 +199,8 @@ export default defineComponent({
                   <Tag
                     size="large"
                     type="primary"
-                    plain={!(forms.skipHoliday === 1)}
-                    color="#FF8057"
+                    color={!(forms.skipHoliday === 1) ? '#EAEAEA' : '#FF8057'}
+                    textColor={!(forms.skipHoliday === 1) ? '#AAA' : '#FFF'}
                     class={styles.radioSection}
                     round
                   >
@@ -207,8 +209,8 @@ export default defineComponent({
                   <Tag
                     size="large"
                     type="primary"
-                    plain={!(forms.skipHoliday === 0)}
-                    color="#FF8057"
+                    color={!(forms.skipHoliday === 0) ? '#EAEAEA' : '#FF8057'}
+                    textColor={!(forms.skipHoliday === 0) ? '#AAA' : '#FFF'}
                     class={styles.radioSection}
                     round
                   >

src/school/train-planning/component/standard/index.module.less

@@ -9,7 +9,7 @@
   background: #ffebdd;
   border-radius: 10px;
   padding: 7px 19px;
-  font-size: 14px;
+  font-size: 13px;
   color: #f67146;
   line-height: 20px;
 

src/school/train-planning/component/standard/index.tsx

@@ -236,8 +236,8 @@ export default defineComponent({
                   <Tag
                     size="large"
                     type="primary"
-                    plain={!(forms.skipHoliday === 1)}
-                    color="#FF8057"
+                    color={!(forms.skipHoliday === 1) ? '#EAEAEA' : '#FF8057'}
+                    textColor={!(forms.skipHoliday === 1) ? '#AAA' : '#FFF'}
                     class={styles.radioSection}
                     round
                   >
@@ -246,8 +246,8 @@ export default defineComponent({
                   <Tag
                     size="large"
                     type="primary"
-                    plain={!(forms.skipHoliday === 0)}
-                    color="#FF8057"
+                    color={!(forms.skipHoliday === 0) ? '#EAEAEA' : '#FF8057'}
+                    textColor={!(forms.skipHoliday === 0) ? '#AAA' : '#FFF'}
                     class={styles.radioSection}
                     round
                   >
@@ -336,10 +336,10 @@ export default defineComponent({
         <Popup v-model:show={forms.numberStatus} position="bottom" round>
           <Picker
             columns={forms.timerPickerList}
-            onClick={() => (forms.numberStatus = false)}
             onConfirm={(val: any) => {
               const selectedValue = val.selectedValues[0]
               forms.times = selectedValue
+              forms.numberStatus = false
             }}
           />
         </Popup>

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

@@ -32,6 +32,7 @@
       color: #777777;
       line-height: 20px;
       padding-bottom: 3px;
+      font-weight: 400;
     }
 
     span {

src/school/train-planning/modal/practice-class/index.module.less

@@ -3,6 +3,11 @@
   font-size: 14px;
   font-weight: 600;
   color: #333333;
+  .bandName {
+    display: inline-block;
+    max-width: 180px;
+    vertical-align: text-top;
+  }
 }
 
 .gridContainer {

src/school/train-planning/modal/practice-class/index.tsx

@@ -162,7 +162,8 @@ export default defineComponent({
           {!props.orchestraId && (
             <div style={{ padding: '12px 13px', background: '#f6f6f6' }}>
               <div class={styles.searchBand} onClick={() => (forms.showPopover = true)}>
-                {forms.orchestraName} <Icon name={forms.showPopover ? 'arrow-up' : 'arrow-down'} />
+                <div class={['van-ellipsis', styles.bandName]}>{forms.orchestraName}</div>
+                <Icon name={forms.showPopover ? 'arrow-up' : 'arrow-down'} />
               </div>
             </div>
           )}

src/student/music-group/pre-apply/component/apply.tsx

@@ -222,7 +222,8 @@ export default defineComponent({
                     <Tag
                       size="large"
                       type="primary"
-                      plain={!(forms.sex === 1)}
+                      color={!(forms.sex === 1) ? '#EAEAEA' : '#FF8057'}
+                      textColor={!(forms.sex === 1) ? '#AAA' : '#FFF'}
                       class={styles.radioSection}
                       round
                     >
@@ -231,7 +232,8 @@ export default defineComponent({
                     <Tag
                       size="large"
                       type="primary"
-                      plain={!(forms.sex === 0)}
+                      color={!(forms.sex === 0) ? '#EAEAEA' : '#FF8057'}
+                      textColor={!(forms.sex === 0) ? '#AAA' : '#FFF'}
                       class={styles.radioSection}
                       round
                     >

src/styles/index.less

@@ -198,6 +198,12 @@ body {
   padding: 15px 12px;
 }
 
+.van-cell__right-icon {
+  font-size: 13px;
+  font-weight: bold;
+  color: #d8d8d8;
+}
+
 @font-face {
   font-family: 'DINA';
   src: url('./font/DIN_Alternate_Bold.ttf');

src/teacher/attendance/index.module.less

@@ -22,3 +22,12 @@
   color: #333;
   font-weight: 500;
 }
+
+.searchBand {
+  display: flex;
+  .bandName {
+    display: inline-block;
+    max-width: 120px;
+    vertical-align: text-top;
+  }
+}

src/teacher/attendance/index.tsx

@@ -181,7 +181,7 @@ export default defineComponent({
                   state.showPopoverOrchestra = true
                 }}
               >
-                {forms.orchestraName}
+                <div class={['van-ellipsis', styles.bandName]}>{forms.orchestraName}</div>
                 <Icon name={state.showPopoverOrchestra ? 'arrow-up' : 'arrow-down'} />
               </div>
             </div>

src/views/exercise-record/modals/student-item.module.less

@@ -24,6 +24,7 @@
         img {
           width: 100%;
           height: 100%;
+          object-fit: cover;
         }
       }
       .name {