diff --git a/pages/study/index.vue b/pages/study/index.vue index 3a30cdd..05b1538 100644 --- a/pages/study/index.vue +++ b/pages/study/index.vue @@ -65,8 +65,7 @@ - {{task.cmtask_type != 4 ?'定制化学习':'领导力必修'}} - {{'专业力必修'}} + {{task.cmtask_type != 4 ?task.cmtask_type == 5?'专业力必修':'定制化学习':'领导力必修'}} @@ -478,20 +477,20 @@ } } }); - getList(this.userInfo.aid).then(res=>{ - if(res.code == 200 ){ - this.detailData = res.data - if(Object.keys(this.detailData).length){ - if(res.data.studyStatus == 1){ - this.detailData.studyStatus = 2 - }else if(res.data.studyStatus == 2){ - this.detailData.studyStatus = 1 - } - this.detailData.cmtask_name = this.detailData.growName - this.detailData.cmtask_user_status = this.detailData.studyStatus - } - } - }) + // getList(this.userInfo.aid).then(res=>{ + // if(res.code == 200 ){ + // this.detailData = res.data + // if(Object.keys(this.detailData).length){ + // if(res.data.studyStatus == 1){ + // this.detailData.studyStatus = 2 + // }else if(res.data.studyStatus == 2){ + // this.detailData.studyStatus = 1 + // } + // this.detailData.cmtask_name = this.detailData.growName + // this.detailData.cmtask_user_status = this.detailData.studyStatus + // } + // } + // }) }, onPullDownRefresh() { this.onReachBottom(); @@ -725,12 +724,12 @@ }, // 学习任务跳转详情 loaddetail(task) { - if('growId' in task){ - uni.navigateTo({ - url:'/pages/learnPath/growPage' - }) - return - } + // if('growId' in task){ + // uni.navigateTo({ + // url:'/pages/learnPath/growPage' + // }) + // return + // } // uni.navigateTo({ // url: '/pages/study/loaddetail?id=' + task.cmtask_id // }); @@ -759,6 +758,8 @@ }else{ taskUrl='/pages/forward?to=/student-h5/projectdetails¶ms='+params; } + }else if(task.cmtask_type==5){ + taskUrl='/pages/learnPath/growPage' } uni.navigateTo({ url: taskUrl @@ -785,16 +786,16 @@ if (this.cmtask_name) { params.cmtask_name = this.keyWord; } - if(this.typeListData == 2){ - if(Object.keys(this.detailData).length){ - if(this.boeStatus === '' || this.boeStatus == this.detailData.studyStatus){ - this.couresList.push(this.detailData) - } - } - this.taskHasMore = true; - this.loadStatus='noMore'; - return - } + // if(this.typeListData == 2){ + // if(Object.keys(this.detailData).length){ + // if(this.boeStatus === '' || this.boeStatus == this.detailData.studyStatus){ + // this.couresList.push(this.detailData) + // } + // } + // this.taskHasMore = true; + // this.loadStatus='noMore'; + // return + // } apiManage.userTaskList(params).then(res => { if(res.code==200){ @@ -807,9 +808,9 @@ }) this.taskCount = parseInt(res.data.total); this.couresList.push(...res.data.records); - if(Object.keys(this.detailData).length&&this.detailData.growName.includes(this.loadkeyword)&&(this.boeStatus===''||this.detailData.studyStatus==this.boeStatus)){ - this.couresList.unshift(this.detailData) - } + // if(Object.keys(this.detailData).length&&this.detailData.growName.includes(this.loadkeyword)&&(this.boeStatus===''||this.detailData.studyStatus==this.boeStatus)){ + // this.couresList.unshift(this.detailData) + // } if (this.taskCount > this.taskPageIndex * this.taskPageSize) { this.taskHasMore = true; this.loadStatus='more';