Merge branch 'iteration_1.3.3' into dev

src/student/live-class/live-detail.tsx

@@ -50,8 +50,8 @@ export default defineComponent({
         lessonCoverUrl: live.backgroundPic || live.backgroundPicTemplate,
         lessonName: live.courseGroupName,
         auditVersion: live.auditVersion || 0,
-        isDegree: live.teachertTag?.includes('DEGREE') || false,
-        isTeacher: live.teachertTag?.includes('TEACHER') || false
+        isDegree: live.degreeFlag ? true : false,
+        isTeacher: live.teacherFlag ? true : false
       }
     },
     courseInfo() {

src/student/teacher-dependent/model/teacher-header.tsx

@@ -39,10 +39,6 @@ export default defineComponent({
     starGrade() {
       const { starGrade } = this.userInfo as any
       return Number(starGrade) || 0
-    },
-
-    tags() {
-      return this.userInfo.tag?.split(',') || []
     }
   },
   methods: {
@@ -141,7 +137,10 @@ export default defineComponent({
                 }}
               >
                 <Image
-                  class={[styles.avatar, this.checkBadge('VIP') && styles.avatarActive]}
+                  class={[
+                    styles.avatar,
+                    this.checkBadge('VIP') && styles.avatarActive
+                  ]}
                   round
                   src={this.userInfo.heardUrl || iconTeacher}
                   fit="cover"
@@ -198,8 +197,8 @@ export default defineComponent({
               <div class={styles.teacherInfoName}>
                 {this.userInfo.username || `游客${this.userInfo.userId || ''}`}
               </div>
-              {this.tags.includes('TEACHER') && <img src={IconXueli} />}
-              {this.tags.includes('DEGREE') && <img src={IconJiaozi} />}
+              {this.userInfo.teacherFlag ? <img src={IconXueli} /> : null}
+              {this.userInfo.degreeFlag ? <img src={IconJiaozi} /> : null}
             </div>
             <div class={styles.teacherHonor}>
               <div>勋章：</div>

src/student/teacher-dependent/teacher-follow.tsx

@@ -125,8 +125,10 @@ export default defineComponent({
           }
           break
         case 'DEGREE':
+          status = item.degreeFlag ? true : false
+          break
         case 'TEACHER':
-          status = item.tag.includes(type)
+          status = item.teacherFlag ? true : false
           break
         default:
           status = false

src/student/video-class/video-detail.tsx

@@ -52,8 +52,8 @@ export default defineComponent({
           teacherId: lessonGroup.teacherId,
           lessonCoverUrl: lessonGroup.lessonCoverUrl,
           auditVersion: lessonGroup.auditVersion,
-          isDegree: teachertTag?.includes('DEGREE') || false,
-          isTeacher: teachertTag?.includes('TEACHER') || false
+          isDegree: result.degreeFlag ? true : false,
+          isTeacher: result.teacherFlag ? true : false
         }
         this.detailList = result.detailList || []
       } catch {

src/teacher/live-class/create-components/course.tsx

@@ -52,6 +52,9 @@ export default defineComponent({
       let rate = createState.rate || 0
       let price = createState.live.coursePrice || 0
       return (price - (rate / 100) * price).toFixed(2)
+    },
+    disabled() {
+      return createState.live.courseGroupId ? true : false
     }
   },
   async mounted() {},
@@ -83,7 +86,6 @@ export default defineComponent({
         class={styles.classInfo}
         onSubmit={() => (createState.active = 2)}
         scrollToError
-        disabled={createState.live.courseGroupId ? true : false}
       >
         <ColFieldGroup>
           <ColField title="课程名称" required>
@@ -93,15 +95,16 @@ export default defineComponent({
               maxlength={20}
               placeholder="请输入您的课程名称"
               rules={[{ required: true, message: '请输入您的课程名称' }]}
+              disabled={this.disabled}
             />
           </ColField>
           <ColField title="课程声部" required>
             <Field
-              
               modelValue={this.lessonSubjectName}
               name="subjectId"
               readonly
               isLink
+              disabled={this.disabled}
               onClick={() => {
                 if (createState.live.courseGroupId) {
                   return
@@ -137,6 +140,7 @@ export default defineComponent({
               formatter={this.onFormatterInt}
               type="number"
               maxlength={2}
+              disabled={this.disabled}
               rules={[{ required: true, message: '请输入您的课时数' }]}
               v-slots={{
                 button: () => <span>课时</span>
@@ -148,9 +152,10 @@ export default defineComponent({
               modelValue={createState.live.singleMins}
               name="singleMins"
               readonly
+              disabled={this.disabled}
               isLink
               onClick={() => {
-                if (!createState.live.courseGroupId){
+                if (!createState.live.courseGroupId) {
                   this.classTimeStatus = true
                 }
               }}
@@ -166,6 +171,7 @@ export default defineComponent({
               formatter={this.onFormatter}
               type="number"
               maxlength={8}
+              disabled={this.disabled}
               rules={[{ required: true, message: '请输入您的课程组售价' }]}
               v-slots={{
                 button: () => <span>元</span>