update .gitignore

pages/index/index.vue

@@ -25,19 +25,19 @@
 		</template>
 	</view>
 	<view class="navTop">
-		<view :style="datas.active == 1 ? 'color:#ff6b7f' : ''" @tap="getrecomVideo('', 1)">
+		<view :class="datas.active == 1 ? 'navTop-active' : ''" @tap="getrecomVideo('', 1)">
 			最新
 		</view>
-		<view :style="datas.active == 2 ? 'color:#ff6b7f' : ''" @tap="getrecomVideo('1', 2)">
+		<view :class="datas.active == 2 ? 'navTop-active' : ''" @tap="getrecomVideo('1', 2)">
 			排行
 		</view>
-		<view :style="datas.active == 3 ? 'color:#ff6b7f' : ''" @tap="getrecomVideo('2', 3)">
+		<view :class="datas.active == 3 ? 'navTop-active' : ''" @tap="getrecomVideo('2', 3)">
 			最热
 		</view>
-		<view :style="datas.active == 4 ? 'color:#ff6b7f' : ''" @tap="getrecomVideo('1', 4)">
+		<view :class="datas.active == 4 ? 'navTop-active' : ''" @tap="getrecomVideo('1', 4)">
 			剧情
 		</view>
-		<view :style="datas.active == 5 ? 'color:#ff6b7f' : ''" @tap="getrecomVideo('2', 5)">
+		<view :class="datas.active == 5 ? 'navTop-active' : ''" @tap="getrecomVideo('2', 5)">
 			飙升
 		</view>
 	</view>
@@ -58,7 +58,7 @@
 import {
 	reactive
 } from 'vue';
-import { announcement, messageselectMessage,courseselectCourse } from '@/api/index/index.js'
+import { announcement, messageselectMessage, courseselectCourse } from '@/api/index/index.js'
 import {
 	onLoad,
 	onReachBottom
@@ -225,6 +225,10 @@ async function getrecomVideo(sort, active = 1) {
 
 }
 
+.navTop-active {
+	color: #cb5d68;
+}
+
 .navTop {
 	display: flex;
 	align-items: center;

pages/index/search/index.vue

@@ -2,47 +2,58 @@
 	<view>
 		<u-sticky :enable="true">
 			<view class="search-box">
-				<u-search bg-color="#f2f2f2" style="width: 100%;" placeholder="搜索更多资源" :focus="true" :show-action="true"
+				<u-search bg-color="#f2f2f2" style="width: 100%;" placeholder="搜索更多资源" :show-action="true"
 					:animation="true" action-text="取消" v-model="datas.keyword" @custom="goBack()"
-					@search="doSearch(false)"></u-search>
+					@search="doSearch()"></u-search>
 			</view>
 		</u-sticky>
 	</view>
-	<view class="search-keyword">
+	<view class="search-keyword" v-if="datas.isSearch">
 		<view class="keyword-block" v-if="datas.hotKeywordList.length != 0">
 			<view class="keyword-list-header">
 				<view>热搜</view>
 			</view>
-			<view class="keyword" v-if="forbid == ''">
+			<view class="keyword">
-				<view v-for="(keyword, index) in datas.hotKeywordList" @tap="doSearchs(keyword)" :key="index"
+				<view v-for="(keyword, index) in datas.hotKeywordList" @tap="doSearchs(keyword)" :key="index">
-					v-if="keyword">
 					{{ keyword }}
 				</view>
 			</view>
-			<view class="hide-hot-tis" v-else>
+
-				<view>当前搜热已隐藏</view>
-			</view>
 		</view>
 	</view>
+
+	<view class="search-list" v-else>
+		<view class="search-list-box">
+			<videoList @success="posterSuccess" :list="datas.keywordList" />
+		</view>
+
+	</view>
+
 </template>
 
 <script setup>
 import { selectCourseTitles } from '@/api/index/index.js'
+import videoList from './videoList.vue'
 import {
 	reactive
 } from 'vue';
 import {
-	onShow
+	onShow, onReachBottom
 } from '@dcloudio/uni-app'
 let datas = reactive({
 	hotKeywordList: [], //热搜
 	keywordList: [],// 搜索列表
 	keyword: "",// 搜索关键字
+	page: 1,
+	isSearch: true,
 })
 onShow(() => {
 	getList()
 })
 
+function posterSuccess() {
+
+}
 function getList() {
 	if (uni.getStorageSync('moreSearch')) {
 		datas.hotKeywordList = (uni.getStorageSync('moreSearch')).split(',')
@@ -50,14 +61,29 @@ function getList() {
 		datas.hotKeywordList = []
 	}
 }
+onReachBottom(() => {
+	++datas.page
+	doSearch()
+})
+function doSearchs(keyWord) {
+	datas.keyword = keyWord
+	doSearch()
+}
 // 搜索
 async function doSearch() {
+	datas.isSearch = false
+
 	let res = await selectCourseTitles({
 		title: datas.keyword,
 		limit: 20,
-		page: 1,
+		page: datas.page,
 	})
-	datas.keywordList = res.data.list
+	if (datas.page == 1) {
+		datas.keywordList = res.data.list
+	} else {
+		datas.keywordList = [...datas.keywordList, ...res.data.list]
+	}
+
 }
 
 // 取消返回首页
@@ -83,20 +109,59 @@ function goBack() {
 }
 
 .keyword-block {
-	padding: 10upx 0;
+	padding: 10rpx 0;
+}
+
+.keyword {
+	width: 94%;
+	padding: 3px 3%;
+	display: flex;
+	flex-flow: wrap;
+	justify-content: flex-start;
+
+	>view {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 60upx;
+		padding: 0 20upx;
+		margin: 10upx 20upx 10upx 0;
+		height: 60upx;
+		font-size: 28upx;
+		// background-color: rgb(242, 242, 242);
+		background: #E6EBFF;
+		color: #6b6b6b;
+	}
 }
 
 .keyword-block .keyword-list-header {
 	width: 94%;
-	padding: 10upx 3%;
+	padding: 10rpx 3%;
-	font-size: 27upx;
+	font-size: 27rpx;
 	color: #333;
 	display: flex;
 	justify-content: space-between;
 }
 
 .keyword-block .keyword-list-header image {
-	width: 40upx;
+	width: 40rpx;
-	height: 40upx;
+	height: 40rpx;
+}
+
+.search-list {
+	width: 100%;
+	margin-top: 20rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+
+	.search-list-box {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		flex-wrap: wrap;
+		width: 686rpx;
+		height: 100%;
+	}
 }
 </style>

pages/index/search/videoList.vue

@@ -0,0 +1,219 @@
+<!-- 瀑布流 -->
+<template>
+	<view class="list ">
+		<view class="list-box ">
+			<!-- 左边数据 -->
+			<view class="list-box-ite">
+				<view @click="clickItem(item)" class="list-box-ite-item" v-for="(item, index) in datas.arrListLeft"
+					:key="index">
+					<view class="list-box-ite-item-img">
+						<u-lazy-load border-radius="24rpx 24rpx 0 0" :image="item.titleImg"></u-lazy-load>
+						<view class="list-box-ite-item-img-t" v-if="item.over == 1">
+							共{{ item.courseDetailsCount ? item.courseDetailsCount : 0 }}集
+						</view>
+						<view class="list-box-ite-item-img-t" v-else>
+							更新至{{ item.courseDetailsCount ? item.courseDetailsCount : 0 }}集
+						</view>
+					</view>
+					<view class="list-box-ite-item-txt">
+						<view class="list-box-ite-item-txt-t">
+							{{ item.title }}
+						</view>
+						<view class="list-box-ite-item-txt-l" v-if="item.courseLabel">
+							{{ item.courseLabel }}
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 右边数据 -->
+			<view class="list-box-ite">
+				<view @click="clickItem(item)" class="list-box-ite-item" v-for="(item, index) in datas.arrListRight"
+					:key="index">
+					<view class="list-box-ite-item-img">
+						<u-lazy-load border-radius="24rpx 24rpx 0 0" :image="item.titleImg"></u-lazy-load>
+						<view class="list-box-ite-item-img-t" v-if="item.over == 1">
+							共{{ item.courseDetailsCount ? item.courseDetailsCount : 0 }}集
+						</view>
+						<view class="list-box-ite-item-img-t" v-else>
+							更新至{{ item.courseDetailsCount ? item.courseDetailsCount : 0 }}集
+						</view>
+					</view>
+					<view class="list-box-ite-item-txt">
+						<view class="list-box-ite-item-txt-t">
+							{{ item.title }}
+						</view>
+						<view class="list-box-ite-item-txt-l" v-if="item.courseLabel">
+							{{ item.courseLabel }}
+						</view>
+					</view>
+				</view>
+			</view>
+
+		</view>
+	</view>
+
+</template>
+<script setup>
+import {
+	reactive,
+	watch
+} from "vue";
+import {
+	onShow, onReachBottom
+} from '@dcloudio/uni-app'
+const props = defineProps({
+	list: {
+		type: Array,
+		default: []
+	},
+})
+let datas = reactive({
+	arrListLeft: [], //左边数据
+	arrListRight: [], //右边数据
+})
+onShow(() => {
+	spliceArrayListr()
+})
+watch(() => props.list, () => {
+	spliceArrayListr()
+})
+function spliceArrayListr() {
+	datas.arrListRight = []
+	datas.arrListLeft = []
+	props.list.map((item, index) => {
+		if (index % 2 === 0) {
+			datas.arrListLeft.push(item)
+		} else {
+			datas.arrListRight.push(item)
+		}
+	})
+}
+</script>
+<style lang="scss">
+.list {
+	width: 100%;
+	height: auto;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+
+	.list-box {
+		width: 686rpx;
+		height: 100%;
+		display: flex;
+		justify-content: space-between;
+		flex-wrap: wrap;
+	}
+
+	.list-box-ite {
+		width: calc((100% - 20rpx) / 2);
+		height: auto;
+	}
+
+	.list-box-ite-item {
+		width: 100%;
+		height: auto;
+		margin-bottom: 20rpx;
+
+		.list-box-ite-item-img {
+			width: 100%;
+			border-radius: 24rpx 24rpx 0 0;
+			min-height: 300rpx;
+			position: relative;
+
+			image {
+				width: 100%;
+				min-height: 300rpx;
+				border-radius: 24rpx 24rpx 0 0;
+			}
+
+			.list-box-ite-item-img-t {
+				position: absolute;
+				bottom: 10rpx;
+				right: 0;
+				max-width: 80%;
+				border-radius: 10rpx;
+				background-color: rgba(51, 51, 51, 0.7);
+				color: #FFFFFF;
+				font-size: 22rpx;
+				padding: 10rpx;
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+
+			}
+		}
+
+		.list-box-ite-item-txt {
+			padding: 10rpx 20rpx;
+			background-color: #ffffff;
+			border-radius: 0 0 24rpx 24rpx;
+		}
+
+		.list-box-ite-item-txt-t {
+			color: #333333;
+			font-size: 30rpx;
+			font-weight: bold;
+		}
+
+		.list-box-ite-item-txt-l {
+			color: #999999;
+			font-size: 22rpx;
+			margin-top: 10rpx;
+		}
+	}
+
+
+
+
+
+
+
+	.list-box-item {
+		width: calc((100% - 20rpx) / 2);
+		// height: 100%;
+		min-height: 320rpx;
+		border-radius: 24rpx;
+		background-color: #ffffff;
+		margin-bottom: 20rpx;
+	}
+
+	.list-box-item-img {
+		width: 100%;
+		height: 200rpx;
+		border-radius: 24rpx 24rpx 0 0;
+
+		image {
+			width: 100%;
+			height: 200rpx;
+			border-radius: 24rpx 24rpx 0 0;
+		}
+
+	}
+
+	.list-box-item-txt {
+		width: 100%;
+		// height: 120rpx;
+		padding: 20rpx 0;
+		border-radius: 0 0 24rpx 24rpx;
+	}
+
+	.list-box-item-txt-t {
+		width: 100%;
+		padding: 0 20rpx;
+		color: #333333;
+		font-size: 30rpx;
+		font-weight: bold;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+
+	.list-box-item-txt-l {
+		color: #999999;
+		font-size: 22rpx;
+		margin-top: 10rpx;
+		padding: 0 20rpx;
+	}
+}
+</style>

unpackage/dist/cache/.vite/deps/_metadata.json

@@ -1,31 +0,0 @@
-{
-  "hash": "33e53a44",
-  "configHash": "048dba77",
-  "lockfileHash": "e8b32e83",
-  "browserHash": "98657dc5",
-  "optimized": {
-    "uview-plus": {
-      "src": "../../../../../node_modules/uview-plus/index.js",
-      "file": "uview-plus.js",
-      "fileHash": "3e411044",
-      "needsInterop": false
-    },
-    "lodash": {
-      "src": "../../../../../node_modules/lodash/lodash.js",
-      "file": "lodash.js",
-      "fileHash": "85fde04d",
-      "needsInterop": true
-    },
-    "gm-crypto": {
-      "src": "../../../../../node_modules/gm-crypto/dist/index.esm.js",
-      "file": "gm-crypto.js",
-      "fileHash": "e99227be",
-      "needsInterop": false
-    }
-  },
-  "chunks": {
-    "chunk-LQ2VYIYD": {
-      "file": "chunk-LQ2VYIYD.js"
-    }
-  }
-}

unpackage/dist/cache/.vite/deps/package.json

@@ -1,3 +0,0 @@
-{
-  "type": "module"
-}