提交冲突修改

src/views/study/coursenew.vue

@@ -180,7 +180,8 @@
             <div class="teacher" v-for="(item, idx) in teachers" :key="idx">
               <div class="teacher-avator">
                 <!-- <div class="teacher-text" v-if="item.authorInfo.avatar == ''">{{userAvatarText(item.teacherName)}}</div> -->
-
+                 <div v-if="item.authorInfo.avatar !== ''">
+                    <el-avatar  :src="fileBaseUrl + item.authorInfo.avatar" shape="circle" :size="50"></el-avatar>
                 </div>
                 <div v-else class="teacher-text">
                   <div v-if="item.authorInfo.sex === 1 "><img src="../../../public/images/Avatarman.png" alt=""></div>
@@ -380,16 +381,7 @@
     },
     methods: {
       Fn1(){
-<<<<<<< .mine
-        //console.log('子组件发生变化');
-        // this.componentKey += 1;
-=======
-        console.log('子组件发生变化');
-        // this.componentKey += 1;
->>>>>>> .theirs
-        // this.$forceUpdate();
-        // window.location.reload()
-
+	    //视频点定位，直接到播放的视频位置
          this.timer = new Date().getTime()
 
       },