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

src/components/HomePage/homePage.vue

@@ -166,7 +166,7 @@
         if(this.pageId !== this.userInfo.aid) {
           this.followHas();
         }
-       this.Teacherprofile();
+       this.teacherProfile();
 
       },
 
@@ -186,8 +186,14 @@
           apiTeach.detailTeacher(this.pageId).then(res =>{
             this.teachtext.workExperience = res.result.workExperience;
             this.teachtext.courses = res.result.courses;
+            if(res.result.photo){
               this.tearchUrl = this.fileBaseUrl + res.result.photo;
-            apiBoeTeahcer.simpleInfo(this.userInfo.sysId).then(sinfo=>{
+            }else{
+              this.tearchUrl ='';
+            }
+
+            //通过用户的sysId（原系统中的kid）去取用户
+            apiBoeTeahcer.simpleInfo(res.result.sysId).then(sinfo=>{
                if(sinfo.status=='200'){
                     if(sinfo.result.courses){
                       this.teachtext.courses = sinfo.result.courses;
@@ -220,8 +226,8 @@
             })
           })
         },
-        Teacherprofile(){
+        teacherProfile(){ //检查是否是教师
-          apiTeach.has(this.userInfo.aid).then(res =>{
+          apiTeach.has(this.pageId).then(res =>{
             this.teaechswich = res.result.isTeacher;
           })
         },

src/views/user/Setting.vue

@@ -333,7 +333,7 @@
     },
     computed: {
 
-      ...mapGetters(['userInfo','sysTypeMap']),
+      ...mapGetters(['userInfo','sysTypeMap','identity']),
       avatar(){
         if(this.userInfo.avatar){
           if(this.userInfo.avatar.indexOf('http')==-1){
@@ -383,15 +383,17 @@
         // console.log(rs);
         this.sysTypeListtear = rs;
       });
-      this.Teacherprofile();
+      //this.Teacherprofile();
-      this.Teacherinfo();
+      if(this.identity == 2 || this.identity == 5){
+         this.teaechswich=true;
+         this.loadTeacherinfo();
+      }
     },
     methods:{
       gettearch(){
         // console.log(this.checkboxtearGroup,'lmj');
       },
-
+      loadTeacherinfo(){
-      Teacherinfo(){
           this.workname=[];
           this.checkboxtearGroup=[];
           apiTeach.detailTeacher(this.userInfo.aid).then(res =>{
@@ -440,11 +442,11 @@
             })
           })
         },
-      Teacherprofile(){
+      // Teacherprofile(){
-          apiTeach.has(this.userInfo.aid).then(res =>{
+      //     apiTeach.has(this.userInfo.aid).then(res =>{
-            this.teaechswich = res.result.isTeacher;
+      //       this.teaechswich = res.result.isTeacher;
-          })
+      //     })
-        },
+      //   },
       // 保存个人主页选项的编辑
       saveHideHome(){
          //执行隐藏操作