diff --git a/pages/learnPath/pathSearch.vue b/pages/learnPath/pathSearch.vue index fa27f8b..44496fa 100644 --- a/pages/learnPath/pathSearch.vue +++ b/pages/learnPath/pathSearch.vue @@ -80,7 +80,7 @@ reach(){ this.bandIndexs = [] this.bandItem = [] - this.indexs = [0] + this.indexs = [] this.posiData = [] this.bandFirst = '' this.bandEnd = '' diff --git a/pages/study/index.vue b/pages/study/index.vue index e372707..1a5d9c6 100644 --- a/pages/study/index.vue +++ b/pages/study/index.vue @@ -64,6 +64,7 @@ + {{task.cmtask_type != 4 ?'定制化学习':'领导力必修'}} @@ -298,7 +299,7 @@ - + @@ -355,8 +356,8 @@ typeData: [ {name: '全部',value: 1}, {name: '领导力必修',value: 2}, - {name: '专业力必修',value: 3}, - {name: '定制化学习',value: 4}, + {name: '定制化学习',value: 3}, + {name: '专业力必修',value: 4}, // {name: '通用力学习',value: 5}, ], statusData: [ @@ -747,6 +748,13 @@ } }else if(task.cmtask_type==3){ taskUrl='/pages/study/loaddetail?id=' + task.cmtask_id + }else if(task.cmtask_type==4){ + let params=encodeURIComponent('projectId='+task.cmtask_id); + if(this.$config.context=='/mobile-release'){ + taskUrl='/pages/forward?to=/student-h5-release/projectdetails¶ms='+params; + }else{ + taskUrl='/pages/forward?to=/student-h5/projectdetails¶ms='+params; + } } uni.navigateTo({ url: taskUrl @@ -773,7 +781,7 @@ if (this.cmtask_name) { params.cmtask_name = this.keyWord; } - if(this.typeListData == 1){ + if(this.typeListData == 2){ if(Object.keys(this.detailData).length){ if(this.boeStatus === '' || this.boeStatus == this.detailData.studyStatus){ this.detailData.cmtask_name = this.detailData.growName @@ -814,6 +822,8 @@ title: '获取任务失败', icon: 'none' }); + this.taskHasMore = false; + this.loadStatus='noMore'; } @@ -1947,11 +1957,25 @@ /deep/ .course-info-left { + position: relative; display: flex; // line-height: 40upx; margin-top: 5px; align-items: center; - + .text{ + position: absolute; + bottom: 10px; + left: 0; + text-align: center; + line-height: 15px; + background-color: #7f7f7f; + font-size: 10px; + opacity: 0.7; + color: #FFFFFF; + z-index: 88; + padding: 1px 5px; + border-radius: 0px 10px 10px 0px; + } uni-image { // width: 152upx; // height: 88upx;