Merge branch 'master' of http://git.dayaedu.com/lex/orchestra-app

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/components/o-dialog/index.module.less

@@ -16,3 +16,13 @@
   line-height: 25px;
   padding-bottom: 12px;
 }
+
+.oDialog {
+  :global {
+    .van-dialog__message {
+      font-size: 16px;
+      color: 333;
+      line-height: 22px;
+    }
+  }
+}

src/components/o-dialog/index.tsx

@@ -53,6 +53,7 @@ export default defineComponent({
     )
     return () => (
       <Dialog
+        class={styles.oDialog}
         v-model:show={state.show}
         message={props.message}
         messageAlign={props.messageAlign}

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-detail.module.less

@@ -11,6 +11,7 @@
   }
   .tagSubject {
     margin-right: 10px;
+    margin-bottom: 4px;
   }
 }
 .sectionCellGroup {

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

@@ -143,7 +143,7 @@ export default defineComponent({
                 title: () => (
                   <div class={styles.subjectContainer}>
                     <span>声部：</span>
-                    <div style={{ display: 'flex', alignItems: 'center' }}>
+                    <div style={{ display: 'flex', alignItems: 'center', flexWrap: 'wrap' }}>
                       {state.detail.subjectNames &&
                         state.detail.subjectNames.map((subject: any) => (
                           <Tag type="primary" class={styles.tagSubject}>

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

@@ -134,6 +134,8 @@ span {
 
 .radioSection {
   position: relative;
+  min-width: 32px;
+  justify-content: center;
 }
 
 .radioItem {

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

@@ -197,21 +197,18 @@ export default defineComponent({
         })
         state.columns = tempareas || []
 
-        const { data } = await request.post(
-          '/api-school/open/orchestraSubjectConfig/pageByOrchestraId',
-          {
-            data: {
-              page: 1,
-              rows: 50
-            }
+        const { data } = await request.post('/api-school/open/subjectBasicConfig/page', {
+          data: {
+            page: 1,
+            rows: 50
           }
-        )
+        })
 
         const rows = data.rows || []
         const tempSubjects: any = []
         rows.forEach((item: any) => {
           tempSubjects.push({
-            text: item.name,
+            text: item.subjectName,
             value: item.subjectId
           })
         })
@@ -262,40 +259,6 @@ export default defineComponent({
               maxlength={11}
               type="tel"
             ></Field>
-            <Field
-              required
-              label="验证码"
-              v-model={state.forms.smsValidCode}
-              name="smsValidCode"
-              rules={[{ required: true, message: '请输入验证码', trigger: 'onChange' }]}
-              placeholder="请输入验证码"
-              maxlength={6}
-              type="tel"
-            >
-              {{
-                button: () =>
-                  state.countDownStatus ? (
-                    <Button type="primary" round size="small" color="#ff8057" onClick={onSendCode}>
-                      发送验证码
-                    </Button>
-                  ) : (
-                    <Button
-                      type="default"
-                      round
-                      size="small"
-                      disabled
-                      style={{ minWidth: '60px' }}
-                      onClick={onSendCode}
-                    >
-                      {state.countDownTime + 's'}
-                    </Button>
-                  )
-              }}
-            </Field>
-            <div class={styles.phoneTips}>
-              <Icon name="warning" size="16" />
-              提示：手机号码将成为您管乐团老师端登录账号
-            </div>
 
             <Field
               required
@@ -333,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>
@@ -342,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>
@@ -475,6 +440,40 @@ export default defineComponent({
                 )
               }}
             </Field>
+            <Field
+              required
+              label="验证码"
+              v-model={state.forms.smsValidCode}
+              name="smsValidCode"
+              rules={[{ required: true, message: '请输入验证码', trigger: 'onChange' }]}
+              placeholder="请输入验证码"
+              maxlength={6}
+              type="tel"
+            >
+              {{
+                button: () =>
+                  state.countDownStatus ? (
+                    <Button type="primary" round size="small" color="#ff8057" onClick={onSendCode}>
+                      发送验证码
+                    </Button>
+                  ) : (
+                    <Button
+                      type="default"
+                      round
+                      size="small"
+                      disabled
+                      style={{ minWidth: '60px' }}
+                      onClick={onSendCode}
+                    >
+                      {state.countDownTime + 's'}
+                    </Button>
+                  )
+              }}
+            </Field>
+            <div class={styles.phoneTips}>
+              <Icon name="warning" size="16" />
+              提示：手机号码将成为您管乐团老师端登录账号
+            </div>
           </CellGroup>
 
           <div class={styles.protocol}>

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

@@ -12,6 +12,7 @@
   }
   .tagSubject {
     margin-right: 10px;
+    margin-bottom: 4px;
   }
 }
 

src/school/companion-teacher/index.tsx

@@ -101,6 +101,8 @@ export default defineComponent({
           res.data.schoolId +
           '&name=' +
           res.data.schoolName
+
+        console.log(form.url)
       } catch {
         //
       }
@@ -355,7 +357,7 @@ export default defineComponent({
                     title: () => (
                       <div class={styles.subjectContainer}>
                         <span>声部：</span>
-                        <div style={{ display: 'flex', alignItems: 'center' }}>
+                        <div style={{ display: 'flex', alignItems: 'center', flexWrap: 'wrap' }}>
                           {item.subjectNames &&
                             item.subjectNames.length > 0 &&
                             item.subjectNames.map((subject: any) => (

src/school/main.ts

@@ -30,8 +30,8 @@ postMessage(
     console.log(res, 'version')
   }
 )
-import Vconsole from 'vconsole'
-const vconsole = new Vconsole()
+// import Vconsole from 'vconsole'
+// const vconsole = new Vconsole()
 const paymentType = (window as any).paymentType // 浏览器设置
 if (browser().isTeacher || paymentType === 'TEACHER') {
   state.platformType = 'TEACHER'

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

@@ -4,6 +4,10 @@
   border-radius: 10px;
 }
 
+.manageTeacher {
+  --van-dialog-message-font-size: 16px !important;
+}
+
 .sectionCellGroup {
   :global {
     .van-cell {

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

@@ -16,7 +16,7 @@ export default defineComponent({
     const detail = ref<any>({})
     const state = reactive({
       menuStatus: false,
-      status: false
+      status: true
     })
     const getDetail = async () => {
       try {
@@ -58,7 +58,7 @@ export default defineComponent({
       getDetail()
     })
     return () => (
-      <>
+      <div class={styles.manageTeacher}>
         <OHeader />
 
         <CellGroup inset class={styles.detailCellGroup}>
@@ -165,7 +165,7 @@ export default defineComponent({
             )
           }}
         </Dialog>
-      </>
+      </div>
     )
   }
 })

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

@@ -130,6 +130,7 @@ export default defineComponent({
           '/api-school/open/orchestraSubjectConfig/pageByOrchestraId',
           {
             data: {
+              orchestraId: state.id,
               page: 1,
               rows: 50
             }
@@ -191,40 +192,6 @@ export default defineComponent({
               maxlength={11}
               type="tel"
             ></Field>
-            <Field
-              required
-              label="验证码"
-              v-model={state.forms.smsValidCode}
-              name="smsValidCode"
-              rules={[{ required: true, message: '请输入验证码', trigger: 'onChange' }]}
-              placeholder="请输入验证码"
-              maxlength={6}
-              type="tel"
-            >
-              {{
-                button: () =>
-                  state.countDownStatus ? (
-                    <Button type="primary" round size="small" color="#64A9FF" onClick={onSendCode}>
-                      发送验证码
-                    </Button>
-                  ) : (
-                    <Button
-                      type="default"
-                      round
-                      size="small"
-                      disabled
-                      style={{ minWidth: '60px' }}
-                      onClick={onSendCode}
-                    >
-                      {state.countDownTime + 's'}
-                    </Button>
-                  )
-              }}
-            </Field>
-            <div class={styles.phoneTips}>
-              <Icon name="warning" size="16" />
-              提示：手机号码将成为您管乐团管理端登录账号
-            </div>
 
             <Field
               required
@@ -261,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>
@@ -270,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>
@@ -277,6 +246,40 @@ export default defineComponent({
                 )
               }}
             </Field>
+            <Field
+              required
+              label="验证码"
+              v-model={state.forms.smsValidCode}
+              name="smsValidCode"
+              rules={[{ required: true, message: '请输入验证码', trigger: 'onChange' }]}
+              placeholder="请输入验证码"
+              maxlength={6}
+              type="tel"
+            >
+              {{
+                button: () =>
+                  state.countDownStatus ? (
+                    <Button type="primary" round size="small" color="#64A9FF" onClick={onSendCode}>
+                      发送验证码
+                    </Button>
+                  ) : (
+                    <Button
+                      type="default"
+                      round
+                      size="small"
+                      disabled
+                      style={{ minWidth: '60px' }}
+                      onClick={onSendCode}
+                    >
+                      {state.countDownTime + 's'}
+                    </Button>
+                  )
+              }}
+            </Field>
+            <div class={styles.phoneTips}>
+              <Icon name="warning" size="16" />
+              提示：手机号码将成为您管乐团管理端登录账号
+            </div>
           </CellGroup>
 
           <div class={styles.protocol}>

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

@@ -42,5 +42,6 @@
   }
   .tagSubject {
     margin-right: 10px;
+    margin-bottom: 4px;
   }
 }

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

@@ -42,5 +42,6 @@
   }
   .tagSubject {
     margin-right: 10px;
+    margin-bottom: 4px;
   }
 }

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

@@ -42,5 +42,6 @@
   }
   .tagSubject {
     margin-right: 10px;
+    margin-bottom: 4px;
   }
 }

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

@@ -197,7 +197,7 @@ export default defineComponent({
                       title: () => (
                         <div class={styles.subjectContainer}>
                           <span>声部：</span>
-                          <div style={{ display: 'flex', alignItems: 'center' }}>
+                          <div style={{ display: 'flex', alignItems: 'center', flexWrap: 'wrap' }}>
                             {item.subjectNames &&
                               item.subjectNames.map((subject: any) => (
                                 <Tag type="primary" class={styles.tagSubject}>

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

@@ -69,9 +69,10 @@ export default defineComponent({
     const onSelectSubject = (ids: any) => {
       state.selectSubjectIds = [...ids]
       const temps: any = []
+      console.log(state.selectSubjects, '1212', state.subjectList)
       state.subjectList.forEach((item: any) => {
-        const index = state.selectSubjects.findIndex((select: any) => select.id === item.id)
-        if (ids.includes(item.id)) {
+        const index = state.selectSubjects.findIndex((select: any) => select.id === item.subjectId)
+        if (ids.includes(item.subjectId)) {
           // 判断是否在数据里，如果在则直接添加，不能重置数据
           if (index < 0) {
             temps.push({
@@ -83,7 +84,7 @@ export default defineComponent({
               students: [] as any // 选中的数据数
             })
           } else {
-            temps.push(state.selectSubjects.find((select: any) => select.id === item.id))
+            temps.push(state.selectSubjects.find((select: any) => select.id === item.subjectId))
           }
         }
       })

src/school/orchestra/create-orchestra/select-teacher.module.less

@@ -1,3 +1,6 @@
+.selectTeacher {
+  --van-dialog-message-font-size: 16px !important;
+}
 .cellGroup {
   margin: 12px 13px;
   :global {

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

@@ -78,7 +78,7 @@ export default defineComponent({
     }
 
     return () => (
-      <div>
+      <div class={styles.selectTeacher}>
         <OHeader title="选择老师" />
 
         <CellGroup inset class={styles.cellGroup}>

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

@@ -57,6 +57,7 @@ export default defineComponent({
       oPopover: false,
       isLoad: false,
       classList: [
+        { text: '全部', value: -1 },
         { text: '一年级', value: 1 },
         { text: '二年级', value: 2 },
         { text: '三年级', value: 3 },
@@ -71,7 +72,7 @@ export default defineComponent({
       } as any,
       class: {
         id: null,
-        name: '年级'
+        name: '全部'
       } as any,
       list: [] as any,
       listState: {
@@ -100,7 +101,7 @@ export default defineComponent({
             ...state.params,
             subjectId: props.subjectId,
             orchestraId: state.orchestra.id,
-            currentGradeNum: state.class.id
+            currentGradeNum: state.class.id === -1 ? null : state.class.id
           }
         })
         state.listState.loading = false

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

@@ -18,6 +18,7 @@
 }
 
 .coursePreview {
+  --van-dialog-message-font-size: 16px !important;
 }
 .orchestraTabs {
   font-weight: 400;

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

@@ -34,10 +34,11 @@ export default defineComponent({
     const courseTabsRef: any = ref()
 
     // 获取所有
-    const getClasses = async () => {
+    const getClasses = async (loading = true) => {
       try {
         const { data } = await request.post('/api-school/orchestra/trainingPlanListCache', {
           requestType: 'form',
+          hideLoading: !loading,
           data: {
             cacheId: route.query.cacheId
           }
@@ -171,9 +172,9 @@ export default defineComponent({
       } catch {
         //
         state.isClick = false
-        setTimeout(() => {
-          getClasses()
-        }, 1100)
+        getClasses(false)
+        // setTimeout(() => {
+        // }, 1100)
       }
     }
 

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.module.less

@@ -1,3 +1,7 @@
+.standard {
+  --van-dialog-message-font-size: 16px !important;
+}
+
 .tips {
   display: flex;
   align-items: center;

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

@@ -197,7 +197,7 @@ export default defineComponent({
       // }
     })
     return () => (
-      <>
+      <div class={styles.preApplyC}>
         <Form validateFirst scrollToError onSubmit={onSubmit} ref="form" class={styles.form}>
           <div class={styles.applyTitle}>学生信息</div>
           <CellGroup inset class={styles.applyCellGroup}>
@@ -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>
@@ -390,7 +392,7 @@ export default defineComponent({
             )
           }}
         </Dialog>
-      </>
+      </div>
     )
   }
 })

src/student/music-group/pre-apply/index.module.less

@@ -311,6 +311,9 @@
   }
 }
 
+.preApplyC {
+  --van-dialog-message-font-size: 16px !important;
+}
 .dialogTitle {
   i {
     display: inline-block;

src/student/music-group/shop-address/address-operation.tsx

@@ -127,6 +127,7 @@ export default defineComponent({
             placeholder="请输入收货人手机号"
             v-model={state.phoneNumber}
             maxlength={11}
+            type="tel"
             formatter={onFormatterInt}
           />
           <Field

src/student/my-orchestra/apply-withdrawal.module.less

@@ -93,6 +93,10 @@
   }
 }
 
+.applyWithdrawal {
+  --van-dialog-message-font-size: 16px !important;
+}
+
 .dialogTitle {
   i {
     display: inline-block;

src/student/my-orchestra/apply-withdrawal.tsx

@@ -71,7 +71,7 @@ export default defineComponent({
       getDetails()
     })
     return () => (
-      <>
+      <div class={styles.applyWithdrawal}>
         <div class={styles.headers}>
           <OHeader
             background={headColor.headBg}
@@ -133,7 +133,7 @@ export default defineComponent({
             )
           }}
         </Dialog>
-      </>
+      </div>
     )
   }
 })

src/teacher/attendance/index.tsx

@@ -78,9 +78,7 @@ export default defineComponent({
         }
 
         forms.page = res.data.current + 1
-        for (let i = 0; i < 10; i++) {
-          list.value = list.value.concat(res.data.rows || [])
-        }
+        list.value = list.value.concat(res.data.rows || [])
 
         showContact.value = list.value.length > 0
         loading.value = false

src/teacher/screen-projection/index.tsx

@@ -61,6 +61,7 @@ export default defineComponent({
     return () => (
       <div>
         <OHeader
+          desotry={false}
           rightText="投屏帮助"
           onClickRight={() => {
             console.log('打开投屏')

src/views/adapay/payment/index.tsx

@@ -14,7 +14,7 @@ export default defineComponent({
   emits: ['backOut', 'close', 'confirm'],
   setup(props, { slots, attrs, emit }) {
     const state = reactive({
-      payType: 'zfb',
+      payType: 'wx',
       pay_channel: ''
     })
     const onClose = () => {
@@ -89,29 +89,29 @@ export default defineComponent({
         <RadioGroup v-model={state.payType}>
           <CellGroup border={false}>
             <Cell
-              title="支付宝支付"
+              title="微信支付"
               border={false}
               center
               onClick={() => {
-                // alipay
-                state.payType = 'zfb'
+                // wx_lite
+                state.payType = 'wx'
               }}
               v-slots={{
-                icon: () => <Icon name="alipay" color="#009fe9" size={22} />,
-                'right-icon': () => <Radio name="zfb" />
+                icon: () => <Icon name="wechat-pay" color="#15c434" size={22} />,
+                'right-icon': () => <Radio name="wx" />
               }}
             ></Cell>
             <Cell
-              title="微信支付"
+              title="支付宝支付"
               border={false}
               center
               onClick={() => {
-                // wx_lite
-                state.payType = 'wx'
+                // alipay
+                state.payType = 'zfb'
               }}
               v-slots={{
-                icon: () => <Icon name="wechat-pay" color="#15c434" size={22} />,
-                'right-icon': () => <Radio name="wx" />
+                icon: () => <Icon name="alipay" color="#009fe9" size={22} />,
+                'right-icon': () => <Radio name="zfb" />
               }}
             ></Cell>
           </CellGroup>

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: {

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

@@ -0,0 +1,63 @@
+.anserList {
+  min-height: 20vh;
+  padding: 20px 0;
+
+  .status {
+    display: flex;
+    align-items: center;
+    padding: 0 20px 30px;
+    span {
+      display: flex;
+      align-items: center;
+      font-size: 16px;
+      font-weight: 500;
+      color: #333333;
+      & + span {
+        margin-left: 30px;
+      }
+    }
+    i {
+      display: inline-block;
+      width: 18px;
+      height: 18px;
+      background-color: #eaeaea;
+      border-radius: 50%;
+      margin-right: 8px;
+    }
+  }
+
+  .aList {
+    margin: 0 10px;
+    :global {
+      .van-grid-item__content {
+        padding: 0 0 13px;
+      }
+    }
+    span {
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      width: 45px;
+      height: 45px;
+      background: #eaeaea;
+      font-size: 18px;
+      font-weight: 500;
+      color: #777777;
+      border-radius: 50%;
+    }
+
+    .answered {
+      background: #ff8057;
+      color: #fff;
+    }
+
+    .yes {
+      background-color: #71b0ff;
+      color: #fff;
+    }
+    .no {
+      background-color: #ff8486;
+      color: #fff;
+    }
+  }
+}

src/views/unit-test/model/answer-list/index.tsx

@@ -0,0 +1,56 @@
+import { Grid, GridItem } from 'vant'
+import { defineComponent, PropType } from 'vue'
+import styles from './index.module.less'
+
+export default defineComponent({
+  name: 'answer-list',
+  props: {
+    value: {
+      type: Array,
+      default: []
+    },
+    answerList: {
+      type: Array,
+      default: () => []
+    },
+    statusList: {
+      type: Array,
+      default: () => [
+        {
+          text: '已答',
+          color: '#FF8057'
+        },
+        {
+          text: '未答',
+          color: '#EAEAEA'
+        }
+      ]
+    }
+  },
+  emits: ['select', 'update:value'],
+  setup(props, { emit }) {
+    return () => (
+      <div class={styles.anserList}>
+        <div class={styles.status}>
+          {props.statusList.map((item: any) => (
+            <span>
+              <i style={{ backgroundColor: item.color }}></i>
+              {item.text}
+            </span>
+          ))}
+        </div>
+
+        <Grid class={styles.aList} columnNum={6} border={false}>
+          {[1, 2, 3, 4, 5, 6, 6, 7, 8, 9, 9, 0, 10].map((item: any) => {
+            // console.log(props.keys)
+            return (
+              <GridItem onClick={() => emit('select', item)}>
+                <span class={props.value.includes(item) && styles.active}>{item}</span>
+              </GridItem>
+            )
+          })}
+        </Grid>
+      </div>
+    )
+  }
+})

src/views/unit-test/unit-detail/index.tsx

@@ -1,4 +1,15 @@
-import { Button, Cell, Icon, Image, Popup, Swipe, SwipeItem, Tag } from 'vant'
+import {
+  ActionSheet,
+  Button,
+  Cell,
+  CountDown,
+  Icon,
+  Image,
+  Popup,
+  Swipe,
+  SwipeItem,
+  Tag
+} from 'vant'
 import { defineComponent, reactive, ref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import NoticeStart from '../model/notice-start'
@@ -8,17 +19,27 @@ import iconCountDown from '../images/icon-count-down.png'
 import iconButtonList from '../images/icon-button-list.png'
 import OSticky from '@/components/o-sticky'
 import ChoiceQuestion from '../model/choice-question'
+import { useCountDown } from '@vant/use'
+import AnswerList from '../model/answer-list'
+import ODialog from '@/components/o-dialog'
 
 export default defineComponent({
   name: 'unit-detail',
   setup() {
     const route = useRoute()
     const router = useRouter()
+    const countDownRef = ref()
     const swipeRef = ref()
     const state = reactive({
       visiableNotice: false,
-      answerList: {}
+      visiableAnswer: false,
+      currentIndex: 0,
+      questionList: [1, 2, 3, 4, 5],
+      answerList: {},
+      time: 30 * 60 * 1000,
+      visiableSure: false
     })
+
     return () => (
       <div class={styles.unitDetail}>
         <Cell center class={styles.unitSection}>
@@ -32,7 +53,13 @@ export default defineComponent({
                 </div>
                 <div class={styles.qNums}>
                   <Icon class={styles.icon} name={iconCountDown} />
-                  剩余时长：39:30
+                  剩余时长：
+                  <CountDown
+                    ref={countDownRef}
+                    time={state.time}
+                    format={'mm:ss'}
+                    autoStart={false}
+                  />
                 </div>
               </div>
             )
@@ -46,31 +73,68 @@ export default defineComponent({
           duration={300}
           touchable={false}
           lazyRender
+          initialSwipe={state.currentIndex}
         >
-          <SwipeItem>
-            <ChoiceQuestion v-model:value={state.answerList[0]} type="checkbox" />
-          </SwipeItem>
-          <SwipeItem>
-            <ChoiceQuestion />
-          </SwipeItem>
+          {state.questionList.map((item: any) => (
+            <SwipeItem>
+              <ChoiceQuestion v-model:value={state.answerList[item]} type="checkbox" />
+            </SwipeItem>
+          ))}
         </Swipe>
 
         <OSticky position="bottom" background="white">
           <div class={['btnGroup btnMore']}>
+            {state.currentIndex > 0 && (
+              <Button
+                round
+                block
+                type="primary"
+                plain
+                onClick={() => {
+                  state.currentIndex -= 1
+                  swipeRef.value?.prev()
+                }}
+              >
+                上一题
+              </Button>
+            )}
             <Button
               block
               round
               type="primary"
               onClick={() => {
-                swipeRef.value.next()
+                if (state.questionList.length === state.currentIndex + 1) {
+                  state.visiableSure = true
+                } else {
+                  state.currentIndex += 1
+                  swipeRef.value?.next()
+                }
+                console.log(state.currentIndex)
               }}
             >
-              下一题
+              {state.questionList.length === state.currentIndex + 1 ? '测试完成' : '下一题'}
             </Button>
-            <Image src={iconButtonList} class={[styles.wapList, 'van-haptics-feedback']} />
+            <Image
+              src={iconButtonList}
+              class={[styles.wapList, 'van-haptics-feedback']}
+              onClick={() => (state.visiableAnswer = true)}
+            />
           </div>
         </OSticky>
 
+        {/* 题目集合 */}
+        <ActionSheet v-model:show={state.visiableAnswer} title="题目列表" safeAreaInsetBottom>
+          <AnswerList
+            value={[1, 3, 4]}
+            onSelect={(item: any) => {
+              // 跳转，并且跳过动画
+              swipeRef.value?.swipeTo(item, {
+                immediate: true
+              })
+            }}
+          />
+        </ActionSheet>
+
         {/* 测验须知 */}
         <Popup
           v-model:show={state.visiableNotice}
@@ -85,9 +149,21 @@ export default defineComponent({
             }}
             onConfirm={() => {
               console.log('start')
+              countDownRef.value.start()
+              state.visiableNotice = false
             }}
           />
         </Popup>
+
+        <ODialog
+          v-model:show={state.visiableSure}
+          title="测验完成"
+          message="确认本次测验的题目都完成了吗？\n提交后不可修改哦"
+          messageAlign="left"
+          showCancelButton
+          cancelButtonText="再等等"
+          confirmButtonText="确认完成"
+        />
       </div>
     )
   }