合并代码

jiuyi/api/video.js

@@ -225,7 +225,7 @@ const video = {
 	 */
 	publishVideo(param) {
 		return util.request({
-			url: `/homecommon/publishVideo`,
+			url: `/video/video/add`,
 			data: param.data,
 			method: 'POST',
 		})

jiuyi/components/index/indexVideo.vue

@@ -60,7 +60,9 @@
 		},
 	})
 	// 
-	const emit = defineEmits(['showTime', 'showComment', 'showCollect', 'showFastCollect', 'showShareFirend', 'onPlay', 'onPause', 'like', 'detailMenu', 'onEnd', 'longtap'])
+	const emit = defineEmits(['showTime', 'showComment', 'showCollect', 'showFastCollect', 'showShareFirend', 'onPlay',
+		'onPause', 'like', 'detailMenu', 'onEnd', 'longtap'
+	])
 
 	// 视频上下文对象
 	const videoCtx = ref(null)
@@ -414,10 +416,15 @@
 	<view class="container f1 pr" ref="videoBoxRef">
 		<!-- 视频层 -->
 		<view class="main f1">
-			<view class="videoBox f1" @longpress="longtap" @touchmove.stop="" @touchstart="onTouchStart" @touchend="onTouchEnd" @touchcancel="onTouchEnd">
+			<view class="videoBox f1" @longpress="longtap" @touchmove.stop="" @touchstart="onTouchStart"
+				@touchend="onTouchEnd" @touchcancel="onTouchEnd">
 				<statusBar />
 
-				<video class="video f1" :id="'video' + tabIndex + index" :src="item.format_videoUrl" :poster="item.format_imageUrl" :http-cache="false" :show-fullscreen-btn="false" :enable-progress-gesture="false" :controls="false" @play="onVideoPlay" @pause="onVideoPause" :show-center-play-btn="false" @timeupdate="handleTimeupdate" @waiting="handleWaiting" :play-strategy="2" :initial-time="0" :loop="true" />
+				<video class="video f1" :id="'video' + tabIndex + index" :src="item.format_videoUrl"
+					:poster="item.format_imageUrl" :http-cache="false" :show-fullscreen-btn="false"
+					:enable-progress-gesture="false" :controls="false" @play="onVideoPlay" @pause="onVideoPause"
+					:show-center-play-btn="false" @timeupdate="handleTimeupdate" @waiting="handleWaiting"
+					:play-strategy="2" :loop="true" />
 			</view>
 
 			<!-- 视频进度条 -->
@@ -454,10 +461,13 @@
 					<view class="item">
 						<view class="col">
 							<view class="pr">
-								<image class="wh50" src="/static/indexLike.png" mode="aspectFit" v-if="item.isLike == 0" @click="handleLike(index, 0)" @longpress="handlePrivateLike(index)" />
+								<image class="wh50" src="/static/indexLike.png" mode="aspectFit" v-if="item.isLike == 0"
-								<image class="wh50" src="/static/indexLike1.png" mode="aspectFit" v-else-if="item.isLike == 1" @click="handleLike(index, 1)" />
+									@click="handleLike(index, 0)" @longpress="handlePrivateLike(index)" />
+								<image class="wh50" src="/static/indexLike1.png" mode="aspectFit"
+									v-else-if="item.isLike == 1" @click="handleLike(index, 1)" />
 								<!-- 私密赞的图标 -->
-								<image class="wh50" src="/static/privateLike.png" mode="aspectFit" v-else-if="item.isLike == 3" @click="handleLike(index, 1)" />
+								<image class="wh50" src="/static/privateLike.png" mode="aspectFit"
+									v-else-if="item.isLike == 3" @click="handleLike(index, 1)" />
 							</view>
 							<view class="txt mt10">
 								<text class="text">{{ item.likes }}</text>
@@ -478,7 +488,8 @@
 					<!-- 收藏 -->
 					<view class="item df fdr">
 						<view class="col" @touchstart="handleCollectStar" @touchend="handleCollectEnd" ref="collectBtn">
-							<image class="wh50" src="@/static/indexCollect1.png" mode="aspectFit" v-if="item.isCollect" />
+							<image class="wh50" src="@/static/indexCollect1.png" mode="aspectFit"
+								v-if="item.isCollect" />
 							<image class="wh50" src="@/static/indexCollect.png" mode="aspectFit" v-else />
 							<view class="txt mt10">
 								<text class="text">{{ item.collect }}</text>

jiuyi/manifest.json

@@ -29,8 +29,7 @@
 		"distribute": {
 			/* android打包配置 */
 			"android": {
-                "plugins" : [
+				"plugins": [{
-                    {
 						"type": "module",
 						"name": "Agora-RTC-EngineModule",
 						"class": "io.agora.rtc.uni.AgoraRtcEngineModule"

jiuyi/pages/index/index.nvue

@@ -329,7 +329,7 @@
 	function getRecList() {
 		Promise.all([getHomeVideo(), getShopVideo(), getOtherVideo()]).then(rs => {
 			// 列表
-			const list = rs.reduce((last, now) => last.concat(now.rows), []).sort(() => Math.random() - 0.5)
+			const list = rs.rows.sort(() => Math.random() - 0.5)
 			// 总数
 			recList.total = rs.reduce((last, now) => last + now.total, 0)
 			// 第一页
@@ -352,7 +352,8 @@
 				const pages = getCurrentPages()
 				// 判断是否当前页
 				if (pages[pages.length - 1].route == 'pages/index/index') {
-					proxy.$refs[`videoRef${tabIndex.value}`][current[tabIndex.value]].playState.value = true
+					proxy.$refs[`videoRef${tabIndex.value}`][current[tabIndex.value]].playState.value =
+						true
 					proxy.$refs[`videoRef${tabIndex.value}`][current[tabIndex.value]].play()
 				}
 			}, 50)
@@ -542,7 +543,8 @@
 		}
 		tabIndex.value = index
 		// 根据是否加载过判断 播放还是获取
-		if (tabCurrent.value.load && proxy.$refs[`videoRef${index}`]) proxy.$refs[`videoRef${index}`][current[index]].play()
+		if (tabCurrent.value.load && proxy.$refs[`videoRef${index}`]) proxy.$refs[`videoRef${index}`][current[index]]
+		.play()
 		else tabCurrent.value.getList()
 		// 已加载
 		tab[tabIndex.value].load = true
@@ -729,7 +731,8 @@
 
 				<view class="f1">
 					<view class="tab fdr jcc" :key="tabIndex">
-						<view class="list" v-for="(item,index) in tab" :key="index" :class="[{'active': index === tabIndex}]" @click.stop="handle_tab(index)">
+						<view class="list" v-for="(item,index) in tab" :key="index"
+							:class="[{'active': index === tabIndex}]" @click.stop="handle_tab(index)">
 							<view class="txt">
 								<text class="text">{{item.name}}</text>
 							</view>
@@ -752,10 +755,17 @@
 		<template v-for="(item, index) in tab" :key="index">
 			<view class="f1" v-if="tabIndex == index" ref="containerRef">
 				<!-- 主要内容区域 -->
-				<list class="container f1" :show-scrollbar="false" @touchstart="onTouchstart($event,index)" @touchend="onTouchend($event,index)" @loadmore="item.getMoreList">
+				<list class="container f1" :show-scrollbar="false" @touchstart="onTouchstart($event,index)"
-					<cell class="cell" :style="[{height: viewHeight + 'px'}]" :ref="`cellRef` + index" v-for="(secItem,secIndex) in item.listData()" :key="secIndex" @click.stop>
+					@touchend="onTouchend($event,index)" @loadmore="item.getMoreList">
+					<cell class="cell" :style="[{height: viewHeight + 'px'}]" :ref="`cellRef` + index"
+						v-for="(secItem,secIndex) in item.listData()" :key="secIndex" @click.stop>
 						<!-- 视频 -->
-						<indexVideo :ref="'videoRef' + index" :tabIndex="index" :current="current[index]" :item="secItem" :index="secIndex" @showTime="handleShowTime" @showComment="handleShowCommentAlt" @showCollect="handleShowCollectAlt" @showShareFirend="handleShowShareFirend" @onPlay="handleVideoOnPlay" @onPause="handleVideoOnPause" @like="videoLike" @longtap="$refs.moreMenuRef.open(secItem)" @showFastCollect="handleShowFastCollect" :viewWidth="viewWidth" />
+						<indexVideo :ref="'videoRef' + index" :tabIndex="index" :current="current[index]"
+							:item="secItem" :index="secIndex" @showTime="handleShowTime"
+							@showComment="handleShowCommentAlt" @showCollect="handleShowCollectAlt"
+							@showShareFirend="handleShowShareFirend" @onPlay="handleVideoOnPlay"
+							@onPause="handleVideoOnPause" @like="videoLike" @longtap="$refs.moreMenuRef.open(secItem)"
+							@showFastCollect="handleShowFastCollect" :viewWidth="viewWidth" />
 					</cell>
 				</list>
 			</view>

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

@@ -1,37 +1,31 @@
 {
-  "hash": "32d96953",
+  "hash": "37e93c97",
-  "configHash": "aa34cf93",
+  "configHash": "b5581361",
   "lockfileHash": "6e88141a",
-  "browserHash": "f6042447",
+  "browserHash": "b2bb18f7",
   "optimized": {
     "@tencentcloud/chat": {
       "src": "../../../../../node_modules/@tencentcloud/chat/index.js",
       "file": "@tencentcloud_chat.js",
-      "fileHash": "b18fad8a",
+      "fileHash": "b054b652",
       "needsInterop": true
     },
     "@tencentcloud/chat/modules/group-module.js": {
       "src": "../../../../../node_modules/@tencentcloud/chat/modules/group-module.js",
       "file": "@tencentcloud_chat_modules_group-module__js.js",
-      "fileHash": "70eaae39",
+      "fileHash": "bbe780a6",
       "needsInterop": false
     },
     "tim-upload-plugin": {
       "src": "../../../../../node_modules/tim-upload-plugin/index.js",
       "file": "tim-upload-plugin.js",
-      "fileHash": "665b8e2f",
+      "fileHash": "11d142d1",
       "needsInterop": true
     },
     "crypto-js": {
       "src": "../../../../../node_modules/crypto-js/index.js",
       "file": "crypto-js.js",
-      "fileHash": "f77d7150",
+      "fileHash": "3cc1bed2",
-      "needsInterop": true
-    },
-    "js-pinyin": {
-      "src": "../../../../../node_modules/js-pinyin/index.js",
-      "file": "js-pinyin.js",
-      "fileHash": "a2c07873",
       "needsInterop": true
     }
   },