From d5cbc38b1ad7ffb433478b18ca08cc2481f825aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= <tybb88x@gmail.com>
Date: Wed, 3 Sep 2025 16:17:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=B6=E8=97=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                               |  2 +-
 src/api/learningTasks.js                       |  9 +++++++++
 src/pages/course/study.vue                     | 10 ++++++----
 .../favorites/components/favoritesTask.vue     |  4 ++--
 .../learningTasks/components/content-item.vue  |  4 ++--
 src/pages/learningTasks/details.vue            |  3 ++-
 src/pages/learningTasks/index.vue              | 18 +++++++++++++++++-
 7 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/.env.development b/.env.development
index 4ab2dec0..cf8522d2 100644
--- a/.env.development
+++ b/.env.development
@@ -6,7 +6,7 @@ ENV = 'development'
 # VITE_APP_BASE_API_Url = 'http://25.18.122.78:9786'
 
 # DEV
-VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
+VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002'
 
 # app入口
 #VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001'
diff --git a/src/api/learningTasks.js b/src/api/learningTasks.js
index 293dfee6..1033a217 100644
--- a/src/api/learningTasks.js
+++ b/src/api/learningTasks.js
@@ -20,3 +20,12 @@ export const queryAllTraTaskCrsInfo = (data) => {
 	});
 };
 
+
+// 根据任务id查询这一条
+export const queryAllTraTaskIUserId = (data) => {
+	return request({
+		url: base_url + '/traTaskInfo/queryAllTraTaskIUserId',
+		method: 'post',
+		data
+	});
+};
\ No newline at end of file
diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue
index 34e7a8e1..2703ce56 100644
--- a/src/pages/course/study.vue
+++ b/src/pages/course/study.vue
@@ -349,7 +349,7 @@ const showOrder = ref(0)
 const isLastPgrph = ref(false)
 const backRouter = () => {
   // common.redirectTo(`/pages/courseDetail/index?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study`)
-  uni.$emit('refresh_course_list')
+  // uni.$emit('refresh_course_list') // yh0903让去除
   common.navigateBack()
 }
 
@@ -380,9 +380,10 @@ const getGraphInfoUnStudy = (flag = 0) => {
 	  uni.$emit('refresh_course_list', crsId.value)
       if (isPreview.value) {
         common
-          .show('提示', '您已学完全部知识点', false, '取消', '确定')
+          .show('提示', '您已学完全部知识点', false)
           .then(res => {
-            common.redirectTo(`/pages/courseDetail/index?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study&isPreview=true`)
+			  common.navigateBack()
+            // common.redirectTo(`/pages/courseDetail/index?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study&isPreview=true`)
           })
           .finally(() => {})
       } else {
@@ -394,7 +395,8 @@ const getGraphInfoUnStudy = (flag = 0) => {
               common.redirectTo(`/pages/courseDetail/submit?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study&imgId=${imageId.value}`)
             } else {
               // 取消
-              common.redirectTo(`/pages/courseDetail/index?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study`)
+			  common.navigateBack()
+              // common.redirectTo(`/pages/courseDetail/index?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study`)
             }
           })
           .finally(() => {})
diff --git a/src/pages/favorites/components/favoritesTask.vue b/src/pages/favorites/components/favoritesTask.vue
index b2e0076f..5f166b26 100644
--- a/src/pages/favorites/components/favoritesTask.vue
+++ b/src/pages/favorites/components/favoritesTask.vue
@@ -14,8 +14,8 @@
 					<view class="item" :class="getStatusClass(index)" @touchmove.stop @click="click_item(item)">
 						<view class="img_div">
 							<image-preview class="img" :src="item?.ossAddr" mode="scaleToFill"></image-preview>
-							<view class="subscript" v-if="item.isFinish === '00'">未完成</view>
-							<view class="subscript" v-if="item.isFinish === '01'">已完成</view>
+							<view class="subscript" v-if="item.isFinish === '02'">已完成</view>
+							<view class="subscript" v-else>未完成</view>
 						</view>
 						<view class="right_div">
 							<view class="title ellipsis-text">
diff --git a/src/pages/learningTasks/components/content-item.vue b/src/pages/learningTasks/components/content-item.vue
index ebd6cffe..0f0ea62a 100644
--- a/src/pages/learningTasks/components/content-item.vue
+++ b/src/pages/learningTasks/components/content-item.vue
@@ -2,8 +2,8 @@
 	<view class="item" :class="getStatusClass(item.isFinish)" @click="click_item(item)">
 		<view class="img_div">
 			<image-preview class="img" :src="item.ossAddr" mode="scaleToFill"></image-preview>
-			<view class="subscript" v-if="item.isFinish === '00'">未完成</view>
-			<view class="subscript" v-if="item.isFinish === '01'">已完成</view>
+			<view class="subscript" v-if="item.isFinish === '02'">已完成</view>
+			<view class="subscript" v-else>未完成</view>
 		</view>
 		<view class="right_div">
 			<view class="title ellipsis-text">
diff --git a/src/pages/learningTasks/details.vue b/src/pages/learningTasks/details.vue
index a47fc6e4..ee504763 100644
--- a/src/pages/learningTasks/details.vue
+++ b/src/pages/learningTasks/details.vue
@@ -211,7 +211,8 @@
 		getData();
 		// 监听里面学习完成后更新任务历程
 		uni.$on('refresh_course_list', () => {
-			console.log('监听里面学习完成后更新任务历程');
+			console.log('详情监听里面学习完成后更新任务历程');
+			getData();
 		});
 		
 	});
diff --git a/src/pages/learningTasks/index.vue b/src/pages/learningTasks/index.vue
index 0271c5e8..4318ae5b 100644
--- a/src/pages/learningTasks/index.vue
+++ b/src/pages/learningTasks/index.vue
@@ -44,6 +44,7 @@
 <script setup>
 	import { LineBg } from '@/enum.js';
 	import content from './components/content.vue';
+	import { onLoad, onUnload } from '@dcloudio/uni-app';
 	import { ref, onMounted, watch } from 'vue';
 	import common from '@/common/common.js';
 	const listItemRefs = ref([]);
@@ -69,7 +70,7 @@
 	const search = (value) => {
 		listItemRefs.value[tabAct.value]?.search(value);
 	};
-	
+
 	onMounted(() => {
 		watch(
 			tabAct,
@@ -82,6 +83,21 @@
 			}
 		); // 这里的immediate会在onMounted之后执行
 	});
+	
+	onLoad(() => {
+		uni.$on('refresh_course_list', (crsId) => {
+			console.log('列表监听里面学习完成后更新任务历程', crsId);
+			queryAllTraTaskIUserId({crsId}).then(res => {
+				const index = listItemRefs
+				typeof listItemRefs.value[newValue]?.getData === 'function' &&
+					listItemRefs.value[newValue]?.getData('first');
+			})
+			
+		});
+	});
+	onUnload(() => {
+		uni.$off('refresh_course_list');
+	});
 </script>
 
 <style lang="scss" scoped>