diff --git a/.env.development b/.env.development
index 944ebd06..1c623adf 100644
--- a/.env.development
+++ b/.env.development
@@ -24,7 +24,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
 # 线上
 
 # VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7001'
-VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7001'
+VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
 
 
 # VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601'
diff --git a/src/pages/course/components/touchBtn.vue b/src/pages/course/components/touchBtn.vue
index 435ba539..0e295099 100644
--- a/src/pages/course/components/touchBtn.vue
+++ b/src/pages/course/components/touchBtn.vue
@@ -5,7 +5,7 @@
 		</view>
 		<view class="touch-btn" v-if="keyboardIsShow">
 			<uv-input class="input-box" ref="inputRef" v-model="answerValue" :maxlength="props.textValueLength"
-				:adjustPosition="false" placeholderStyle='color:#999999;font-size:26rpx' placeholder="请输入文字">
+				:adjustPosition="adjustPosition" placeholderStyle='color:#999999;font-size:26rpx' placeholder="请输入文字">
 			</uv-input>
 		</view>
 		<view class="talk-btn-box" v-show="!onlyVoice">
@@ -86,11 +86,16 @@
 		textValueLength: {
 			type: Number,
 			default: 500
-		}
+		},
+		adjustPosition: {
+			default: false,
+			type: Boolean
+		},
 	})
 	const {
 		isDisabled,
-		onlyVoice
+		onlyVoice,
+		adjustPosition
 	} = toRefs(props)
 	const isLoadingState = computed(() => props.isLoading)
 
diff --git a/src/pages/search/result.vue b/src/pages/search/result.vue
index 02d80ee4..7cb352ec 100644
--- a/src/pages/search/result.vue
+++ b/src/pages/search/result.vue
@@ -19,7 +19,7 @@
 					line-color="#06f"></uv-tabs>
 			</view>
 			<scroll-view class="lists-view" :scroll-y="true">
-				<view class="ability-view model-view">
+				<view class="ability-view model-view" v-show="!fromType || fromType === 'ability'">
 					<view class="view-title">
 						<image src="@/static/images/search/result/ability.png" class="view-title-img"></image>
 						功能
@@ -49,39 +49,25 @@
 					</view>
 				</view>
 
-				<view class="course-view model-view">
+				<view class="course-view model-view" v-show="!fromType || fromType === 'course'">
 					<view class="view-title">
 						<image src="@/static/images/search/result/course.png" class="view-title-img"></image>
 						课程
 					</view>
 					<view class="view-list course-list">
 						<course-item class="course-item" v-for="itemC in courseList" :key="itemC.crsNum" :itemInfo="itemC" @clickItem="toCourseDetail(itemC)"/>
-						<!-- <view class="course-item" v-for="(item,index) in courseList">
-							<view class="left">
-								<image-preview class="img-box img" :imgId="item.imgId" mode="aspectFill" :isCache="true" :width="240"
-									:height="240"></image-preview>
-							</view>
-							<view class="right">
-								<view class="title ellipsis-text">{{item.crsName}}</view>
-								<view class="tags ellipsis-text">
-									
-								</view>
-								<view class="note ellipsis-text">
-									更新：{{(item.mtTime||'').substr(0, 10)}} 丨已学：{{item.accmStdyCnt}}
-								</view>
-							</view>
-						</view> -->
 					</view>
 					<view class="view-result" v-show="courseList.length === 0">
 						暂无数据
 					</view>
 				</view>
-				<view class="task-view model-view">
+				<view class="task-view model-view" v-show="!fromType || fromType === 'task'">
 					<view class="view-title">
 						<image src="@/static/images/search/result/task.png" class="view-title-img"></image>
 						任务
 					</view>
 					<view class="view-list">
+						<TaskItem :item="item"  v-for="(item, index) in taskList"></TaskItem>
 					</view>
 					<view class="view-result" v-show="taskList.length === 0">
 						暂无数据
@@ -98,12 +84,13 @@
 						暂无数据
 					</view>
 				</view>
-				<view class="exam-view model-view">
+				<view class="exam-view model-view" v-show="!fromType || fromType === 'exam'">
 					<view class="view-title">
 						<image src="@/static/images/search/result/exam.png" class="view-title-img"></image>
 						考试
 					</view>
 					<view class="view-list">
+						<ExamItem :item="item"  v-for="item in examList"></ExamItem>
 					</view>
 					<view class="view-result" v-show="examList.length === 0">
 						暂无数据
@@ -127,7 +114,15 @@
 	import {
 		onShow
 	} from '@dcloudio/uni-app';
+	import TaskItem from '@/pages/learningTasks/components/content-item.vue';
+	import ExamItem from '@/pages/testingHall/components/content-item.vue';
+	import { onLoad } from '@dcloudio/uni-app';
+	
 
+	const fromType = ref('')
+	onLoad((params) => {
+		fromType.value = params.from;
+	});
 	// 静态样式配置
 	const fixedCustomStyles = {
 		backgroundColor: "#ffffff",