From 46f85d8e8c3781d63471b90b6270f3c4722ef932 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Thu, 11 Jul 2024 20:11:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/learnPath/allPath.vue | 4 ++-- pages/study/index.vue | 33 ++++++++++++++++++++++----------- static/images/search.png | Bin 0 -> 5273 bytes static/images/search2.png | Bin 0 -> 4310 bytes 4 files changed, 24 insertions(+), 13 deletions(-) create mode 100644 static/images/search.png create mode 100644 static/images/search2.png 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 @@ - + 筛选 - + @@ -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 0000000000000000000000000000000000000000..eee4c205d61948111e014c773620fb1051d185e9 GIT binary patch literal 5273 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 aos{`}>Llj}VO!uw1&5WH9lFNk3ikhCZ|CFy literal 0 HcmV?d00001