From 189b03feac0f22aef843d2bd4869606ed19c7995 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E8=88=AA?= <icho.yang@scai-global.com>
Date: Wed, 28 Jan 2026 17:46:24 +0800
Subject: [PATCH] =?UTF-8?q?JLBA202505130001=5F=E5=85=B3=E4=BA=8E=E5=90=89?=
 =?UTF-8?q?=E6=9E=97=E9=93=B6=E8=A1=8C=E6=96=B0=E5=BB=BAAI=E6=99=BA?=
 =?UTF-8?q?=E8=83=BD=E5=9F=B9=E8=AE=AD=E7=B3=BB=E7=BB=9F=E7=9A=84=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=5F=E9=A6=96=E9=A1=B5=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development.yh                           |  6 +-
 .../index/components/todo-com/course.vue      | 14 ++--
 src/pages/index/components/todo-com/exam.vue  | 10 +--
 src/pages/index/components/todo-com/pk.vue    |  8 +--
 .../index/components/todo-com/sparring.vue    |  8 +--
 src/pages/index/components/todo-com/task.vue  | 14 ++--
 src/pages/index/components/todo-item.vue      | 18 ++---
 src/pages/index/components/todo.vue           | 67 ++++++++++++++++++-
 8 files changed, 99 insertions(+), 46 deletions(-)

diff --git a/.env.development.yh b/.env.development.yh
index e5b3101e..1a097a0e 100644
--- a/.env.development.yh
+++ b/.env.development.yh
@@ -2,14 +2,14 @@
 ENV = 'development.yh'
 # 'development.yh'
 
-# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
+VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
 
-VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786'
+# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786'
 # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786'
 # VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
 # VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.32.154:9604'
 # VITE_APP_BASE_H5_API_Url_TRAPRACTICE = 'http://25.64.32.156:9603'
-# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.154:9601'
+VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.154:9601'
 # VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.32.158:9601'
 # VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.32.154:9602'
 # VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.32.157:9605'
diff --git a/src/pages/index/components/todo-com/course.vue b/src/pages/index/components/todo-com/course.vue
index e1302f00..1b13c686 100644
--- a/src/pages/index/components/todo-com/course.vue
+++ b/src/pages/index/components/todo-com/course.vue
@@ -1,14 +1,14 @@
 <template>
 	<view class="table-item custom-todo-item">
-		<view :class="['item-status', dataInfo.status === '11' ? '' : 'in-progress']">
-			{{dataInfo.status === '11' ? '未开始' :'进行中'}}</view>
+		<view :class="['item-status', dataInfo.crsStatName === '未开始' ? '' : 'in-progress']">
+			{{dataInfo.crsStatName}}</view>
 		<view class="item-title">
 			<view class="item-type course-type">课程</view>
-			<view class="item-name">卡拉华师大击杀看来是打算报考打不上卡了卡拉华师大击杀看来是打算报考打不上卡了</view>
+			<view class="item-name">{{dataInfo.name}}</view>
 		</view>
 		<view class="item-info">
-			<view class="item-info-item inline-item">更新：{{'2026-01-02'}}</view>
-			<view class="item-info-item inline-item">已学：{{'454'}}</view>
+			<view class="item-info-item inline-item">更新：{{dataInfo.mtTime}}</view>
+			<view class="item-info-item inline-item">已学：{{dataInfo.accmCnt}}</view>
 		</view>
 		<view class="item-btn">去学习</view>
 	</view>
@@ -17,9 +17,7 @@
 <script setup>
 	const props = defineProps({
 		dataInfo: {
-			default: () => ({
-				type: 1
-			}),
+			default: () => ({}),
 			type: Object
 		}
 	})
diff --git a/src/pages/index/components/todo-com/exam.vue b/src/pages/index/components/todo-com/exam.vue
index 9c13c5ed..cee9a852 100644
--- a/src/pages/index/components/todo-com/exam.vue
+++ b/src/pages/index/components/todo-com/exam.vue
@@ -1,14 +1,14 @@
 <template>
 	<view class="table-item custom-todo-item">
-		<view :class="['item-status', dataInfo.status === '11' ? '' : 'in-progress']">
-			{{dataInfo.status === '11' ? '未开始' :'进行中'}}</view>
+		<view :class="['item-status', dataInfo.crsStatName === '未开始' ? '' : 'in-progress']">
+			{{dataInfo.crsStatName}}</view>
 		<view class="item-title">
 			<view class="item-type exam-type">考试</view>
-			<view class="item-name">卡拉华师大击杀看来是打算报考打不上卡了</view>
+			<view class="item-name">{{dataInfo.name}}</view>
 		</view>
 		<view class="item-info">
-			<view class="item-info-item">起止时间：<text class="color-blue">{{'2026-01-02'}}</text></view>
-			<view class="item-info-item">完成人数：<text class="color-black">{{'202'}}/{{3033}}</text></view>
+			<view class="item-info-item">起止时间：<text class="color-blue">{{dataInfo.startTm}}至{{dataInfo.endTm}}</text></view>
+			<view class="item-info-item">完成人数：<text class="color-black">{{dataInfo.realPersionNumber}}/{{dataInfo.planPersionNumber}}</text></view>
 		</view>
 		<view class="item-btn">去考试</view>
 	</view>
diff --git a/src/pages/index/components/todo-com/pk.vue b/src/pages/index/components/todo-com/pk.vue
index 68777730..3ac32e4d 100644
--- a/src/pages/index/components/todo-com/pk.vue
+++ b/src/pages/index/components/todo-com/pk.vue
@@ -1,13 +1,13 @@
 <template>
 	<view class="table-item custom-todo-item">
-		<view :class="['item-status', dataInfo.status === '11' ? '' : 'in-progress']">
-			{{dataInfo.status === '11' ? '未开始' :'进行中'}}</view>
+		<view :class="['item-status', dataInfo.crsStatName === '未开始' ? '' : 'in-progress']">
+			{{dataInfo.crsStatName}}</view>
 		<view class="item-title">
 			<view class="item-type pk-type">竞赛</view>
-			<view class="item-name">卡拉华师大击杀看来是打算报考打不上卡了</view>
+			<view class="item-name">{{dataInfo.name}}</view>
 		</view>
 		<view class="item-info">
-			<view class="item-info-item">起止时间：<text class="color-blue">{{'2026-01-02'}}</text></view>
+			<view class="item-info-item">起止时间：<text class="color-blue">{{dataInfo.startTm}}至{{dataInfo.endTm}}</text></view>
 		</view>
 		<view class="item-btn">去竞赛</view>
 	</view>
diff --git a/src/pages/index/components/todo-com/sparring.vue b/src/pages/index/components/todo-com/sparring.vue
index f5132ed3..64156188 100644
--- a/src/pages/index/components/todo-com/sparring.vue
+++ b/src/pages/index/components/todo-com/sparring.vue
@@ -1,15 +1,15 @@
 <template>
 	<view class="table-item custom-todo-item">
-		<view :class="['item-status', dataInfo.status === '11' ? '' : 'in-progress']">
-			{{dataInfo.status === '11' ? '未开始' :'进行中'}}</view>
+		<view :class="['item-status', dataInfo.crsStatName === '未开始' ? '' : 'in-progress']">
+			{{dataInfo.crsStatName}}</view>
 		<view class="item-title">
 			<view class="item-type sparring-type">陪练</view>
-			<view class="item-name">卡拉华师大击杀看来是打算报考打不上卡了</view>
+			<view class="item-name">{{dataInfo.name}}</view>
 		</view>
 		<view class="item-info">
 			<view class="item-info-item">截止时间：<text
 					class="color-blue">{{dataInfo.limitTyp === '01' ? '不限制' : dataInfo.endTm}}</text></view>
-			<view class="item-info-item">陪练次数：<text class="color-black">{{3033}}</text></view>
+			<view class="item-info-item">陪练次数：<text class="color-black">{{dataInfo.accmCnt}}</text></view>
 		</view>
 		<view class="item-btn">去陪练</view>
 	</view>
diff --git a/src/pages/index/components/todo-com/task.vue b/src/pages/index/components/todo-com/task.vue
index 300d8ce6..7e19ae7a 100644
--- a/src/pages/index/components/todo-com/task.vue
+++ b/src/pages/index/components/todo-com/task.vue
@@ -1,23 +1,23 @@
 <template>
 	<view class="table-item custom-todo-item">
-		<view :class="['item-status', dataInfo.status === '11' ? '' : 'in-progress']">
-			{{dataInfo.status === '11' ? '未开始' :'进行中'}}</view>
+		<view :class="['item-status', dataInfo.crsStatName === '未开始' ? '' : 'in-progress']">
+			{{dataInfo.crsStatName}}</view>
 		<view class="item-title">
 			<view class="item-type task-type">任务</view>
-			<view class="item-name">卡拉华师大击杀看来是打算报考打不上卡了</view>
+			<view class="item-name">{{dataInfo.name}}</view>
 		</view>
 		<view class="item-info">
-			<view class="item-info-item">起止时间：<text class="color-blue">{{'2026-01-02'}}至{{'2026-01-02'}}</text></view>
+			<view class="item-info-item">起止时间：<text class="color-blue">{{dataInfo.startTm}}至{{dataInfo.endTm}}</text></view>
 			<view class="item-info-item inline-item">
-				完成人数：<text class="color-black">{{'202'}}/{{3033}}</text>
+				完成人数：<text class="color-black">{{dataInfo.realPersionNumber}}/{{dataInfo.planPersionNumber}}</text>
 			</view>
 			<view class="item-info-item inline-item">
 				<view class="bg-block inline-item">
 					<view class="bg-gray">
-						<view class="bg-blue" :style="`width: ${2/4 * 100}%;`"></view>
+						<view class="bg-blue" :style="`width: ${32}%;`"></view>
 					</view>
 				</view>
-				<view class="color-blue inline-item">{{'32'}}%</view>
+				<view class="color-blue inline-item">{{32}}%</view>
 			</view>
 		</view>
 		<view class="item-btn">做任务</view>
diff --git a/src/pages/index/components/todo-item.vue b/src/pages/index/components/todo-item.vue
index 1cbbe9a2..413f2173 100644
--- a/src/pages/index/components/todo-item.vue
+++ b/src/pages/index/components/todo-item.vue
@@ -1,9 +1,9 @@
 <template>
-	<taskCom v-if="itemIndex === 1" :dataInfo="props.dataInfo"/>
-	<pkCom v-else-if="itemIndex === 2" :dataInfo="props.dataInfo"/>
-	<sparringCom v-else-if="itemIndex === 3" :dataInfo="props.dataInfo"/>
-	<examCom v-else-if="itemIndex === 4" :dataInfo="props.dataInfo"/>
-	<courseCom v-else-if="itemIndex === 5" :dataInfo="props.dataInfo"/>
+	<taskCom v-if="dataInfo.type === '04'" :dataInfo="props.dataInfo"/>
+	<pkCom v-else-if="dataInfo.type === '02'" :dataInfo="props.dataInfo"/>
+	<sparringCom v-else-if="dataInfo.type === '01'" :dataInfo="props.dataInfo"/>
+	<examCom v-else-if="dataInfo.type === '03'" :dataInfo="props.dataInfo"/>
+	<courseCom v-else-if="dataInfo.type === '00'" :dataInfo="props.dataInfo"/>
 </template>
 
 <script setup>
@@ -14,14 +14,8 @@
 	import examCom from './todo-com/exam.vue'
 	const props = defineProps({
 		dataInfo: {
-			default: () => ({
-				type: 1
-			}),
+			default: () => ({}),
 			type: Object
-		},
-		itemIndex: {
-			default: 0,
-			type: Number
 		}
 	})
 </script>
diff --git a/src/pages/index/components/todo.vue b/src/pages/index/components/todo.vue
index 2dd9fc92..998e0b51 100644
--- a/src/pages/index/components/todo.vue
+++ b/src/pages/index/components/todo.vue
@@ -6,11 +6,10 @@
 		<view class="text font_pf">我的待办</view>
 	</view>
 	<view class="cont-box">
-		<calendarCom />
-		{{activeDate}}
+		<!-- {{activeDate}} -->
 		<calendarCom @change="changeDate" />
 		<view class="table-list">
-			<todoItem v-for="item in 5" :itemIndex="item" @click="handleDetail(item)"></todoItem>
+			<todoItem v-for="item in tableData" :dataInfo="item" @click="handleDetail(item)"></todoItem>
 		</view>
 		<view class="more-btn" v-show="showMoreBtn" @click="getMoreData">点击加载更多</view>
 	</view>
@@ -27,6 +26,12 @@
 	import {
 		queryHaveToDo
 	} from '@/api/index'
+	import common from '@/common/common.js'
+	import { setPageCache } from '@/common/common';
+	import { startExamByCrs } from '@/api/examination.js';
+	import {
+		checkTraPartnerInfoById
+	} from '@/api/sparring.js'
 	const activeDate = ref('')
 	const tableData = ref([])
 	const pageObj = ref({
@@ -68,6 +73,62 @@
 	}
 	const handleDetail = (item) => {
 		console.log(item)
+		switch (item.type) {
+			case '00':
+				common.navigateTo('/pages/courseDetail/index?crsId=' + item.id)
+			break;
+			case '01':
+				toSparringDetail(item)
+			break;
+			case '02':
+				common.navigateTo(`/pages/competition/matching?papersId=${item.papersId}&comId=${item.id}`);
+			break;
+			case '03':
+				toExaminationDetail(item)
+			break;
+			case '04':
+				setPageCache('learning_tasks_details', {
+					...item,
+					taskId: item.id,
+					taskName: item.name
+				});
+				common.navigateTo('/pages/learningTasks/details?taskId=' + item.id);
+			break;
+			default:
+			break;
+		}
+	}
+	// 去考试
+	const toExaminationDetail = async (item) => {
+		common.loading();
+		startExamByCrs({
+			crsId: item.id
+		})
+			.then((res) => {
+				setPageCache('examination', {
+					...res.body,
+					name: item.name,
+					crsId: item.id
+				});
+				common.navigateTo('/pages/examination/index');
+			})
+			.finally(() => {
+				common.hideLoading();
+			});
+	};
+	// 跳转 课程详情
+	const toSparringDetail = item => {
+		if (item.id) {
+			checkTraPartnerInfoById({
+				traId: item.id
+			}).then(res => {
+				if (res.body.inRange) {
+					common.navigateTo('/pages/sparring/detail?traId=' + item.id)
+				} else {
+					common.show('提示', res.body.message, false)
+				}
+			})
+		}
 	}
 </script>