Merge branch 'test' of https://e.coding.net/g-cphe0354/duanju/new_app into ymf

pages/index/components/contentlist.vue

@@ -25,11 +25,9 @@
 	})
 
 	function seVideo(item) {
-		// uni.navigateTo({
+		uni.navigateTo({
-		// 	url: '/me/detail/detail?id=' + item.courseId + '&courseDetailsId=' + item.courseDetailsId +
+			url:"/pages/video/detail?courseId="+item.courseId+"&courseDetailsId="+item.courseDetailsId
-		// 		'&tt_album_id=' + item.dyCourseId + '&tt_episode_id=' + item
+		})
-		// 		.dyEpisodeId
-		// })
 	}
 </script>
 

pages/index/search/videoList.vue

@@ -54,30 +54,38 @@
 
 </template>
 <script setup>
-import {
+	import {
 		reactive,
 		watch
-} from "vue";
+	} from "vue";
-import {
+	import {
-	onShow, onReachBottom
+		onShow,
-} from '@dcloudio/uni-app'
+		onReachBottom
-const props = defineProps({
+	} from '@dcloudio/uni-app'
+	const props = defineProps({
 		list: {
 			type: Array,
 			default: []
 		},
-})
+	})
-let datas = reactive({
+	let datas = reactive({
 		arrListLeft: [], //左边数据
 		arrListRight: [], //右边数据
-})
+	})
-onShow(() => {
+	onShow(() => {
 		spliceArrayListr()
-})
+	})
-watch(() => props.list, () => {
+	watch(() => props.list, () => {
 		spliceArrayListr()
-})
+	})
-function spliceArrayListr() {
+
+	function clickItem(item) {
+		uni.navigateTo({
+			url: "/pages/video/detail?courseId=" + item.courseId + "&courseDetailsId=" + item.courseDetailsId
+		})
+	}
+
+	function spliceArrayListr() {
 		datas.arrListRight = []
 		datas.arrListLeft = []
 		props.list.map((item, index) => {
@@ -87,10 +95,10 @@ function spliceArrayListr() {
 				datas.arrListRight.push(item)
 			}
 		})
-}
+	}
 </script>
 <style lang="scss">
-.list {
+	.list {
 		width: 100%;
 		height: auto;
 		display: flex;
@@ -215,5 +223,5 @@ function spliceArrayListr() {
 			margin-top: 10rpx;
 			padding: 0 20rpx;
 		}
-}
+	}
 </style>