细节

pages/learnPath/allPath.vue

@@ -4,7 +4,7 @@
 			<text>专业力必修图</text>
 			<view class="go_to" @click="goSearch">
 				<text class="text">筛选</text>
-				<image class="img" src="../../static/images/learnpath/uotdown.png" mode=""></image>
+				<image class="img" src="../../static/images/search2.png" mode=""></image>
 			</view>
 		</view>
 		<view class="path">
@@ -616,7 +616,7 @@
 			}
 			.img{
 				width: 24rpx;
-				height: 16rpx;
+				height: 24rpx;
 			}
 		}
 	}

pages/study/index.vue

@@ -2,13 +2,13 @@
 	<view style="background-color: #fff;">
 		<view class="listbox-top" style="background-color: #fff;">
 
-			<view class="searchView" v-show="tabIndex===0">
+			<view class="searchView" style="margin-right: 200rpx;" v-show="tabIndex===0">
 				<u-search :clearabled="true" @search="loadBoeData(true)" @clear="loadBoeData(true)"
 					placeholder="搜索关键字" v-model="loadkeyword" :showAction="false" shape="square" bgColor="##F2F5F7">
 				</u-search>
 				<view class="textbtns" @click="()=>{showSearch = true;firstType = 0;endType = 0;boeStatus = '';typeListData=''}">
 					<text>筛选</text> 
-					<!-- <u-icon style="margin-left: 18upx;" name="arrow-down"></u-icon> -->
+					<image style="width: 26rpx;height: 26rpx;margin-left: 10rpx;" src="../../static/images/search.png"></image>
 				</view>
 			</view>
 			<view class="searchView" v-show="tabIndex===1">
@@ -64,7 +64,8 @@
 				<view class="course-info">
 					<view class="course-info-left">
 						<course-image :course="task" width="256upx" height="148upx"></course-image>
-						<view class="text">{{task.cmtask_type != 4 ?'定制化学习':'领导力必修'}}</view>
+						<view v-if="task.taskNum != 14" class="text">{{task.cmtask_type != 4 ?'定制化学习':'领导力必修'}}</view>
+						<view v-else class="text">{{'专业力必修'}}</view>
 						<view class="course-text">
 							<view class="course-title  one-line-ellipsis" style="margin-bottom: auto"><text
 									style="font-size: 32upx; font-weight: 500;" v-html="task.cmtask_name"></text>
@@ -354,10 +355,10 @@
 				endType: 0,
 				typeListData: '',
 				typeData: [
-					{name: '全部',value: 1},
+					{name: '全部',value: 1,data:''},
-					{name: '领导力必修',value: 2},
+					{name: '领导力必修',value: 2,data:0},
-					{name: '定制化学习',value: 3},
+					{name: '专业力必修',value: 3,data:2},
-					{name: '专业力必修',value: 4},
+					{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{