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

src/pages/course/study.vue

@@ -468,9 +468,9 @@ const getGraphInfoUnStudy = (flag = 0, lastPgrphId = '') => {
 						common
 						  .show('恭喜你已学完全部知识点', '有什么心得跟我们分享吗？', true, '取消', '去评论')
 						  .then(res => {
-						    if (res) {
+						    if (res) { 
 						      // 去评论
-						      common.redirectTo(`/pages/courseDetail/submit?crsId=${crsId.value}&crsNum=${crsNum.value}&from=study&imgId=${imageId.value}`)
+						      common.redirectTo(`/pages/courseDetail/index?tabAct=2&crsId=${crsId.value}&crsNum=${crsNum.value}&from=study&isPreview=true`)
 						    } else {
 						      // 取消
 						      common.navigateBack()

src/pages/courseDetail/index.vue

@@ -301,6 +301,7 @@
 		crsId.value = params.crsId;
 		collectId.value = params.collectId || null;
 		isPreview.value = params.isPreview || '';
+		tabAct.value = Number(params.tabAct || 0)
 	});
 	onShow(() => {
 		getData();

src/pages/index/components/todo.vue

@@ -38,6 +38,7 @@
 	import {
 		checkTraPartnerInfoById
 	} from '@/api/sparring.js'
+	import { queryTraUserAnonyByUserId } from '@/api/user.js';
 	const activeDate = ref('')
 	const tableData = ref([])
 	const pageObj = ref({
@@ -118,7 +119,10 @@
 					comName: item.name, // 标题
 					comId: item.id
 				});
-				common.navigateTo(`/pages/competition/matching?papersId=${res.body.papersId}&comId=${item.id}`);
+				queryTraUserAnonyByUserId().then(res2=>{
+					common.setValue('orgTree', res2.body ?? []);
+					common.navigateTo(`/pages/competition/matching?papersId=${res.body.papersId}&comId=${item.id}`);
+				})
 			})
 			.finally(() => {
 				common.hideLoading();