diff --git a/api/ajax.js b/api/ajax.js index 7d54f24..0742a23 100644 --- a/api/ajax.js +++ b/api/ajax.js @@ -92,7 +92,7 @@ const jsonRequest=function(method,url,data){ header: headers, success:function(rs,statusCode){ if(rs.statusCode==200 || rs.code.code == 200){ - if(rs.data.status==401 || rs.data.status==402 || rs.data.data.status==401){ + if(rs.data.status==401 || rs.data.status==402 || (rs.data.data && rs.data.data.status==401)){ removeToken(); toLogin(reUrl); // let loginPath=config.loginPath; diff --git a/pages/lecturer/certification/info.vue b/pages/lecturer/certification/info.vue index f369548..535a9e4 100644 --- a/pages/lecturer/certification/info.vue +++ b/pages/lecturer/certification/info.vue @@ -182,8 +182,7 @@ }).then(res => { console.log('res::',res) if (res.code == 200 && res.data) { - - this.lecturersInfo = res.data || {} + this.lecturersInfo = res.data.examineTeacher || {} //this.lecturersInfo.scores="" //"1,2,3,1,2,3,1,2,3" if(this.lecturersInfo.scores&&this.lecturersInfo.scores.length>1){ this.scoreDisabled = true diff --git a/pages/lecturer/certification/list.vue b/pages/lecturer/certification/list.vue index c16dd4e..2b17e87 100644 --- a/pages/lecturer/certification/list.vue +++ b/pages/lecturer/certification/list.vue @@ -26,7 +26,8 @@ {{itemes.score}}分 {{itemes.score}}分 - 去评分 + 去评分 + 已结束 @@ -42,6 +43,7 @@ data() { return { lecturersList: '', + examineResult: '', imageBaseUrl: config.fileUrl } }, @@ -58,6 +60,7 @@ reviewId: this.reviewId }).then(res => { if (res.code == 200) { + this.examineResult = res.data.examineResult this.lecturersList = res.data.list } else { this.lecturersList = [] @@ -68,6 +71,10 @@ }, methods:{ gotoInfo(item){ + if(this.examineResult==1&&!item.score){ + this.$refs.uToast.show({message:"该评审已结束",type:'error'}); + return + } uni.navigateTo({ url:'/pages/lecturer/certification/info?reviewId='+this.reviewId+'&teacherId='+item.id })