diff --git a/pages/learnPath/allPath.vue b/pages/learnPath/allPath.vue
index 5928207..a2418ae 100644
--- a/pages/learnPath/allPath.vue
+++ b/pages/learnPath/allPath.vue
@@ -4,7 +4,7 @@
专业力必修图
筛选
-
+
@@ -616,7 +616,7 @@
}
.img{
width: 24rpx;
- height: 16rpx;
+ height: 24rpx;
}
}
}
diff --git a/pages/study/index.vue b/pages/study/index.vue
index 1a5d9c6..a5ec53f 100644
--- a/pages/study/index.vue
+++ b/pages/study/index.vue
@@ -2,13 +2,13 @@
-
+
{showSearch = true;firstType = 0;endType = 0;boeStatus = '';typeListData=''}">
筛选
-
+
@@ -64,7 +64,8 @@
- {{task.cmtask_type != 4 ?'定制化学习':'领导力必修'}}
+ {{task.cmtask_type != 4 ?'定制化学习':'领导力必修'}}
+ {{'专业力必修'}}
@@ -354,10 +355,10 @@
endType: 0,
typeListData: '',
typeData: [
- {name: '全部',value: 1},
- {name: '领导力必修',value: 2},
- {name: '定制化学习',value: 3},
- {name: '专业力必修',value: 4},
+ {name: '全部',value: 1,data:''},
+ {name: '领导力必修',value: 2,data:0},
+ {name: '专业力必修',value: 3,data:2},
+ {name: '定制化学习',value: 4,data:1},
// {name: '通用力学习',value: 5},
],
statusData: [
@@ -485,6 +486,8 @@
}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
}
}
})
@@ -520,7 +523,7 @@
methods: {
activeItem(item){
this.firstType = item.value - 1
- this.typeListData = item.value - 2
+ this.typeListData = item.data
},
activeItemTwo(item){
this.endType = item.value - 1
@@ -784,8 +787,6 @@
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
- this.detailData.cmtask_user_status = this.detailData.studyStatus
this.couresList.push(this.detailData)
}
}
@@ -805,6 +806,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 (this.taskCount > this.taskPageIndex * this.taskPageSize) {
this.taskHasMore = true;
this.loadStatus='more';
@@ -1543,8 +1547,15 @@
border-radius: 76upx !important;
}
.textbtns{
+ width: 146rpx;
position: absolute;
- right: -42px;
+ right: -172rpx;
+ top: 4rpx;
+ color: #ffffff;
+ background-color: #3162FA;
+ display: flex;
+ justify-content: center;
+ align-items: center;
}
}
.course-aut{
diff --git a/static/images/search.png b/static/images/search.png
new file mode 100644
index 0000000..eee4c20
Binary files /dev/null and b/static/images/search.png differ
diff --git a/static/images/search2.png b/static/images/search2.png
new file mode 100644
index 0000000..fa55547
Binary files /dev/null and b/static/images/search2.png differ