Merge branch 'master' of http://139.9.50.163:3000/Project2024/menber-center

pages/dynamic/dynamic/dynamic.vue

@@ -51,7 +51,7 @@
 	const searchForm = ref({
 		keyword: '',
 		pageNumber: 1,
-		pageSize: 20
+		pageSize: 10
 	})
 	const total = ref(0);
 	const status = ref('loadmore');

pages/goOnEdu/course/courseMine/mineRecord/mineRecord.vue

@@ -9,7 +9,7 @@
 		>
 		</u-empty>
 		<view class="course-list">
-			<view v-for="(course,index) in courses" :key="course.id">
+			<view v-for="(course,index) in courses" :key="course.id" @click="toCourse(course)">
 				<view class="course-item">
 					<view class="course-item-image">
 						<image class="course-image" :src="course.cover" mode="aspectFill"></image>
@@ -86,6 +86,11 @@
 			}
 		})
 	}
+	const toCourse = (course) =>{
+		uni.navigateTo({
+			url: `/pages/goOnEdu/course/courseDetail/courseDetail?id=${course.courseId}&title=${course.courseName}`
+		});
+	}
 	onLoad(() => {
 		form.value.pageNumber = 1
 		initCourse();

pages/researchReport/reportHome/reportHome.vue

@@ -309,8 +309,14 @@
 
 
 	function onClickReport(report) {
+		let id;
+		if(menuCurrent.value===1){
+			id = report.reportId
+		}else{
+			id = report.id
+		}
 		uni.navigateTo({
-			url: `/pages/reportDetail/reportDetail?id=${report.id}&title=${report.title}`
+			url: `/pages/reportDetail/reportDetail?id=${id}&title=${report.title}`
 		})
 	}