Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop

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
+	});
+};

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(() => {})

src/pages/favorites/components/favoritesTask.vue

@@ -11,11 +11,11 @@
 					v-for="(item, index) in data_list"
 					@click="swipeActionClick"
 				>
-					<view class="item" :class="getStatusClass(index)" @touchmove.stop @click="click_item(item)">
+					<view class="item" :class="getStatusClass(item.isFinish)" @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">
@@ -124,11 +124,9 @@
 		setPageCache('learning_tasks_details', item);
 		common.navigateTo(`/pages/learningTasks/details?collectId=${item.collectionId}`);
 	};
-	const getStatusClass = (index) => {
-		const remainder = index % 3;
-		if (remainder === 0) return 'in_progress';
-		if (remainder === 1) return 'completed';
-		return 'expired';
+	const getStatusClass = (isFinish) => {
+		if (isFinish === '02') return 'completed';
+		return 'in_progress';
 	};
 	const scrolltolower = (item) => {
 		getData();

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">
@@ -39,9 +39,11 @@
 	const item = computed(() => props.item);
 	const getStatusClass = (isFinish) => {
 		// 00进行中、01已完成、02已超时
-		if (isFinish === '00') return 'in_progress';
-		if (isFinish === '01') return 'completed';
-		return 'expired';
+		// if (isFinish === '00') return 'in_progress';
+		// if (isFinish === '01') return 'completed';
+		// return 'expired';
+		if (isFinish === '02') return 'completed';
+		return 'in_progress';
 	};
 	// 跳转到详情
 	const click_item = (item) => {

src/pages/learningTasks/details.vue

@@ -211,7 +211,8 @@
 		getData();
 		// 监听里面学习完成后更新任务历程
 		uni.$on('refresh_course_list', () => {
-			console.log('监听里面学习完成后更新任务历程');
+			console.log('详情监听里面学习完成后更新任务历程');
+			getData();
 		});
 		
 	});

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>