Merge branch 'iteration_1.3.3' into dev

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

@@ -197,8 +197,8 @@ export default defineComponent({
               <div class={styles.teacherInfoName}>
                 {this.userInfo.username || `游客${this.userInfo.userId || ''}`}
               </div>
-              {this.userInfo.teacherFlag ? <img src={IconXueli} /> : null}
-              {this.userInfo.degreeFlag ? <img src={IconJiaozi} /> : null}
+              {this.userInfo.degreeFlag ? <img src={IconXueli} /> : null}
+              {this.userInfo.teacherFlag ? <img src={IconJiaozi} /> : null}
             </div>
             <div class={styles.teacherHonor}>
               <div>勋章：</div>

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

@@ -215,10 +215,10 @@ export default defineComponent({
                       <div class={styles.teacherInfoName}>
                         {item.userName || `游客${item.userId || ''}`}
                       </div>
-                      {this.checkBadge('TEACHER', item.teacher) && (
+                      {this.checkBadge('DEGREE', item.teacher) && (
                         <img src={IconXueli} />
                       )}
-                      {this.checkBadge('DEGREE', item.teacher) && (
+                      {this.checkBadge('TEACHER', item.teacher) && (
                         <img src={IconJiaozi} />
                       )}
                     </div>