Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/views/faceteach/FaceTeach.vue
#	src/views/faceteach/FaceTeachSignUp.vue
This commit is contained in:
yuping
2023-03-17 03:06:47 +08:00
17 changed files with 220 additions and 131 deletions

View File

@@ -50,7 +50,7 @@
<div class="box" style="width: 80px; right: 0px"></div>
</div>
<div class="teachermain">
<img class="teacherAvatar" :src="teacherInfo.avatar" />
<img class="teacherAvatar" :src="teacherInfo?.avatar" />
<div style="flex: 1; margin-left: 11px; margin-right: 13px">
<div class="teacherName">{{ data.planDto?.teacher }}</div>
<div class="teacherIntro">