Merge branch 'master' into jenkins

dist/project/companionTeacher.html

@@ -72,10 +72,12 @@
         <van-field required label="性别" name="gender" :rules="[{ required: true, message: '请选择性别' }]">
           <template #input>
             <van-radio-group checked-color="#FF8057" v-model="forms.gender" direction="horizontal">
-              <van-tag size="large" type="primary" :plain="!(forms.gender === 1)" color="#FF8057" class="radioSection">
+              <van-tag size="large" type="primary" :plain="!(forms.gender === 1)" color="#FF8057" class="radioSection"
+                round>
                 <van-radio class="radioItem" :name="1"></van-radio>男
               </van-tag>
-              <van-tag size="large" type="primary" :plain="!(forms.gender === 0)" color="#FF8057" class="radioSection">
+              <van-tag size="large" type="primary" :plain="!(forms.gender === 0)" color="#FF8057" class="radioSection"
+                round>
                 <van-radio class="radioItem" :name="0"></van-radio>女
               </van-tag>
             </van-radio-group>

dist/project/initiation.html

@@ -198,11 +198,11 @@
           <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">
+                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">
+                class="radioSection" round>
                 <van-radio class="radioItem" :name="0"></van-radio>女生
               </van-tag>
             </van-radio-group>
@@ -230,11 +230,11 @@
             <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">
+                :color="checkPhone ? '#ccc': '#FF8057'" 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">
+                :color="checkPhone ? '#ccc': '#FF8057'" class="radioSection" round>
                 <van-radio class="radioItem" :name="0"></van-radio>否
               </van-tag>
             </van-radio-group>
@@ -248,11 +248,11 @@
             <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">
+                :color="checkPhone ? '#ccc': '#FF8057'" 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">
+                :color="checkPhone ? '#ccc': '#FF8057'" class="radioSection" round>
                 <van-radio class="radioItem" :name="0"></van-radio>否
               </van-tag>
             </van-radio-group>

dist/project/manageTeacher.html

@@ -72,10 +72,12 @@
         <van-field required label="性别" name="gender" :rules="[{ required: true, message: '请选择性别' }]">
           <template #input>
             <van-radio-group checked-color="#64A9FF" v-model="forms.gender" direction="horizontal">
-              <van-tag size="large" type="primary" :plain="!(forms.gender === 1)" color="#64A9FF" class="radioSection">
+              <van-tag size="large" type="primary" :plain="!(forms.gender === 1)" color="#64A9FF" class="radioSection"
+                round>
                 <van-radio class="radioItem" :name="1"></van-radio>男
               </van-tag>
-              <van-tag size="large" type="primary" :plain="!(forms.gender === 0)" color="#64A9FF" class="radioSection">
+              <van-tag size="large" type="primary" :plain="!(forms.gender === 0)" color="#64A9FF" class="radioSection"
+                round>
                 <van-radio class="radioItem" :name="0"></van-radio>女
               </van-tag>
             </van-radio-group>

dist/project/preRegister.html

@@ -198,11 +198,11 @@
           <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">
+                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">
+                class="radioSection" round>
                 <van-radio class="radioItem" :name="0"></van-radio>女生
               </van-tag>
             </van-radio-group>
@@ -239,11 +239,11 @@
             <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">
+                :color="checkPhone ? '#ccc': '#9A64FF'" 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">
+                :color="checkPhone ? '#ccc': '#9A64FF'" class="radioSection" round>
                 <van-radio class="radioItem" name="ONESELF"></van-radio>自备
               </van-tag>
             </van-radio-group>
@@ -256,11 +256,11 @@
             <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">
+                :color="checkPhone ? '#ccc': '#9A64FF'" class="radioSection" round>
                 <van-radio class="radioItem" name="GROUP_PURCHASE"></van-radio>团购
               </van-tag>
               <van-tag size="large" type="primary" :plain="!(stu.learningSystemPrepareMode === 'ONESELF')"
-                :color="checkPhone ? '#ccc': '#9A64FF'" class="radioSection">
+                :color="checkPhone ? '#ccc': '#9A64FF'" class="radioSection" round>
                 <van-radio class="radioItem" name="ONESELF"></van-radio>自备
               </van-tag>
             </van-radio-group>

dist/project/schoolRegister.html

@@ -60,11 +60,11 @@
           <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">
+                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">
+                class="radioSection" round>
                 <van-radio class="radioItem" name="PRIVATE"></van-radio>民办
               </van-tag>
             </van-radio-group>
@@ -75,11 +75,11 @@
           <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">
+                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">
+                class="radioSection" round>
                 <van-radio class="radioItem" name="sixYearSystem"></van-radio>五年制
               </van-tag>
             </van-radio-group>

public/project/companionTeacher.html

@@ -73,10 +73,12 @@
         <van-field required label="性别" name="gender" :rules="[{ required: true, message: '请选择性别' }]">
           <template #input>
             <van-radio-group checked-color="#FF8057" v-model="forms.gender" direction="horizontal">
-              <van-tag size="large" type="primary" :plain="!(forms.gender === 1)" color="#FF8057" class="radioSection">
+              <van-tag size="large" type="primary" :plain="!(forms.gender === 1)" color="#FF8057" class="radioSection"
+                round>
                 <van-radio class="radioItem" :name="1"></van-radio>男
               </van-tag>
-              <van-tag size="large" type="primary" :plain="!(forms.gender === 0)" color="#FF8057" class="radioSection">
+              <van-tag size="large" type="primary" :plain="!(forms.gender === 0)" color="#FF8057" class="radioSection"
+                round>
                 <van-radio class="radioItem" :name="0"></van-radio>女
               </van-tag>
             </van-radio-group>

public/project/initiation.html

@@ -198,11 +198,11 @@
           <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">
+                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">
+                class="radioSection" round>
                 <van-radio class="radioItem" :name="0"></van-radio>女生
               </van-tag>
             </van-radio-group>
@@ -230,12 +230,12 @@
             <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">
+                :color="checkPhone ? '#ccc': '#FF8057'" 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 = ''">
+                :color="checkPhone ? '#ccc': '#FF8057'" class="radioSection" @click="() => stu.learningSubjectName = ''"
+                round>
                 <van-radio class="radioItem" :name="0"></van-radio>否
               </van-tag>
             </van-radio-group>
@@ -249,11 +249,11 @@
             <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">
+                :color="checkPhone ? '#ccc': '#FF8057'" 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">
+                :color="checkPhone ? '#ccc': '#FF8057'" class="radioSection" round>
                 <van-radio class="radioItem" :name="0"></van-radio>否
               </van-tag>
             </van-radio-group>

public/project/manageTeacher.html

@@ -73,10 +73,12 @@
         <van-field required label="性别" name="gender" :rules="[{ required: true, message: '请选择性别' }]">
           <template #input>
             <van-radio-group checked-color="#64A9FF" v-model="forms.gender" direction="horizontal">
-              <van-tag size="large" type="primary" :plain="!(forms.gender === 1)" color="#64A9FF" class="radioSection">
+              <van-tag size="large" type="primary" :plain="!(forms.gender === 1)" color="#64A9FF" class="radioSection"
+                round>
                 <van-radio class="radioItem" :name="1"></van-radio>男
               </van-tag>
-              <van-tag size="large" type="primary" :plain="!(forms.gender === 0)" color="#64A9FF" class="radioSection">
+              <van-tag size="large" type="primary" :plain="!(forms.gender === 0)" color="#64A9FF" class="radioSection"
+                round>
                 <van-radio class="radioItem" :name="0"></van-radio>女
               </van-tag>
             </van-radio-group>

public/project/preRegister.html

@@ -198,11 +198,11 @@
           <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">
+                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">
+                class="radioSection" round>
                 <van-radio class="radioItem" :name="0"></van-radio>女生
               </van-tag>
             </van-radio-group>
@@ -239,11 +239,11 @@
             <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">
+                :color="checkPhone ? '#ccc': '#9A64FF'" 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">
+                :color="checkPhone ? '#ccc': '#9A64FF'" class="radioSection" round>
                 <van-radio class="radioItem" name="ONESELF"></van-radio>自备
               </van-tag>
             </van-radio-group>
@@ -256,11 +256,11 @@
             <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">
+                :color="checkPhone ? '#ccc': '#9A64FF'" class="radioSection" round>
                 <van-radio class="radioItem" name="GROUP_PURCHASE"></van-radio>团购
               </van-tag>
               <van-tag size="large" type="primary" :plain="!(stu.learningSystemPrepareMode === 'ONESELF')"
-                :color="checkPhone ? '#ccc': '#9A64FF'" class="radioSection">
+                :color="checkPhone ? '#ccc': '#9A64FF'" class="radioSection" round>
                 <van-radio class="radioItem" name="ONESELF"></van-radio>自备
               </van-tag>
             </van-radio-group>

public/project/schoolRegister.html

@@ -60,11 +60,11 @@
           <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">
+                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">
+                class="radioSection" round>
                 <van-radio class="radioItem" name="PRIVATE"></van-radio>民办
               </van-tag>
             </van-radio-group>
@@ -75,11 +75,11 @@
           <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">
+                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">
+                class="radioSection" round>
                 <van-radio class="radioItem" name="sixYearSystem"></van-radio>六年制
               </van-tag>
             </van-radio-group>

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

@@ -143,6 +143,7 @@ export default defineComponent({
                     plain={!(forms.changeType === 1)}
                     color="#FF8057"
                     class={styles.radioSection}
+                    round
                   >
                     <Radio class={styles.radioItem} name={1}></Radio>提前
                   </Tag>
@@ -152,6 +153,7 @@ export default defineComponent({
                     plain={!(forms.changeType === 0)}
                     color="#FF8057"
                     class={styles.radioSection}
+                    round
                   >
                     <Radio class={styles.radioItem} name={0}></Radio>延后
                   </Tag>

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

@@ -296,6 +296,7 @@ export default defineComponent({
                       plain={!(state.forms.gender === 1)}
                       color="#FF8057"
                       class={styles.radioSection}
+                      round
                     >
                       <Radio class={styles.radioItem} name={1}></Radio>男
                     </Tag>
@@ -305,6 +306,7 @@ export default defineComponent({
                       plain={!(state.forms.gender === 0)}
                       color="#FF8057"
                       class={styles.radioSection}
+                      round
                     >
                       <Radio class={styles.radioItem} name={0}></Radio>女
                     </Tag>

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

@@ -228,6 +228,7 @@ export default defineComponent({
                       plain={!(state.forms.gender === 1)}
                       color="#64A9FF"
                       class={styles.radioSection}
+                      round
                     >
                       <Radio class={styles.radioItem} name={1}></Radio>男
                     </Tag>
@@ -237,6 +238,7 @@ export default defineComponent({
                       plain={!(state.forms.gender === 0)}
                       color="#64A9FF"
                       class={styles.radioSection}
+                      round
                     >
                       <Radio class={styles.radioItem} name={0}></Radio>女
                     </Tag>

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

@@ -200,6 +200,7 @@ export default defineComponent({
                     plain={!(forms.skipHoliday === 1)}
                     color="#FF8057"
                     class={styles.radioSection}
+                    round
                   >
                     <Radio class={styles.radioItem} name={1}></Radio>是
                   </Tag>
@@ -209,6 +210,7 @@ export default defineComponent({
                     plain={!(forms.skipHoliday === 0)}
                     color="#FF8057"
                     class={styles.radioSection}
+                    round
                   >
                     <Radio class={styles.radioItem} name={0}></Radio>否
                   </Tag>

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

@@ -239,6 +239,7 @@ export default defineComponent({
                     plain={!(forms.skipHoliday === 1)}
                     color="#FF8057"
                     class={styles.radioSection}
+                    round
                   >
                     <Radio class={styles.radioItem} name={1}></Radio>是
                   </Tag>
@@ -248,6 +249,7 @@ export default defineComponent({
                     plain={!(forms.skipHoliday === 0)}
                     color="#FF8057"
                     class={styles.radioSection}
+                    round
                   >
                     <Radio class={styles.radioItem} name={0}></Radio>否
                   </Tag>

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

@@ -224,6 +224,7 @@ export default defineComponent({
                       type="primary"
                       plain={!(forms.sex === 1)}
                       class={styles.radioSection}
+                      round
                     >
                       <Radio class={styles.radioItem} name={1}></Radio>男生
                     </Tag>
@@ -232,6 +233,7 @@ export default defineComponent({
                       type="primary"
                       plain={!(forms.sex === 0)}
                       class={styles.radioSection}
+                      round
                     >
                       <Radio class={styles.radioItem} name={0}></Radio>女生
                     </Tag>

src/views/exercise-after-class/index.tsx

@@ -32,6 +32,7 @@ import iconplay from '../coursewarePlay/image/icon-play.svg'
 import iconpause from '../coursewarePlay/image/icon-pause.svg'
 import iconVideobg from '../coursewarePlay/image/icon-videobg.png'
 import { browser, getSecondRPM } from '@/helpers/utils'
+import qs from 'query-string'
 
 const materialType = {
   视频: 'VIDEO',
@@ -278,7 +279,14 @@ export default defineComponent({
             }
             if (nextItem?.type === materialType.曲目) {
               goback()
-              let src = `${location.origin}/orchestra-music-score/?id=${nextItem.content}`
+               const parmas = qs.stringify({
+                id: nextItem.content,
+                courseScheduleId: query.courseScheduleId,
+                lessonTrainingId: query.lessonTrainingId,
+                materialId: nextItem.materialId
+               })
+              let src = `${location.origin}/orchestra-music-score/?` + parmas
+              // console.log("🚀 ~ src", src)
               postMessage({
                 api: 'openAccompanyWebView',
                 content: {