Merge branch 'colxiu-style-update' into ponline

src/teacher/teacher-cert/cert-two.tsx

@@ -39,7 +39,6 @@ export default defineComponent({
     choiceSubject() {
       // 选择的科目
       const tempArr: any[] = []
-      console.log(this.choiceSubjectIds, this.subjectList)
       this.subjectList.forEach((parent: any) => {
         parent.subjects &&
           parent.subjects.forEach((sub: any) => {

src/teacher/teacher-cert/index.tsx

@@ -54,6 +54,11 @@ export default defineComponent({
       teacherState.teacherCert.gradCertificate = info.gradCertificate
       teacherState.teacherCert.degreeCertificate = info.degreeCertificate
       teacherState.teacherCert.teacherCertificate = info.teacherCertificate
+
+      // 判断是否在声部，如果没有声部则取用户信息里面的声部
+      if (!info.subjectId) {
+        teacherState.teacherCert.subjectId = state.user.data.subjectId || ''
+      }
     } catch {
       //
     }
@@ -201,7 +206,6 @@ export default defineComponent({
             {teacherState.active === 3 ? (
               <>
                 <CertThree />
-
                 <div class={['btnGroup', 'btnMore']}>
                   <Button block round type="primary" plain onClick={this.prev}>
                     上一步