更新判断

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

@@ -36,6 +36,9 @@ export default defineComponent({
       this.authStatus = entryStatus === 'DOING' ? true : false
       teacherState.teacherCert.graduateSchool = info.graduateSchool
       teacherState.teacherCert.subject = info.subject
+      teacherState.teacherCert.subjectId = info.subjectId
+      teacherState.teacherCert.introduction = info.introduction
+      teacherState.teacherCert.styleVideoJson = info.styleVideoJson
       teacherState.teacherCert.gradCertificate = info.gradCertificate
       teacherState.teacherCert.degreeCertificate = info.degreeCertificate
       teacherState.teacherCert.teacherCertificate = info.teacherCertificate
@@ -59,10 +62,9 @@ export default defineComponent({
         data: {
           graduateSchool: teacherCert.graduateSchool,
           subject: teacherCert.subject,
-          subjectId: teacherCert.subjectId
-            ? teacherCert.subjectId.split(',')
-            : [],
+          subjectId: teacherCert.subjectId,
           introduction: teacherCert.introduction,
+          styleVideoJson: teacherCert.styleVideoJson,
           gradCertificate: teacherCert.gradCertificate,
           degreeCertificate: teacherCert.degreeCertificate,
           teacherCertificate: teacherCert.teacherCertificate

src/views/live-class/index.tsx

@@ -17,6 +17,8 @@ export default defineComponent({
     const sessionSubjectId = sessionStorage.getItem('liveClassSubjectId')
     const subjectIds = state.user.data?.subjectId || ''
     const subjectId = subjectIds ? Number(subjectIds.split(',')[0]) : null
+
+    console.log(sessionSubjectId, subjectId, 'subject')
     return {
       apiSuffix:
         state.platformType === 'STUDENT' ? '/api-student' : '/api-teacher',
@@ -48,21 +50,26 @@ export default defineComponent({
       //
     }
     const list = this.subjectList
-    const userSubjectId = state.user.data?.subjectId.split(',').map(n => parseInt(n)) || [this.params.subjectId]
+    const userSubjectId = this.params.subjectId
+      ? [this.params.subjectId]
+      : state.user.data?.subjectId.split(',').map(n => parseInt(n)) || [
+          this.params.subjectId
+        ]
     let isRest = true
-    for(let i = 0; i < list.length; i++){
+    for (let i = 0; i < list.length; i++) {
       const subjects = (list[i] as any).subjects || []
-      for(let j = 0; j < subjects.length; j++){
-        if (userSubjectId.includes(subjects[j].id)) {
+      for (let j = 0; j < subjects.length; j++) {
+        if (userSubjectId.includes(subjects[j].id + '')) {
+          console.log('true')
           this.params.subjectId = subjects[j].id
           this.params.subjectName = subjects[j].name
           isRest = false
-          break;
+          break
         }
       }
-      
     }
-    if (isRest && list.length && (list[0] as any).subjects){
+    console.log(isRest, 'isRest')
+    if (isRest && list.length && (list[0] as any).subjects) {
       this.params.subjectId = (list[0] as any).subjects[0].id
       this.params.subjectName = (list[0] as any).subjects[0].name
     }

src/views/video-class/index.tsx

@@ -48,20 +48,24 @@ export default defineComponent({
       //
     }
     const list = this.subjectList
-    const userSubjectId = state.user.data?.subjectId.split(',').map(n => parseInt(n)) || [this.params.lessonSubject]
+    const userSubjectId = this.params.lessonSubject
+      ? [this.params.lessonSubject]
+      : state.user.data?.subjectId.split(',').map(n => parseInt(n)) || [
+          this.params.lessonSubject
+        ]
     let isRest = true
-    for(let i = 0; i < list.length; i++){
+    for (let i = 0; i < list.length; i++) {
       const subjects = (list[i] as any).subjects || []
-      for(let j = 0; j < subjects.length; j++){
-        if (userSubjectId.includes(subjects[j].id)) {
+      for (let j = 0; j < subjects.length; j++) {
+        if (userSubjectId.includes(subjects[j].id + '')) {
           this.params.lessonSubject = subjects[j].id
           this.params.subjectName = subjects[j].name
           isRest = false
-          break;
+          break
         }
       }
     }
-    if (isRest && list.length && (list[0] as any).subjects){
+    if (isRest && list.length && (list[0] as any).subjects) {
       this.params.lessonSubject = (list[0] as any).subjects[0].id
       this.params.subjectName = (list[0] as any).subjects[0].name
     }