Merge branch 'master' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/portal

src/components/HomePage/homePage.vue

@@ -22,7 +22,7 @@
                       <!-- <div style="float:right"> -->
                        <router-link v-if="pageId == userInfo.aid" to="/user/Setting"><span class="content-one-info pointer" style="line-height: 30px;">个人设置</span></router-link>
                       <span v-if="pageId == userInfo.aid"   style="margin-left:10px;line-height: 30px;" class="content-one-info" ><router-link to="/uc/study/courses" class="pointer" style="color:#0060FF;">个人中心</router-link></span>
-                      <span @click="dialogVisible = true" v-if="teaechswich"  style="margin-left:10px;line-height: 30px;" class="content-one-info">教师简介</span>
+                      <span @click="showTeacherInfo" v-if="teaechswich"  style="margin-left:10px;line-height: 30px;" class="content-one-info">教师简介</span>
                       <span class="content-one-info"  v-if="pageId != userInfo.aid && !isFollowHas" @click="toFollow()">关注TA</span>
                       <span class="Followed"  @click="cancelFollow()" v-if="isFollowHas">已关注</span>
                       <el-button type="text" round  class="btn-user"  >  <router-link :to="'/home/'+pageId+'/leaving'">{{pageId == userInfo.aid ? '留言板':'去留言'}}<i class="el-icon-arrow-right"></i> </router-link> </el-button>
@@ -96,8 +96,6 @@
           <div v-for="(item,idx) in workname" :key="idx" class="teachexcel">
             {{ item }}
           </div>
-
-
         </div>
       </el-dialog>
     </div>
@@ -162,14 +160,14 @@
         }
         this.orgInfo=cutFullName(this.userInfo.departFullName,1);
         this.getSysTypeTree().then(rs => {
-        this.sysTypeListtear = rs;
-      });
+          this.sysTypeListtear = rs;
+        });
         this.loadUserStat();
         if(this.pageId !== this.userInfo.aid) {
           this.followHas();
         }
        this.Teacherprofile();
-       this.Teacherinfo();
+
       },
 
       methods:{
@@ -179,12 +177,16 @@
             getSysTypeTree: 'sysType/getSysTypeTree',
             loadSysTypes: 'sysType/loadSysTypes'
         }),
-        Teacherinfo(){
-          apiTeach.detailTeacher(this.userInfo.aid).then(res =>{
+        showTeacherInfo(){
+          this.loadTeacherinfo();
+          this.dialogVisible = true
+        },
+        loadTeacherinfo(){
+          this.workname=[];
+          apiTeach.detailTeacher(this.pageId).then(res =>{
             this.teachtext.workExperience = res.result.workExperience;
             this.teachtext.courses = res.result.courses;
             this.tearchUrl = this.fileBaseUrl + res.result.photo;
-
             apiBoeTeahcer.simpleInfo(this.userInfo.sysId).then(sinfo=>{
                if(sinfo.status=='200'){
                     if(sinfo.result.courses){
@@ -201,22 +203,20 @@
             })
 
             this.teachtext.expertise = res.result.expertise.split( ',' );
-            //console.log(this.teachtext);
+            //console.log(this.teachtext,"this.teachtext");
+            this.childData=[];
             this.sysTypeListtear.forEach(nm =>{
                 nm.children.forEach(lk =>{
                   this.childData.push(lk);
                 })
-              });
-              this.teachtext.expertise.forEach(item =>{
-              this.childData.forEach(it =>{
-                if(item == it.id){
-                  console.log(item)
-                  this.workname.push(it.name);
-
-
-                }
-
-              })
+            });
+            this.teachtext.expertise.forEach(item =>{
+                this.childData.forEach(it =>{
+                  if(item == it.id){
+                    //console.log(item)
+                    this.workname.push(it.name);
+                  }
+                })
             })
           })
         },

src/views/Index.vue

@@ -1116,7 +1116,7 @@
 
 <style scoped lang="scss">
 .xindex-course-image:hover{
-   transform: scale(1.3);
+   transform: scale(1.3) translateY(-15px);
    transition: all 0.6s;
 }
 .Recent{