Merge branch 'iteration_1.3.3' into dev

src/teacher/teacher-cert/teacher-cert-update/index.tsx

@@ -17,10 +17,6 @@ export default defineComponent({
   },
   async mounted() {
     try {
-      // 老师入驻状态 0、未申请 UNPAALY、未申请 DOING、审核中 PASS、通过 UNPASS、不通过
-      const entryStatus = state.user.data?.entryStatus || 0
-      this.authStatus = entryStatus === 'DOING' ? true : false
-
       // 判断是否达人认证
       if (!state.user.data?.entryFlag) {
         Dialog.alert({
@@ -35,6 +31,9 @@ export default defineComponent({
         '/api-teacher/teacherAuthEntryRecord/getLastRecordByUserId'
       )
       const info = teacherInfo.data || {}
+      // 老师入驻状态 0、未申请 UNPAALY、未申请 DOING、审核中 PASS、通过 UNPASS、不通过
+      const entryStatus = info.teacherAuthStatus || 0
+      this.authStatus = entryStatus === 'DOING' ? true : false
       teacherState.teacherCert.graduateSchool = info.graduateSchool
       teacherState.teacherCert.subject = info.subject
       teacherState.teacherCert.gradCertificate = info.gradCertificate
@@ -60,6 +59,10 @@ export default defineComponent({
         data: {
           graduateSchool: teacherCert.graduateSchool,
           subject: teacherCert.subject,
+          subjectId: teacherCert.subjectId
+            ? teacherCert.subjectId.split(',')
+            : [],
+          introduction: teacherCert.introduction,
           gradCertificate: teacherCert.gradCertificate,
           degreeCertificate: teacherCert.degreeCertificate,
           teacherCertificate: teacherCert.teacherCertificate

src/teacher/video-class/class-info.tsx

@@ -126,7 +126,6 @@ export default defineComponent({
               }}
               rules={[{ required: true, message: '请选择课程声部' }]}
               placeholder="请选择课程声部"
-              disabled={createState.groupId ? true : false}
             />
           </ColField>
         </ColFieldGroup>
@@ -160,7 +159,6 @@ export default defineComponent({
               v-slots={{
                 button: () => <span>元</span>
               }}
-              disabled={createState.groupId ? true : false}
             />
           </ColField>
         </ColFieldGroup>
@@ -190,7 +188,7 @@ export default defineComponent({
                 //   <Tab title="图片模板" name={1}></Tab>
                 //   <Tab title="自定义模板" name={2}></Tab>
                 // </Tabs>
-              <p>请上传自定义模板</p>
+                <p>请上传自定义模板</p>
               )
             }}
           >
@@ -249,7 +247,6 @@ export default defineComponent({
             {/* v-show={createState.tabIndex == 2} createState.tabIndex == 2*/}
             <Field
               name="lessonCoverUrl"
-
               rules={[
                 {
                   required: true,