From 766e10128258706ddb872e619968260223f9c8fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Mon, 25 Aug 2025 17:08:28 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BB=98=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  10 +-
 src/api/dialog.js                             |  16 +-
 src/components/course-item/course-item.vue    |  54 +-
 src/components/file-preview/file-preview.vue  |   1 -
 .../image-preview/image-preview.vue           |   2 +-
 src/pages.json                                |   9 +
 src/pages/course/index.vue                    |  92 ++-
 src/pages/index/components/history.vue        |  23 +-
 src/pages/index/dialog.vue                    |  29 +-
 src/pages/search/result.vue                   | 529 ++++++++++++++++++
 src/pagesB.json                               |   9 +
 src/static/images/search/result/ability.png   | Bin 0 -> 739 bytes
 src/static/images/search/result/course.png    | Bin 0 -> 361 bytes
 src/static/images/search/result/exam.png      | Bin 0 -> 529 bytes
 src/static/images/search/result/task.png      | Bin 0 -> 547 bytes
 src/static/images/search/result/test.png      | Bin 0 -> 565 bytes
 16 files changed, 715 insertions(+), 59 deletions(-)
 create mode 100644 src/pages/search/result.vue
 create mode 100644 src/static/images/search/result/ability.png
 create mode 100644 src/static/images/search/result/course.png
 create mode 100644 src/static/images/search/result/exam.png
 create mode 100644 src/static/images/search/result/task.png
 create mode 100644 src/static/images/search/result/test.png

diff --git a/.env.development b/.env.development
index 4ddca13e..35a7cdcd 100644
--- a/.env.development
+++ b/.env.development
@@ -26,11 +26,11 @@ 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 = 'http://25.18.122.65:7001'
 
-VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601'
-VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602'
-VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605'
+# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601'
+# VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602'
+# VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605'
 
 # 王洋洋
-VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.140:9604'
+# VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.140:9604'
 # 于嘉文
-#VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.143:9604'
+# VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.143:9604'
diff --git a/src/api/dialog.js b/src/api/dialog.js
index a4e2bdf7..b4e6e606 100644
--- a/src/api/dialog.js
+++ b/src/api/dialog.js
@@ -11,7 +11,21 @@ export const queryHotQuestionApi = (data) => {
 	});
 };
 // 获取问答历史 
-
+export const queryAskBatchSessionPaging = (data) => {
+	return request({
+		url: '/traask/traAskchatSession/queryAskBatchSessionPaging',
+		method: 'post',
+		data
+	});
+};
+// 问答详情 /traAskchatSession/queryAskHisByBatchIdPaging
+export const queryAskHisByBatchIdPaging = (data) => {
+	return request({
+		url: '/traask/traAskchatSession/queryAskHisByBatchIdPaging',
+		method: 'post',
+		data
+	});
+};
 // 问答反馈 
 export const insertTraAskFeedback = (data) => {
 	return request({
diff --git a/src/components/course-item/course-item.vue b/src/components/course-item/course-item.vue
index e0116c18..2d524475 100644
--- a/src/components/course-item/course-item.vue
+++ b/src/components/course-item/course-item.vue
@@ -1,8 +1,7 @@
 <template>
 	<view class="course-item-box" @click="clickItem">
 		<view class="img-box-view">
-			
-			<ImagePreview class="img-box" :imgId="itemInfo.imgId" :isCache="true" width="340" height="340" mode="aspectFill"></ImagePreview>
+			<ImagePreview class="img-box" :imgId="itemInfo.imgId" :isCache="true" width="225" height="170" mode="aspectFill"></ImagePreview>
 			<view class="item-grade">{{itemInfo.evalGrade}}</view>
 			<!-- <image class="item-grade" mode="aspectFill"></view> -->
 		</view>
@@ -37,8 +36,8 @@
 				})
 			},
 			activeTag:{
-				default: '',
-				type: String
+				default: () => [],
+				type: Array
 			}
 		},
 		data() {
@@ -56,8 +55,8 @@
 		computed:{
 			tagsShowList(){
 				if(!this.activeTag) return this.itemInfo.tagCataList
-				let _arr = this.itemInfo.tagCataList.filter(t=> t.tagId === this.activeTag)
-				let _arr1 = this.itemInfo.tagCataList.filter(t=> t.tagId !== this.activeTag)
+				let _arr = this.itemInfo.tagCataList.filter(t=> this.activeTag.includes(t.tagId))
+				let _arr1 = this.itemInfo.tagCataList.filter(t=> !this.activeTag.includes(t.tagId))
 				return _arr.concat(_arr1)
 			}
 		},
@@ -73,8 +72,9 @@
 .course-item-box{
 	padding: 15rpx;
 	overflow: hidden;
+	width: 100%;
 	.img-box-view{
-		width: 170rpx;
+		width: 225rpx;
 		height: 170rpx;
 		float: left;
 		position: relative;
@@ -82,7 +82,7 @@
 		overflow: hidden;
 		box-shadow: 0 0 10rpx #c3c3c3;
 		.img-box{
-			width: 170rpx;
+			width: 225rpx;
 			height: 170rpx;
 		}
 		.item-grade{
@@ -101,7 +101,7 @@
 		}
 	}
 	.cont-box{
-		width: calc(100% - 170rpx);
+		width: calc(100% - 225rpx);
 		box-sizing: border-box;
 		padding: 0 10rpx 0 20rpx;
 		float: left;
@@ -118,23 +118,25 @@
 			padding-bottom: 0 !important;
 			.item-tag-view{
 				white-space: nowrap;
-						height: 34rpx;
-					.item-tag{
-						height: 32rpx;
-						line-height: 32rpx;
-						font-size: 20rpx;
-						background-color: #eee;
-						color: rgb(51, 51, 51);
-						padding: 0 20rpx;
-						border-radius: 16rpx;
-						margin-right: 20rpx;
-						display: inline-block;
-						white-space: nowrap;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						max-width: 200rpx;
-						box-sizing: border-box;
-					}
+				height: 38rpx;
+				.item-tag{
+					height: 38rpx;
+					line-height: 36rpx;
+					box-sizing: border-box;
+					font-size: 20rpx;
+					background-color: #fff;
+					color: #ffa150;
+					border: 1rpx solid #ffa150;
+					padding: 0 20rpx;
+					border-radius: 8rpx;
+					margin-right: 20rpx;
+					display: inline-block;
+					white-space: nowrap;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					max-width: 200rpx;
+					box-sizing: border-box;
+				}
 			}
 		}
 		.item-publish,
diff --git a/src/components/file-preview/file-preview.vue b/src/components/file-preview/file-preview.vue
index 82924d6b..021e2f00 100644
--- a/src/components/file-preview/file-preview.vue
+++ b/src/components/file-preview/file-preview.vue
@@ -16,7 +16,6 @@
 		ref,
 		onMounted,
 		computed,
-		defineProps,
 		watch
 	} from 'vue'
 	import {
diff --git a/src/components/image-preview/image-preview.vue b/src/components/image-preview/image-preview.vue
index 330050b6..a94bbb57 100644
--- a/src/components/image-preview/image-preview.vue
+++ b/src/components/image-preview/image-preview.vue
@@ -3,7 +3,7 @@
 		<image :src="imgUrlShow"  fit="cover" :mode="mode" @click="showDetail" style="width: 100%;height: 100%;"></image>
 		<uv-overlay :show="showModel" opacity=".6" @click="showModel = false">
 			<view class="overlay-box">
-				<image class="detail-img" :src="imgUrlShow" fit="cover" :mode="mode"></image>
+				<image class="detail-img" :src="imgUrlShow" :mode="mode"></image>
 			</view>
 		</uv-overlay>
 	</view>
diff --git a/src/pages.json b/src/pages.json
index c66ed48b..48d6286b 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -297,6 +297,15 @@
                     "titleNView": false
                 }
             }
+        },
+        {
+            "path": "pages/search/result",
+            "style": {
+                "navigationBarTitleText": "",
+                "app-plus": {
+                    "titleNView": false
+                }
+            }
         }
     ],
     "tabBar": {
diff --git a/src/pages/course/index.vue b/src/pages/course/index.vue
index eabe7308..76693237 100644
--- a/src/pages/course/index.vue
+++ b/src/pages/course/index.vue
@@ -29,14 +29,19 @@
 					<uv-icon class="filter-icon" name="list"/>
 				</view>
 				<view :class="['filter-list',showFilterList?'show':'']">
-					<view class="filter-type" v-for="item in tagsTree" :key="item.value">
-						<!-- .filter(t=>(t.children||[]).length>0) -->
-						<view class="filter-type-title">{{item.label}}</view>
-						<scroll-view :scroll-x="true" class="filter-type-list">
-							<view :class="['filter-type-item', activeTag===itemT.value?'is-active':'']" v-for="itemT in (item.children||[])" @click="chooseTag(itemT)">
-								{{itemT.label}}
-							</view>
-						</scroll-view>
+					<scroll-view :scroll-y="true" class="scroll-box-tags">
+						<view class="filter-type" v-for="item in tagsTree" :key="item.value">
+							<!-- .filter(t=>(t.children||[]).length>0) -->
+							<view class="filter-type-title">{{item.label}}</view>
+							<scroll-view :scroll-x="true" class="filter-type-list">
+								<view :class="['filter-type-item', activeTag.includes(itemT.value)?'is-active':'']" v-for="itemT in (item.children||[])" @click="chooseTag(itemT)">
+									{{itemT.label}}
+								</view>
+							</scroll-view>
+						</view>
+					</scroll-view>
+					<view class="btns-box">
+						<view class="btn-sub" @click="showFilterList = false">确定</view>
 					</view>
 				</view>
 				<uv-scroll-list class="tags-view" :indicator="false">
@@ -45,7 +50,7 @@
 						plain 
 						class="tags-item" 
 						size="mini" 
-						:type="activeTag === ''?'primary':'info'"
+						:type="activeTag.includes('')?'primary':'info'"
 						@click="chooseTag({value:''})"
 					></uv-tags>
 					<uv-tags :text="item.label" 
@@ -53,7 +58,7 @@
 						:key="item.value" 
 						shape="circle" 
 						plain 
-						:type="activeTag === item.value?'primary':'info'"
+						:type="activeTag.includes(item.value)?'primary':'info'"
 						@click="chooseTag(item)"
 						class="tags-item" size="mini"
 					></uv-tags>
@@ -154,7 +159,7 @@ import { onShow } from "@dcloudio/uni-app"
 	const activeTab = ref('全部')
 	const activeCourseType = ref('')
 	const activePrdlineType = ref('')
-	const activeTag = ref('')
+	const activeTag = ref([''])
 	const courseTypeList = ref([])
 	const coursePrdlineList = ref([])
 	const tagsTree = ref([])
@@ -167,8 +172,17 @@ import { onShow } from "@dcloudio/uni-app"
 	const pageTopPadding = computed(() => statusBarHeight + 'px')
 	// 点击标签
 	const chooseTag = (item)=>{
-		activeTag.value = item.value
-		showFilterList.value = false
+		if(!item.value){
+			activeTag.value = ['']
+			return
+		}
+			activeTag.value = activeTag.value.filter((t=>!!t))
+		if(activeTag.value.includes(item.value)){
+			activeTag.value = activeTag.value.filter((t=>t !== item.value))
+		}else{
+			activeTag.value.push(item.value)
+		}
+		// showFilterList.value = false
 	}
 	// 点击生产线分类
 	const changePrdLine = (item)=>{
@@ -194,9 +208,23 @@ import { onShow } from "@dcloudio/uni-app"
 	
 	const courseListBase = ref([])
 	const courseList = computed(()=>{
-		return activeTag.value
-		?courseListBase.value.filter(t=>(t.tagCataList||[]).map(k=>k.tagId).indexOf(activeTag.value)>=0)
-		:courseListBase.value
+		if(activeTag.value.length > 0 && !!activeTag.value[0]){
+			return courseListBase.value.filter(t=>{
+				let _tags = (t.tagCataList||[]).map(k=>k.tagId)
+				let _pass = false
+				activeTag.value.forEach(k => {
+					if(_tags.includes(k)){
+						_pass = true
+					}
+				})
+				return _pass
+			})
+		}else{
+			return courseListBase.value
+		}
+		// return activeTag.value.length > 0
+		// ?courseListBase.value.filter(t=>(t.tagCataList||[]).map(k=>k.tagId).indexOf(activeTag.value)>=0)
+		// :courseListBase.value
 	})
 	// 整理树形
 	const courseListTree =  computed(()=>{
@@ -376,14 +404,20 @@ import { onShow } from "@dcloudio/uni-app"
 					top: 84rpx;
 					left:0;
 					width: 100%;
-					height: 508rpx;
-					overflow-y: auto;
+					height: 588rpx;
+					padding-bottom: 80rpx;
+					overflow-y: hidden;
 					z-index: 2;
 					background-color: #f9f9f9;
 					box-shadow: 0rpx 12rpx 20rpx rgba(160,160,160,.25);
 					border-radius: 0 0 0rpx 0rpx;
-					padding: 0rpx 25rpx;
 					box-sizing: border-box;
+					position: relative;
+					.scroll-box-tags{
+						height: 508rpx;
+						padding: 0rpx 25rpx;
+						box-sizing: border-box;
+					}
 					.filter-type{
 						padding: 10rpx 0;
 						box-sizing: border-box;
@@ -424,6 +458,26 @@ import { onShow } from "@dcloudio/uni-app"
 							margin-top: 20rpx;
 						}
 					}
+					.btns-box{
+						height: 80rpx;
+						position: absolute;
+						background-color: #fff;
+						bottom: 0;
+						left: 0;
+						width: 100%;
+						text-align: center;
+						padding-top: 10rpx;
+						.btn-sub{
+							display: inline-block;
+							text-align: center;
+							background-color: #06f;
+							height: 60rpx;
+							line-height: 60rpx;
+							padding: 0 40rpx;
+							color: #fff;
+							border-radius: 8rpx;
+						}
+					}
 				}
 				.filter-list{
 					display: none;
diff --git a/src/pages/index/components/history.vue b/src/pages/index/components/history.vue
index 0b74fa43..f8ee2aad 100644
--- a/src/pages/index/components/history.vue
+++ b/src/pages/index/components/history.vue
@@ -6,8 +6,8 @@
 				对话记录
 			</view>
 			<view class="history-list">
-				<view class="history-item" v-for="item in 8" @click="chooseHistory(item)">
-					{{'信息补录操作时，需录入什么信息？信息补录操作时，需录入什么信息？'}}
+				<view class="history-item" v-for="item in historyList" :key="item.reqBatch" @click="chooseHistory(item)">
+					{{item.sseContent}}
 				</view>
 			</view>
 		</view>
@@ -20,18 +20,32 @@
 		reactive,
 		computed,
 		onMounted,
-		nextTick 
+		nextTick
 	} from 'vue';
+	import { queryAskBatchSessionPaging } from '@/api/dialog.js'
+	const emit = defineEmits(['showDetail'])
 	
 	const historyPopupRef = ref()
+	const historyList =  ref([])
 	const open = () => {
 		openFeedback(true)
 	}
 	const close = () => {
 		openFeedback()
 	}
-	const openFeedback = (status) => {
+	const pageInfo = ref({
+		page: 1,
+		limit: 20
+	})
+	const getList = async () => {
+		try {
+			const res = await queryAskBatchSessionPaging(pageInfo.value)
+			historyList.value = historyList.value.concat(res.body|| [])
+		}catch{}finally{}
+	}
+	const openFeedback = async (status) => {
 		if (status) {
+			await getList()
 			historyPopupRef.value.open('left')
 		} else {
 			historyPopupRef.value.close()
@@ -39,6 +53,7 @@
 	}
 	const chooseHistory = (item) => {
 		console.log(item)
+		emit('showDetail',item)
 	}
 	defineExpose({
 		open,close
diff --git a/src/pages/index/dialog.vue b/src/pages/index/dialog.vue
index f53e114a..f6c9cbba 100644
--- a/src/pages/index/dialog.vue
+++ b/src/pages/index/dialog.vue
@@ -85,7 +85,7 @@
 				:isDisabled="false" />
 			<!-- 反馈组件 -->
 			<Feedback ref="feedbackRef"></Feedback>
-			<History ref="historyRef"></History>
+			<History ref="historyRef" @showDetail="showHistoryDetail"></History>
 			<PreviewVue ref="previewRef" />
 		</scroll-view>
 	</view>
@@ -134,7 +134,8 @@
 	} from "@/api/common.js"
 	import {
 		queryHotQuestionApi,
-		insertTraAskFeedback
+		insertTraAskFeedback,
+		queryAskHisByBatchIdPaging
 	} from "@/api/dialog.js"
 	import Feedback from './components/feedback.vue'
 	import History from './components/history.vue'
@@ -436,6 +437,30 @@
 	const showHistory = () => {
 		historyRef.value.open()
 	}
+	
+	const showHistoryDetail = (item) => {
+		queryAskHisByBatchIdPaging({
+			batchId: item.reqBatch,
+			page: 1,
+			limit: 100
+		}).then(res=> {
+			console.log(res)
+			talkingList.value = (res.body || []).map((t,index)=> {
+				return {
+					type: t.chatRole === 'TCH'? 'answer':'question',
+					talkingText: t.respContent,
+					isLoading: false,
+					id: t.askId + index,
+					talkingVoice: '',
+					reqBatch: item.reqBatch,
+					intrctWay: '01',  //01-文本；02-语音；03-图片
+					intrctContent: t.respContent,
+					bucketKey: ''
+				}
+			})
+			historyRef.value.close()
+		})
+	}
 	const routerTo = (type) => {
 		switch (type) {
 			case 'AI学':
diff --git a/src/pages/search/result.vue b/src/pages/search/result.vue
new file mode 100644
index 00000000..02d80ee4
--- /dev/null
+++ b/src/pages/search/result.vue
@@ -0,0 +1,529 @@
+<template>
+	<view class="main_div max_page">
+		<view class="fixed_search_div">
+			<view class="back_div" @click="common.navigateBack()">
+				<view class="back-icon"></view>
+			</view>
+			<view class="fixed_search_input_div fl1">
+				<uv-input v-model="inputValue" shape="circle" :customStyle="fixedCustomStyles" confirmType="search"
+					placeholderStyle='color:#999999;font-size:26rpx' placeholder="请输入关键字" :focus="true" :adjust-position="false"
+					@confirm="search">
+					<template #suffix><uv-icon name="search" color="#2c8ef2" size="24" @click="search()"></uv-icon></template>
+				</uv-input>
+			</view>
+		</view>
+		<!-- 主体 -->
+		<view class="search_content">
+			<view class="tabs-view">
+				<uv-tabs :list="tabList" @click="changeTab" :scrollable="false" active-style="font-weight:bold; color:#000;"
+					line-color="#06f"></uv-tabs>
+			</view>
+			<scroll-view class="lists-view" :scroll-y="true">
+				<view class="ability-view model-view">
+					<view class="view-title">
+						<image src="@/static/images/search/result/ability.png" class="view-title-img"></image>
+						功能
+					</view>
+					<view class="view-list">
+						<view class="ability-view-item" v-for="item in abilityListShow" @click="clickAbility(item)">
+							<image class="icon" v-if="item.type === 'course'" src="@/static/images/index/navigation_course.png">
+							</image>
+							<image class="icon" v-if="item.type === 'dialog'"
+								src="@/static/images/index/navigation_question_answering.png"></image>
+							<image class="icon" v-if="item.type === 'test'" src="@/static/images/index/navigation_ai.png"></image>
+							<image class="icon" v-if="item.type === 'task'" src="@/static/images/index/navigation_learning_tasks.png">
+							</image>
+							<image class="icon" v-if="item.type === 'exam'" src="@/static/images/index/navigation_examination.png">
+							</image>
+							<image class="icon" v-if="item.type === 'examTest'" src="@/static/images/index/navigation_practice.png">
+							</image>
+							<image class="icon" v-if="item.type === 'wrong'"
+								src="@/static/images/index/navigation_wrong_question.png"></image>
+							<image class="icon" v-if="item.type === 'analysis'"
+								src="@/static/images/index/navigation_learning_analysis.png"></image>
+							<view class="title">{{item.title}}</view>
+						</view>
+					</view>
+					<view class="view-result" v-show="abilityListShow.length === 0">
+						暂无数据
+					</view>
+				</view>
+
+				<view class="course-view model-view">
+					<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="view-title">
+						<image src="@/static/images/search/result/task.png" class="view-title-img"></image>
+						任务
+					</view>
+					<view class="view-list">
+					</view>
+					<view class="view-result" v-show="taskList.length === 0">
+						暂无数据
+					</view>
+				</view>
+				<view class="test-view model-view" v-if="false">
+					<view class="view-title">
+						<image src="@/static/images/search/result/test.png" class="view-title-img"></image>
+						AI陪练
+					</view>
+					<view class="view-list">
+					</view>
+					<view class="view-result" v-show="testList.length === 0">
+						暂无数据
+					</view>
+				</view>
+				<view class="exam-view model-view">
+					<view class="view-title">
+						<image src="@/static/images/search/result/exam.png" class="view-title-img"></image>
+						考试
+					</view>
+					<view class="view-list">
+					</view>
+					<view class="view-result" v-show="examList.length === 0">
+						暂无数据
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+
+</template>
+
+<script setup>
+	import {
+		ref,
+		watchEffect,
+		nextTick,
+		onMounted,
+		computed
+	} from 'vue';
+	import common from '@/common/common.js'
+	import {
+		onShow
+	} from '@dcloudio/uni-app';
+
+	// 静态样式配置
+	const fixedCustomStyles = {
+		backgroundColor: "#ffffff",
+		paddingLeft: "40rpx",
+		paddingTop: "5px",
+		paddingBottom: "5px",
+		border: "none"
+	}
+	const inputValue = ref('');
+	const searchValue = ref('');
+	const activeTab = ref('')
+	const tabList = ref([{
+			name: '全部',
+			type: 'all'
+		},
+		{
+			name: '功能',
+			type: 'ability'
+		},
+		{
+			name: '课程',
+			type: 'course'
+		},
+		{
+			name: '任务',
+			type: 'task'
+		},
+		{
+			name: 'AI陪练',
+			type: 'test'
+		},
+		{
+			name: '考试',
+			type: 'exam'
+		},
+	])
+	const abilityListShow = computed(() => {
+		if (searchValue.value) {
+			let _arr = abilityList.value.filter(t => t.title.includes(searchValue.value))
+			let _sum = 4 - (_arr.length % 4)
+			if (_sum !== 4) {
+				for (let i = 0; i < _sum; i++) {
+					_arr.push({})
+				}
+			}
+			return _arr
+		} else {
+			return abilityList.value
+		}
+	})
+	const abilityList = ref([{
+			title: 'AI学习',
+			type: 'course',
+			path: '/pages/course/index',
+			isTab: true
+		},
+		{
+			title: 'AI问答',
+			type: 'dialog',
+			path: '/pages/index/dialog',
+			params: {
+				animationType: 'slide-in-bottom'
+			},
+		},
+		{
+			title: 'AI陪练',
+			type: 'test',
+			path: '',
+		},
+		{
+			title: '学习任务',
+			type: 'task',
+			path: '/pages/learningTasks/index',
+		},
+		{
+			title: '考试中心',
+			type: 'exam',
+			path: '/pages/testingHall/index',
+		},
+		{
+			title: '竞赛练习',
+			type: 'examTest',
+			path: '',
+		},
+		{
+			title: '错题本',
+			type: 'wrong',
+			path: '/pages/wrongQuestionRecord/index',
+		},
+		{
+			title: '学习分析',
+			type: 'analysis',
+			path: '',
+		},
+	])
+	const testList = ref([])
+	const taskList = ref([])
+	const examList = ref([])
+	const courseList = ref([{
+            "crsId": "CRS0250640161302025082117515100000063160",
+            "crsNum": "CRS0220",
+            "crsName": "演示课程名称",
+            "tagId": "TRACRSCATALOG02506401613020250708174549000295707",
+            "prdLineId": "TRAPRDLINE02501812207220250714175204000007646",
+            "issuTm": "2025-08-21 17:54:41",
+            "imgId": "S3F0250181220722025082117505700000598881",
+            "imgThumbId": "S3T0250181220722025082117510000000485989",
+            "evalGrade": 10.00,
+            "mtTime": "2025-08-25 09:36:47",
+            "accmStdyCnt": 0,
+            "tagCataList": [
+                {
+                    "crsId": "CRS0250640161302025082117515100000063160",
+                    "tagId": "TRATAGCATALOG02506401613020250616100038000091431",
+                    "tagName": "子标签2",
+                    "tagParentId": "TRATAGCATALOG02506401613020250616100022000071334",
+                    "showOrder": 0
+                },
+                {
+                    "crsId": "CRS0250640161302025082117515100000063160",
+                    "tagId": "TRATAGCATALOG02501812207220250710091040000005889",
+                    "tagName": "全员必学",
+                    "tagParentId": "TRATAGCATALOG02506401613020250616104856000000355",
+                    "showOrder": 0
+                }
+            ]
+        },
+        {
+            "crsId": "CRS0250640161302025082119435100000132546",
+            "crsNum": "CRS0224",
+            "crsName": "测试简答题mq",
+            "tagId": "TRACRSCATALOG02506401613020250708174532000241736",
+            "prdLineId": "TRAPRDLINE02501812207220250714175204000007646",
+            "issuTm": "2025-08-21 19:44:37",
+            "imgId": "S3F0250181220722025082119425800000658876",
+            "imgThumbId": "S3T0250181220722025082119430000000548197",
+            "evalGrade": 10.00,
+            "mtTime": "2025-08-25 09:31:34",
+            "accmStdyCnt": 0,
+            "tagCataList": [
+                {
+                    "crsId": "CRS0250640161302025082119435100000132546",
+                    "tagId": "TRATAGCATALOG02506401613020250616100041000105085",
+                    "tagName": "子标签3",
+                    "tagParentId": "TRATAGCATALOG02506401613020250616100022000071334",
+                    "showOrder": 0
+                },
+                {
+                    "crsId": "CRS0250640161302025082119435100000132546",
+                    "tagId": "TRATAGCATALOG02501812207220250710091040000005889",
+                    "tagName": "全员必学",
+                    "tagParentId": "TRATAGCATALOG02506401613020250616104856000000355",
+                    "showOrder": 0
+                }
+            ]
+        }])
+
+	const changeTab = (item) => {
+		if (!item) return
+		activeTab.value = item.type
+		console.log(item)
+		switch (item.name) {
+			case 'all':
+				break;
+			case 'ability':
+				break;
+			case 'course':
+				break;
+			case 'task':
+				break;
+			case 'test':
+				break;
+			case 'exam':
+				break;
+			default:
+				break;
+		}
+	}
+	const clickAbility = (item) => {
+		if(item.isTab){
+			common.switchTab(item.path)
+		}else{
+			common.navigateTo(item.path,item.params|| {})
+		}
+	}
+	const search = () => {
+		searchValue.value = inputValue.value
+		console.log('search', inputValue.value)
+	}
+	const toCourseDetail = (item)=>{
+		console.log(item)
+	}
+</script>
+
+<style scoped lang="scss">
+	.search_content {
+		height: calc(100% - 94rpx);
+		background-color: #fff;
+		border-radius: 30rpx 30rpx 0 0;
+
+		.tabs-view {
+			height: 84rpx;
+		}
+
+		.lists-view {
+			height: calc(100% - 90rpx);
+			box-sizing: border-box;
+			padding: 24rpx 30rpx;
+
+			.model-view {
+				border: 2px solid #f1f1f1;
+				border-radius: 15rpx;
+				padding: 20rpx 24rpx 24rpx;
+				margin-bottom: 24rpx;
+
+				.view-title {
+					height: 40rpx;
+					line-height: 40rpx;
+					padding-left: 50rpx;
+					position: relative;
+					font-size: 29rpx;
+
+					.view-title-img {
+						position: absolute;
+						left: 5rpx;
+						top: 5rpx;
+						width: 30rpx;
+						height: 30rpx;
+					}
+				}
+
+				.view-list {
+					// overflow: hidden;
+					display: flex;
+					flex-wrap: wrap;
+					justify-content: space-between;
+
+
+					.scroll-view-item {
+						display: inline-block;
+						margin-right: 30rpx;
+						background-color: #ffffff;
+						border-radius: 22rpx;
+						box-shadow: #eaeaea 0 0 6rpx;
+						padding: 32rpx 22rpx 36rpx 26rpx;
+					}
+					&.course-list{
+						margin: 6rpx -20rpx 0;
+					}
+					.course-item {
+						display: flex;
+						.left {
+							border-radius: 16rpx;
+							overflow: hidden;
+							width: 180rpx;
+							height: 146rpx;
+
+							.img {
+								width: 100%;
+								height: 100%;
+							}
+						}
+
+						.right {
+							width: calc(100% - 180rpx);
+							margin-left: 22rpx;
+							display: flex;
+							flex-direction: column;
+							justify-content: space-between;
+
+							.title {
+								width: 100%;
+								font-weight: 500;
+								font-size: 30rpx;
+								color: #333333;
+								line-height: 40rpx;
+								text-align: left;
+								font-style: normal;
+							}
+
+							.note {
+								font-family: PingFangSC, PingFang SC;
+								font-weight: 400;
+								font-size: 23rpx;
+								color: #666666;
+								line-height: 33rpx;
+								text-align: left;
+								font-style: normal;
+
+							}
+
+							.button_div {
+								display: flex;
+								justify-content: flex-end;
+
+
+								.button {
+									text-align: center;
+									line-height: 62rpx;
+									width: 138rpx;
+									height: 62rpx;
+									background: #EBF1FF;
+									border-radius: 30rpx;
+									font-weight: 500;
+									font-size: 30rpx;
+									color: #0066FF;
+									font-style: normal;
+									margin-right: 10rpx;
+								}
+							}
+
+						}
+					}
+
+					.ability-view-item {
+						width: 98rpx;
+						margin-right: 50rpx;
+						float: left;
+						margin-top: 24rpx;
+
+						&:nth-child(4n) {
+							margin-right: 0rpx;
+						}
+
+						.icon {
+							width: 88rpx;
+							height: 86rpx;
+							margin-left: 5rpx;
+						}
+
+						.title {
+							margin-top: 10rpx;
+							font-family: PingFangSC, PingFang SC;
+							font-weight: 400;
+							font-size: 25rpx;
+							white-space: nowrap;
+							line-height: 35rpx;
+							text-align: center;
+						}
+					}
+				}
+
+				.view-result {
+					width: 100%;
+					text-align: center;
+					height: 100rpx;
+					line-height: 100rpx;
+					color: #999;
+				}
+			}
+		}
+	}
+
+	.fixed_search_div {
+		padding: 10rpx 15rpx 24rpx 10rpx;
+		display: flex;
+		align-items: center;
+		height: 94rpx;
+		box-sizing: border-box;
+
+		.back_div {
+			// margin-right: 10rpx;
+			padding: 10rpx 10rpx 10rpx 20rpx;
+
+			// background-color: red;
+			.back-icon {
+				position: relative;
+				width: 40rpx;
+				height: 40rpx;
+				cursor: pointer;
+			}
+
+			.back-icon::before,
+			.back-icon::after {
+				content: '';
+				position: absolute;
+				transition: all 0.3s ease;
+			}
+
+			.back-icon::after {
+				top: 25%;
+				left: 25%;
+				width: 40%;
+				height: 40%;
+				border-top: 4rpx solid #2B2C2E;
+				border-left: 4rpx solid #2B2C2E;
+				transform: rotate(-45deg);
+			}
+		}
+	}
+
+	.main_div {
+		width: 100vw;
+		background: linear-gradient(90deg, #F1F7FF 0%, #D8EDFF 50%, #C3E6FF 100%);
+		padding-top: var(--status-bar-height);
+		height: 100vh;
+		overflow: hidden;
+	}
+</style>
\ No newline at end of file
diff --git a/src/pagesB.json b/src/pagesB.json
index d020e53b..7ac67e83 100644
--- a/src/pagesB.json
+++ b/src/pagesB.json
@@ -34,6 +34,15 @@
 					"titleNView": false
 				}
 			}
+		},
+		{
+			"path": "pages/search/result",
+			"style": {
+				"navigationBarTitleText": "",
+				"app-plus": {
+					"titleNView": false
+				}
+			}
 		}
 	]
 }
\ No newline at end of file
diff --git a/src/static/images/search/result/ability.png b/src/static/images/search/result/ability.png
new file mode 100644
index 0000000000000000000000000000000000000000..bf81184b01217d843fc8f2b630e628998864aa34
GIT binary patch
literal 739
zcmV<90v!E`P)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00001b5ch_0Itp)
z=>Px%ok>JNR7gwhl}$)gQ5462=gst?SS`Y!77>B8h#-PUf<6Q{k<AQ5%Y360K}#X%
zORz|V771;mbd)w(_@*zz2rY^>hMQbkVzkMKBAc>i-ih~ynRMpqT!)sv<-7OX-}#?=
z&i@Mk>C^7m7A(C1vIlqx>62nV{8)Irct11|tw*&MvBH6TC5`Y#Y-ccNU2h%UN+>)G
zvU$$>1R1T9=H!RDF`|j+d60H9q0%Atz=gSc7l7rq6hTE3u}?s?8IT#?JL{wk*RM>l
zvcjY0K|P=v!m`^WRV9r>KMY|-O3MN=yJ`a~t&xH|E0y;Iqz{w_bSoYsvcD7|V101u
zz_h!TuzUdt?&!s{_`Y<Yq^i)0A&|XGRwz6z513iG2`l^@*k}&bDO@S<4*f3ei)_QS
zhRvWlMJ8P*&5z!B3O@tujWShIOgd}wb7%zp2lJ;&6OqecwVDC7OXA6vc}}w^bUw@n
z`i{{PiC|f^s4mob8B|6k?%WIX(m-f2EDtnNS7MXiZm1z0PJr$Pd4)?{nw-hPFkhjs
zvism_Qq{o<XURxQ|Ia{mcaDXarXs(VnXw2}`CjXP)BUO3ooDZ`=g4-%>H~Iy<P#`3
z-1FOUa2v(GKbB9jCwdL!6hh@91(*T3o_l4y=jk;_tzlW;itX(1E7BJ`ipyQYII!f9
z93OZh+8g_WVro;0`?XS<Mt*4`+6i*j7^t*L+__Sg)A)m*h+YLbV+@2#Vmociz~YMK
zUi{^f7S|@<G{1orX5FTW`z<>by|E6Ib7pbA#axueWV<(qFHrWG1?rgC$zA^7dxkGo
z(k#vkpkCt6Gtusb8baZlD4yE{D;3hHj-u`fi9Z<6TU+*NJ6+;Eokr=BxYOyy{ROqy
VVsz<G^<@A6002ovPDHLkV1lzAUH$+7

literal 0
HcmV?d00001

diff --git a/src/static/images/search/result/course.png b/src/static/images/search/result/course.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d721a3597faee1f59dd5df619825e2cc6121037
GIT binary patch
literal 361
zcmV-v0ha!WP)<h;3K|Lk000e1NJLTq000^Q000~a1^@s6e-p3M00001b5ch_0Itp)
z=>Px$BS}O-R7gwhma%FAK@f(&IRwEcNNFPoLI}P=nqZS4<`EL^Uc+awGH5`sOA%5A
z@&XYX4S9i7Ax*k~LAlYrAgJfT8TYojg>9DE`DXszogKl9KpQA+;0!26YnF!)=q1V%
z;92&)<xcQ*3Y=yMF}@9G4isE~bPr?%3{ie;1z<AT1}PuRsWOn6Ey!BBUC;|Xxv&XI
z0?km)>C3B4SX{b4?+f5P^%;d+aWCJoz;5*hkIw##{*y+?34QsBZS^$(x;ZFWROiz9
zT0*JOlW`PPCTHYPj;aY%R<-ld{0YFd-OHdnAhdRB=I07#X5HScOYtO<9&C!OhneJ{
z!}Qv)&ZRp_Iv35!!d1KV=AwZN5t<T-o=r>q3rrB&+{yD2Ly3y;HG!P^00000NkvXX
Hu0mjf6Dpfr

literal 0
HcmV?d00001

diff --git a/src/static/images/search/result/exam.png b/src/static/images/search/result/exam.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4cda33cf0bee18633bf0906b191caafbb072b45
GIT binary patch
literal 529
zcmV+s0`C2ZP)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00001b5ch_0Itp)
z=>Px$%Sl8*R7gwhl|O3~K^Vq=&uq9tTg^oT!B!!=vCv8j3psBSf+=jYw$Lw-F53A8
zB7OlIK@7T^1PiTGc^A-9Q1t$UfHo=wcV01IbT6xS=N=KFQ_ei|{N{aLW=0f@&Bx)<
zFLJlQrV-;H73l_>GXuSnY@u3j+}mZ;UJXww(^Js+V1@&$%zIzU0qs6P=it=3;KaZ-
zLkVpy2W%zboRfPnlt&-28JmK}H<@8uIbb)977bk=B@ir~h#S-2J#)ZL8ZCil_Y#<Z
z;=c+sxGVSo%uBR{EoNR>(V?8E8=T9p{XWuN75dDdg|Rm-@UMm4sm6^Pze=E;M6sl#
z6wu6`0iPtr7@s9pyjfv|pfeK3N&(CFbI3^dKhQGj3fx=p>tIg~_~6QWZ58&g!q_#5
z+ogKA=fM5n!~YfbPvD=v_^ouZ=1e`0Z~xGKC^U;y|9OY7rE1)`RQTf$V_l@}ET5Xe
z>`@Oe_ob<wM5$1vENpwf2!X>np!0Lpi_M2S6?T$n4e9hqfITJ#FDE`epVVb`-d=T=
z!wY6^b^ClH9kyYCoj+1*zQ{)mbd&I^$=w7y4sw6aHN)8OD5;oVI5g9I*X#8aKB@pu
T9ZePA00000NkvXXu0mjfywLGz

literal 0
HcmV?d00001

diff --git a/src/static/images/search/result/task.png b/src/static/images/search/result/task.png
new file mode 100644
index 0000000000000000000000000000000000000000..97959aa7f3675041fb7f785f255de99e3670d09c
GIT binary patch
literal 547
zcmV+;0^I$HP)<h;3K|Lk000e1NJLTq000^Q000~a1^@s6e-p3M00001b5ch_0Itp)
z=>Px$-AP12R7gwBmOW1tQ51%s_p&%vhzKzh7A6{h0I|@*Q0=Vv5ln1tjg9syVQ+!)
z2heC`VP{|=0xqF6u~6d=Fq&9sB8dwax>cBCW};|hR_<op)l*C}?>WysllRU!8o7V9
zcW`Lf%XAGfK(W{~cmq5x?Te<D&fnblQBHBqPYG@ptDl>_PQsPt%l=9FR&lM`5IWQW
zP+D?Z(uMk^YF(9@w+=zFvWBfSrDGijrLZJPCb|N`>}6L#2A{hE%3SvcGc*vd%m^}z
zgfK>c!8~)d0&OR*baZ8W;(a@gEYD9Jamm&@py&6zT#y-GOHp+A*P9&zj34;{dRUd{
z4FY`^y*79%NJ1b6PH+Y|(axs}soj?5zi?e!C*Di^?>jPVS*UK>Z3Y<*V+;}R)yd90
zYH?wk`mlDOeq*}Xs?g{Izd!0@GtbJwt}`%m?$pZo<nvab^1MIo5}p<9C>vV9YBo}K
zNBX-NM!3HL3at^OOLvA1L4T0CfJl|u>I<Zk1!@GPDxR(0l5{6XT|lJKIo}_dz3t#8
zlpRm$qdYfx)|p$#n<E99*hx({p$wEpWyX);cnF2J)x67)E~!7`+~VDXTVI;jfs2CU
lKwqJbjCGUUYkd0XzX8)Ls`RcoIYs~g002ovPDHLkV1k$|_4)t+

literal 0
HcmV?d00001

diff --git a/src/static/images/search/result/test.png b/src/static/images/search/result/test.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b600932e5ede3440d1436675dca2bbd614c03a0
GIT binary patch
literal 565
zcmV-50?Pe~P)<h;3K|Lk000e1NJLTq000^Q000~a1^@s6e-p3M00001b5ch_0Itp)
z=>Px$?@2^KR7gw3mQP3(Q5431-z_SrgjysBx{;tjDvGF0i$JnXsLTHBe2#_d+66+p
zT1PfLcUnueRYuUFO(8}`&?4Ft2)0nLqG#njF{3Zu%Qrrmd6RcHbLX7j{qFtF+#{k<
zurr9;z;VQm_+8dv`~+TO+@PozV!$q7OaLxx?u2-c=n?%ki#U=KWHqhvRs{A7*q$p0
zen%k784{;Y0)4}Hf@lIdH*tO*c!sfrI1lXkck#7Ai@-@jeOz;7H;(amQMHHR>7}U2
zcsj6lU>ew0`T2T~@rVbyRFyNZPe5w|=rf_(s^<FbA>!i3Ab3LyCm2$+9dOkS;E6yx
z6F|#2+8EZCcz(znbIbt8>VYCVj^nt8rwMTrI9kUrvlzE<EaAC^=-td2<zm7uw|B!;
zZJ{D#4o?>&dY4L8pLO7vLbPn`Ix)t5T}cHg2MyRL#^rhi`yDZeC!Hck2gY5*?)r6<
zNlxwH|7wOGz^)ubRHiINil%^bIfI^xf*r>39B9r7Hjn4*>K)T(``O0zxC^odbwOI|
zf>yZ0h!&DAvxbXX4+`uMq8m$T5K&@<#}xIxx{fNJ3f7F{1F$!vq_21mQq+7oPqm`J
zP6017LdxN%3H7Qr2onJz5dG`Y)>a7^B_sg-ZRP#|=@z6%3=+Lh00000NkvXXu0mjf
D6DRxl

literal 0
HcmV?d00001


From 177d2ec07a2303aceccd61e938e2d2ba9052b36b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Mon, 25 Aug 2025 17:30:49 +0800
Subject: [PATCH 2/6] =?UTF-8?q?fix=EF=BC=9B=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                         |  2 +-
 src/pages/course/components/touchBtn.vue | 11 +++++---
 src/pages/search/result.vue              | 33 ++++++++++--------------
 3 files changed, 23 insertions(+), 23 deletions(-)

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",

From 2cf0d805e9c8c978c379b815c00f78d820e28833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Tue, 26 Aug 2025 08:21:04 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E7=BB=93=E6=9E=9C=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development            | 4 ++--
 src/pages/search/result.vue | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.env.development b/.env.development
index 1c623adf..56a590cf 100644
--- a/.env.development
+++ b/.env.development
@@ -27,8 +27,8 @@ VITE_APP_BASE_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'
-# VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602'
+VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601'
+VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602'
 # VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605'
 
 
diff --git a/src/pages/search/result.vue b/src/pages/search/result.vue
index 7cb352ec..ebda95e9 100644
--- a/src/pages/search/result.vue
+++ b/src/pages/search/result.vue
@@ -521,4 +521,7 @@
 		height: 100vh;
 		overflow: hidden;
 	}
+	::v-deep .uv-tabs__wrapper__nav__item__text{
+		white-space: nowrap;
+	}
 </style>
\ No newline at end of file

From 00e5e03b16f1b171dcd7b9243c35f9a55c2ec0be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Tue, 26 Aug 2025 09:15:48 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/search.js                             | 12 +++
 .../learningTasks/components/content-item.vue |  9 +-
 .../learningTasks/components/content.vue      |  2 +
 src/pages/search/result.vue                   | 98 +++++++------------
 src/pages/search/search.vue                   | 10 +-
 .../testingHall/components/content-item.vue   |  3 +-
 src/pages/testingHall/components/content.vue  |  2 +
 7 files changed, 62 insertions(+), 74 deletions(-)
 create mode 100644 src/api/search.js

diff --git a/src/api/search.js b/src/api/search.js
new file mode 100644
index 00000000..17666ef1
--- /dev/null
+++ b/src/api/search.js
@@ -0,0 +1,12 @@
+import request from '@/api/request'
+const base_url = '/traapp'
+
+// 搜索
+export const appSearchCrsApi = (data) => {
+	return request({
+		url: base_url + '/traSearchHis/appSearchCrs',
+		method: 'post',
+		toastErrors: true,
+		data
+	});
+};
diff --git a/src/pages/learningTasks/components/content-item.vue b/src/pages/learningTasks/components/content-item.vue
index 6b08a68a..4922e5d5 100644
--- a/src/pages/learningTasks/components/content-item.vue
+++ b/src/pages/learningTasks/components/content-item.vue
@@ -10,13 +10,11 @@
 				{{ item.taskName }}
 			</view>
 			<view class="time_div" v-if="item.limitTyp === '02'">
-				起止时间：
-				<text class="blod_color">{{ item.startTm?.substr(0, 10) }}至{{ item.endTm?.substr(0, 10) }}</text>
+				起止时间：<text class="blod_color">{{ item.startTm?.substr(0, 10) }}至{{ item.endTm?.substr(0, 10) }}</text>
 			</view>
 			<view class="people_progress_div">
 				<view class="mr-10">
-					完成人数：
-					<text class="">{{ item.taskFinishSums ?? 0 }}/{{ item.taskSums ?? 0 }}</text>
+					完成人数：<text class="">{{ item.taskFinishSums ?? 0 }}/{{ item.taskSums ?? 0 }}</text>
 				</view>
 				<view>
 					进度：
@@ -94,7 +92,7 @@
 	}
 	.item {
 		height: 170rpx;
-		margin: 32rpx 22rpx;
+		margin-top: 32rpx;
 		display: flex;
 
 		.img_div {
@@ -151,6 +149,7 @@
 				flex-wrap: nowrap;
 				height: 23rpx;
 				overflow: hidden;
+				white-space: nowrap;
 			}
 
 			.people_progress_div {
diff --git a/src/pages/learningTasks/components/content.vue b/src/pages/learningTasks/components/content.vue
index 6992c118..d84bc14b 100644
--- a/src/pages/learningTasks/components/content.vue
+++ b/src/pages/learningTasks/components/content.vue
@@ -83,5 +83,7 @@
 		height: calc(100vh - var(--status-bar-height) - 88rpx - 80rpx - 88rpx - 20rpx - 30rpx);
 		background-color: #fff;
 		border-radius: 16rpx;
+		padding: 0 12rpx 0 22rpx;
+		box-sizing: border-box;
 	}
 </style>
diff --git a/src/pages/search/result.vue b/src/pages/search/result.vue
index ebda95e9..f9feb838 100644
--- a/src/pages/search/result.vue
+++ b/src/pages/search/result.vue
@@ -90,7 +90,7 @@
 						考试
 					</view>
 					<view class="view-list">
-						<ExamItem :item="item"  v-for="item in examList"></ExamItem>
+						<ExamItem class="exam-list" :item="item"  v-for="item in examList"></ExamItem>
 					</view>
 					<view class="view-result" v-show="examList.length === 0">
 						暂无数据
@@ -117,12 +117,17 @@
 	import TaskItem from '@/pages/learningTasks/components/content-item.vue';
 	import ExamItem from '@/pages/testingHall/components/content-item.vue';
 	import { onLoad } from '@dcloudio/uni-app';
+	import { appSearchCrsApi } from '@/api/search.js'
 	
 
 	const fromType = ref('')
 	onLoad((params) => {
+		inputValue.value = params.searchName
 		fromType.value = params.from;
 	});
+	onShow(() => {
+		search()
+	});
 	// 静态样式配置
 	const fixedCustomStyles = {
 		backgroundColor: "#ffffff",
@@ -221,64 +226,7 @@
 	const testList = ref([])
 	const taskList = ref([])
 	const examList = ref([])
-	const courseList = ref([{
-            "crsId": "CRS0250640161302025082117515100000063160",
-            "crsNum": "CRS0220",
-            "crsName": "演示课程名称",
-            "tagId": "TRACRSCATALOG02506401613020250708174549000295707",
-            "prdLineId": "TRAPRDLINE02501812207220250714175204000007646",
-            "issuTm": "2025-08-21 17:54:41",
-            "imgId": "S3F0250181220722025082117505700000598881",
-            "imgThumbId": "S3T0250181220722025082117510000000485989",
-            "evalGrade": 10.00,
-            "mtTime": "2025-08-25 09:36:47",
-            "accmStdyCnt": 0,
-            "tagCataList": [
-                {
-                    "crsId": "CRS0250640161302025082117515100000063160",
-                    "tagId": "TRATAGCATALOG02506401613020250616100038000091431",
-                    "tagName": "子标签2",
-                    "tagParentId": "TRATAGCATALOG02506401613020250616100022000071334",
-                    "showOrder": 0
-                },
-                {
-                    "crsId": "CRS0250640161302025082117515100000063160",
-                    "tagId": "TRATAGCATALOG02501812207220250710091040000005889",
-                    "tagName": "全员必学",
-                    "tagParentId": "TRATAGCATALOG02506401613020250616104856000000355",
-                    "showOrder": 0
-                }
-            ]
-        },
-        {
-            "crsId": "CRS0250640161302025082119435100000132546",
-            "crsNum": "CRS0224",
-            "crsName": "测试简答题mq",
-            "tagId": "TRACRSCATALOG02506401613020250708174532000241736",
-            "prdLineId": "TRAPRDLINE02501812207220250714175204000007646",
-            "issuTm": "2025-08-21 19:44:37",
-            "imgId": "S3F0250181220722025082119425800000658876",
-            "imgThumbId": "S3T0250181220722025082119430000000548197",
-            "evalGrade": 10.00,
-            "mtTime": "2025-08-25 09:31:34",
-            "accmStdyCnt": 0,
-            "tagCataList": [
-                {
-                    "crsId": "CRS0250640161302025082119435100000132546",
-                    "tagId": "TRATAGCATALOG02506401613020250616100041000105085",
-                    "tagName": "子标签3",
-                    "tagParentId": "TRATAGCATALOG02506401613020250616100022000071334",
-                    "showOrder": 0
-                },
-                {
-                    "crsId": "CRS0250640161302025082119435100000132546",
-                    "tagId": "TRATAGCATALOG02501812207220250710091040000005889",
-                    "tagName": "全员必学",
-                    "tagParentId": "TRATAGCATALOG02506401613020250616104856000000355",
-                    "showOrder": 0
-                }
-            ]
-        }])
+	const courseList = ref([])
 
 	const changeTab = (item) => {
 		if (!item) return
@@ -308,9 +256,24 @@
 			common.navigateTo(item.path,item.params|| {})
 		}
 	}
+	const pageInfo = ref({
+		page: 1,
+		limit: 3
+	})
 	const search = () => {
 		searchValue.value = inputValue.value
 		console.log('search', inputValue.value)
+		appSearchCrsApi({
+			type: fromType.value === 'course'?'01':'00',//00 首页搜索  01课程搜索 
+			searchName: searchValue.value,
+			page: pageInfo.value.page,
+			limit: pageInfo.value.limit
+		}).then(res=>{
+			console.log(res)
+			examList.value = res.body.traExamPapersExtVoList||[]
+			taskList.value = res.body.traTaskInfoExtVoList||[]
+			courseList.value = res.body.traCrsInfoVoList||[]
+		})
 	}
 	const toCourseDetail = (item)=>{
 		console.log(item)
@@ -353,13 +316,15 @@
 						height: 30rpx;
 					}
 				}
-
+				&.ability-view{
+					.view-list {
+							display: flex;
+							flex-wrap: wrap;
+							justify-content: space-between;
+							}
+				}
 				.view-list {
-					// overflow: hidden;
-					display: flex;
-					flex-wrap: wrap;
-					justify-content: space-between;
-
+					overflow: hidden;
 
 					.scroll-view-item {
 						display: inline-block;
@@ -372,6 +337,9 @@
 					&.course-list{
 						margin: 6rpx -20rpx 0;
 					}
+					.exam-list{
+						border:2rpx solid #e8e8e8;
+					}
 					.course-item {
 						display: flex;
 						.left {
diff --git a/src/pages/search/search.vue b/src/pages/search/search.vue
index 63adc9c0..e11c66fe 100644
--- a/src/pages/search/search.vue
+++ b/src/pages/search/search.vue
@@ -6,9 +6,10 @@
 				<view class="back-icon"></view>
 			</view>
 			<view class="fixed_search_input_div fl1">
-				<uv-input v-model="inputValue" shape="circle" :customStyle="fixedCustomStyles"
-					placeholderStyle='color:#999999;font-size:26rpx' placeholder="请输入关键字" suffixIcon="search"
-					:suffixIconStyle="suffixIconStyle" :focus="true">
+				<uv-input v-model="inputValue" shape="circle" :customStyle="fixedCustomStyles" confirmType="search"
+					placeholderStyle='color:#999999;font-size:26rpx' placeholder="请输入关键字" :focus="true" :adjust-position="false"
+					@confirm="search">
+					<template #suffix><uv-icon name="search" color="#2c8ef2" size="24" @click="search()"></uv-icon></template>
 				</uv-input>
 			</view>
 			<view class="message_div" v-show="false">
@@ -169,6 +170,9 @@
 
 	const measureRef = ref(null)
 	const measureItems = ref([])
+	const search=() => {
+		common.navigateTo('/pages/search/result?searchName='+ inputValue.value +'&from=')
+	}
 </script>
 
 <style scoped lang="scss">
diff --git a/src/pages/testingHall/components/content-item.vue b/src/pages/testingHall/components/content-item.vue
index 853316ed..aebdc57d 100644
--- a/src/pages/testingHall/components/content-item.vue
+++ b/src/pages/testingHall/components/content-item.vue
@@ -78,7 +78,8 @@
 	
 	.item {
 		padding: 30rpx 44rpx 20rpx 38rpx;
-		margin: 0rpx 22rpx 22rpx 22rpx;
+		// margin: 0rpx 22rpx 22rpx 22rpx;
+		margin-top: 22rpx;
 		display: flex;
 		flex-direction: column;
 		background-color: #ffffff;
diff --git a/src/pages/testingHall/components/content.vue b/src/pages/testingHall/components/content.vue
index cf0fdb58..1a264f35 100644
--- a/src/pages/testingHall/components/content.vue
+++ b/src/pages/testingHall/components/content.vue
@@ -117,6 +117,8 @@
 			border-radius: 20rpx 20rpx 0 0;
 			position: relative;
 			padding-top: 22rpx;
+			padding: 0 22rpx;
+			box-sizing: border-box;
 		}
 	}
 </style>

From fed72ae95e921fbbdab70d4190b6d6e68770bf6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Tue, 26 Aug 2025 09:54:19 +0800
Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=E6=90=9C=E7=B4=A2=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/course-item/course-item.vue    |  6 +-
 .../learningTasks/components/content-item.vue |  4 +-
 src/pages/search/result.vue                   | 82 ++++++++++++++-----
 3 files changed, 66 insertions(+), 26 deletions(-)

diff --git a/src/components/course-item/course-item.vue b/src/components/course-item/course-item.vue
index 2d524475..516a9ec5 100644
--- a/src/components/course-item/course-item.vue
+++ b/src/components/course-item/course-item.vue
@@ -54,9 +54,9 @@
 		},
 		computed:{
 			tagsShowList(){
-				if(!this.activeTag) return this.itemInfo.tagCataList
-				let _arr = this.itemInfo.tagCataList.filter(t=> this.activeTag.includes(t.tagId))
-				let _arr1 = this.itemInfo.tagCataList.filter(t=> !this.activeTag.includes(t.tagId))
+				if(!this.activeTag) return this.itemInfo.tagCataList||[]
+				let _arr = (this.itemInfo.tagCataList||[]).filter(t=> this.activeTag.includes(t.tagId))
+				let _arr1 = (this.itemInfo.tagCataList||[]).filter(t=> !this.activeTag.includes(t.tagId))
 				return _arr.concat(_arr1)
 			}
 		},
diff --git a/src/pages/learningTasks/components/content-item.vue b/src/pages/learningTasks/components/content-item.vue
index 4922e5d5..ab9d8c8c 100644
--- a/src/pages/learningTasks/components/content-item.vue
+++ b/src/pages/learningTasks/components/content-item.vue
@@ -18,7 +18,7 @@
 				</view>
 				<view>
 					进度：
-					<text class="">{{ item.finishCrs ?? 0 }}/{{ item.sumCrs ?? 0 }}门课程</text>
+					<text class="">{{ item.finishCrs ?? item.learnedNumber ?? 0 }}/{{ item.sumCrs ?? item.taskNumber ?? 0 }}门课程</text>
 				</view>
 			</view>
 		</view>
@@ -159,7 +159,7 @@
 				font-size: 23rpx;
 				color: #666;
 				margin-bottom: 23rpx;
-
+				white-space: nowrap;
 				line-height: 23rpx;
 				flex-wrap: nowrap;
 				height: 23rpx;
diff --git a/src/pages/search/result.vue b/src/pages/search/result.vue
index f9feb838..4fc9f487 100644
--- a/src/pages/search/result.vue
+++ b/src/pages/search/result.vue
@@ -13,7 +13,7 @@
 			</view>
 		</view>
 		<!-- 主体 -->
-		<view class="search_content">
+		<view class="search_content" v-if="!fromType">
 			<view class="tabs-view">
 				<uv-tabs :list="tabList" @click="changeTab" :scrollable="false" active-style="font-weight:bold; color:#000;"
 					line-color="#06f"></uv-tabs>
@@ -98,6 +98,19 @@
 				</view>
 			</scroll-view>
 		</view>
+		<view class="search_content" v-if="fromType === 'course'">
+			<scroll-view class="lists-view lists-view-course" :scroll-y="true" @scrolltolower="scrolltolower">
+					<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="view-tips">
+							{{hasMore?'滚动加载更多':'加载完成'}}
+						</view>
+					</view>
+					<view class="view-result" v-show="courseList.length === 0">
+						暂无数据
+					</view>
+			</scroll-view>
+		</view>
 	</view>
 
 </template>
@@ -124,6 +137,7 @@
 	onLoad((params) => {
 		inputValue.value = params.searchName
 		fromType.value = params.from;
+		pageInfo.value.limit = fromType.value === 'course'? 15 : 3
 	});
 	onShow(() => {
 		search()
@@ -258,25 +272,44 @@
 	}
 	const pageInfo = ref({
 		page: 1,
-		limit: 3
+		limit: 3,
+		total: 0
 	})
 	const search = () => {
 		searchValue.value = inputValue.value
-		console.log('search', inputValue.value)
+		getData(1)
+	}
+	const getData = (flag=null) => {
+		if(flag){
+			pageInfo.value.page = 1
+			courseList.value = []
+		}
 		appSearchCrsApi({
 			type: fromType.value === 'course'?'01':'00',//00 首页搜索  01课程搜索 
 			searchName: searchValue.value,
 			page: pageInfo.value.page,
 			limit: pageInfo.value.limit
 		}).then(res=>{
-			console.log(res)
-			examList.value = res.body.traExamPapersExtVoList||[]
-			taskList.value = res.body.traTaskInfoExtVoList||[]
-			courseList.value = res.body.traCrsInfoVoList||[]
+			pageInfo.value.total =  res.total || 0
+			courseList.value = courseList.value.concat(res.body.traCrsInfoVoList||[])
+			if(fromType.value !== 'course'){
+				examList.value = res.body.traExamPapersExtVoList||[]
+				taskList.value = res.body.traTaskInfoExtVoList||[]
+			}
 		})
 	}
+	const hasMore = computed(()=> {
+		return (pageInfo.value.limit * pageInfo.value.page) <= pageInfo.value.total
+	})
+	const scrolltolower = () => {
+		if(!hasMore.value){
+			return
+		}
+		pageInfo.value.page += 1
+		getData()
+	}
 	const toCourseDetail = (item)=>{
-		console.log(item)
+    common.navigateTo("/pages/courseDetail/index?crsId=" + item.crsId);
 	}
 </script>
 
@@ -294,7 +327,22 @@
 			height: calc(100% - 90rpx);
 			box-sizing: border-box;
 			padding: 24rpx 30rpx;
-
+			&.lists-view-course{
+				height: 100%;
+			}
+			.view-result {
+				width: 100%;
+				text-align: center;
+				height: 100rpx;
+				line-height: 100rpx;
+				color: #999;
+			}
+			.view-tips{
+				width: 100%;
+				text-align: center;
+				color: #999;
+				font-size: 25rpx;
+			}
 			.model-view {
 				border: 2px solid #f1f1f1;
 				border-radius: 15rpx;
@@ -318,10 +366,10 @@
 				}
 				&.ability-view{
 					.view-list {
-							display: flex;
-							flex-wrap: wrap;
-							justify-content: space-between;
-							}
+						display: flex;
+						flex-wrap: wrap;
+						justify-content: space-between;
+					}
 				}
 				.view-list {
 					overflow: hidden;
@@ -432,14 +480,6 @@
 						}
 					}
 				}
-
-				.view-result {
-					width: 100%;
-					text-align: center;
-					height: 100rpx;
-					line-height: 100rpx;
-					color: #999;
-				}
 			}
 		}
 	}

From 01f070960abed4b15979dff1b3fa348fc1e03150 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Tue, 26 Aug 2025 14:55:09 +0800
Subject: [PATCH 6/6] =?UTF-8?q?feat:=20=E8=80=83=E8=AF=95=E6=8E=92?=
 =?UTF-8?q?=E8=A1=8C=E6=A6=9C=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                |  4 ++--
 src/api/courseDetail.js         |  9 ++++++++
 src/pages/course/index.vue      |  2 +-
 src/pages/examRanking/index.vue | 41 ++++++++++++++++++++++-----------
 src/pages/search/search.vue     | 30 +++++++++++++-----------
 5 files changed, 57 insertions(+), 29 deletions(-)

diff --git a/.env.development b/.env.development
index 56a590cf..1c623adf 100644
--- a/.env.development
+++ b/.env.development
@@ -27,8 +27,8 @@ VITE_APP_BASE_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'
-VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602'
+# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601'
+# VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602'
 # VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605'
 
 
diff --git a/src/api/courseDetail.js b/src/api/courseDetail.js
index 4e5139c9..bd0efd11 100644
--- a/src/api/courseDetail.js
+++ b/src/api/courseDetail.js
@@ -60,4 +60,13 @@ export const publishCrsEvaluation = (data) => {
 };
 
 
+// 考试排行榜/traexam/traCrsPapers/queryTraCrsRankingList
+export const queryTraCrsRankingList = (data) => {
+	return request({
+		url: '/traexam/traCrsPapers/queryTraCrsRankingList',
+		method: 'post',
+		data
+	});
+};
+
 
diff --git a/src/pages/course/index.vue b/src/pages/course/index.vue
index 76693237..d0c93ccc 100644
--- a/src/pages/course/index.vue
+++ b/src/pages/course/index.vue
@@ -303,7 +303,7 @@ import { onShow } from "@dcloudio/uni-app"
 	}
 	// 跳转搜索页
 	const toSearchPage = () => {
-		common.navigateTo('/pages/search/search')
+		common.navigateTo('/pages/search/search?from=course')
 	}
 	// 跳转 课程详情
 	const toCourseDetail = (item) => {
diff --git a/src/pages/examRanking/index.vue b/src/pages/examRanking/index.vue
index 1a8e5f36..2f6c4f25 100644
--- a/src/pages/examRanking/index.vue
+++ b/src/pages/examRanking/index.vue
@@ -22,18 +22,18 @@
 					<view class="score-column">最高分</view>
 				</view>
 				<scroll-view :scroll-y="true" class="scroll-items-view">
-					<view v-for="(item,index) in 60" :class="['list-item', 'item-'+(index+1)]">
+					<view v-for="(item,index) in userList" :class="['list-item', 'item-'+(index+1)]">
 						<view class="rank-column">
-								{{index + 1}}
+							{{item.ranking}}
 						</view>
 						<view class="user-column">
 							<view class="avatar-box">
-								<image-preview class="avatar-image" :imgId="item" mode="aspectFit"></image-preview>
+								<image-preview class="avatar-image" :src="item.ossAddr" mode="aspectFit"></image-preview>
 							</view>
-							<view class="user-name">{{'李想'}}</view>
-							<view class="user-org">{{'吉林银行白城分行'}}</view>
+							<view class="user-name">{{item.userName}}</view>
+							<view class="user-org">{{item.orgName}}</view>
 						</view>
-						<view class="score-column">{{100 - index}}</view>
+						<view class="score-column">{{item.examGrade}}</view>
 					</view>
 				</scroll-view>
 			</view>
@@ -43,16 +43,16 @@
 				</view>
 				<view class="list-item item-me">
 					<view class="rank-column">
-							{{21}}
+							{{userRankObj.ranking}}
 					</view>
 					<view class="user-column">
 						<view class="avatar-box">
-							<image-preview class="avatar-image" :imgId="item" mode="aspectFit"></image-preview>
+							<image-preview class="avatar-image" :src="userRankObj.ossAddr" mode="aspectFit"></image-preview>
 						</view>
-						<view class="user-name">{{'李想'}}</view>
-						<view class="user-org">{{'吉林银行白城分行'}}</view>
+						<view class="user-name">{{userRankObj.userName}}</view>
+						<view class="user-org">{{userRankObj.orgName}}</view>
 					</view>
-					<view class="score-column">{{22}}</view>
+					<view class="score-column">{{userRankObj.examGrade}}</view>
 				</view>
 			</view>
 		</view>
@@ -60,14 +60,29 @@
 </template>
 
 <script>
+	import { queryTraCrsRankingList } from "@/api/courseDetail.js"
 	export default {
 		data() {
 			return {
-
+				crsId:'',
+				userList: [],
+				userRankObj:{}
 			}
 		},
+		onLoad(params){
+			this.crsId = params.crsId
+			this.getList()
+		},
 		methods: {
-
+			getList(){
+				queryTraCrsRankingList({
+					crsId: this.crsId
+				}).then(res=>{
+					console.log(res)
+					this.userList = res.body.rankingListVos||[]
+					this.userRankObj = res.body
+				})
+			}
 		}
 	}
 </script>
diff --git a/src/pages/search/search.vue b/src/pages/search/search.vue
index e11c66fe..4e33ec9d 100644
--- a/src/pages/search/search.vue
+++ b/src/pages/search/search.vue
@@ -56,6 +56,18 @@
 </template>
 
 <script setup>
+	import {
+		ref,
+		watchEffect,
+		nextTick,
+		onMounted
+	} from 'vue';
+	import common from '@/common/common.js'
+	import {
+		onShow,
+		onLoad
+	} from '@dcloudio/uni-app';
+	
 	const tagRefs = ref([]) // 用于存储所有history_item的引用
 	import {
 		getCurrentInstance,
@@ -140,17 +152,6 @@
 	}
 
 
-	import {
-		ref,
-		watchEffect,
-		nextTick,
-		onMounted
-	} from 'vue';
-	import common from '@/common/common.js'
-	import {
-		onShow
-	} from '@dcloudio/uni-app';
-	
 	// 静态样式配置
 	const fixedCustomStyles = {
 		backgroundColor: "#ffffff",
@@ -165,13 +166,16 @@
 	}
 	const inputValue = ref('');
 
-
+	const fromType = ref('')
+	onLoad((params) => {
+		fromType.value = params.from||'';
+	});
 
 
 	const measureRef = ref(null)
 	const measureItems = ref([])
 	const search=() => {
-		common.navigateTo('/pages/search/result?searchName='+ inputValue.value +'&from=')
+		common.navigateTo('/pages/search/result?searchName='+ inputValue.value +'&from=' + fromType.value)
 	}
 </script>