From ae5bb0dc68ec9a0be23d2173cec320d5c41e79d1 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 28 五月 2025 09:05:57 +0800
Subject: [PATCH] Merge branch 'dev' of http://42.193.1.25:9521/r/lmk-shop-wx into dev
---
pages/tabbar/index/home.vue | 386 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 356 insertions(+), 30 deletions(-)
diff --git a/pages/tabbar/index/home.vue b/pages/tabbar/index/home.vue
index 0fb56be..4ed067f 100644
--- a/pages/tabbar/index/home.vue
+++ b/pages/tabbar/index/home.vue
@@ -13,7 +13,7 @@
<view
class="play-icon"
@click="togglePlay(index)"
- v-if="!currentVideoIsPlaying"
+ v-if="currentVideoIsPlaying != null && !currentVideoIsPlaying"
>
<image src="/static/video/play.png" style="width: 45px;height: 45px" mode="aspectFit"></image>
</view>
@@ -26,10 +26,11 @@
:loop="true"
:object-fit="item.objectFit"
class="video-item"
- @play="onPlay(index)"
+ @play="onPlay(item.id, index)"
@pause="onPause(index)"
@ended="onEnded(index)"
@click="togglePlay(index)"
+ @timeupdate="onTimeUpdate($event)"
></video>
<!-- 鎮寕鍟嗗搧閾炬帴灞� -->
@@ -74,7 +75,7 @@
<view class="avatar-container">
<image class="avatar" :src="item.authorAvatar" mode="aspectFill"></image>
<!-- 鍏虫敞鍥炬爣 - 浣跨敤缁濆瀹氫綅 -->
- <view class="follow-icon">
+ <view v-if="!item.subscribeThisAuthor" class="follow-icon" @click="subscribeAuth(index, item.authorId)">
<text class="iconfont"></text>
</view>
</view>
@@ -88,33 +89,106 @@
<text style="font-size: 10px;font-weight: lighter;">{{item.commentNum}}</text>
</view>
</view>
+
</swiper-item>
</swiper>
+
+ <!-- 璇勮寮圭獥 -->
+ <uni-popup ref="commentPopup" type="bottom" :is-mask-click="true" @maskClick="closeCommentPopup">
+ <view class="comment-popup">
+ <view class="popup-header">
+ <text class="popup-title">璇勮({{comments.length}})</text>
+ <text class="iconfont close-icon" @click="closeCommentPopup"></text>
+ </view>
+
+ <scroll-view class="comment-list" scroll-y>
+ <view v-if="commentLoading" class="loading">
+ <uni-load-more status="loading"></uni-load-more>
+ </view>
+
+ <view v-else-if="comments.length === 0" class="empty">
+ 鏆傛棤璇勮锛屽揩鏉ュ彂琛ㄧ涓�鏉¤瘎璁哄惂~
+ </view>
+
+ <view v-else class="comment-item" v-for="comment in comments" :key="comment.id">
+ <image class="avatar" :src="comment.user.avatar || '/static/default-avatar.png'"></image>
+ <view class="comment-content">
+ <text class="nickname">{{comment.user.nickname}}</text>
+ <text class="content">{{comment.content}}</text>
+ <text class="time">{{formatTime(comment.createTime)}}</text>
+ </view>
+ </view>
+ </scroll-view>
+
+ <view class="comment-input-area">
+ <input
+ class="comment-input"
+ v-model="commentForm.commentContent"
+ placeholder="鍐欎笅浣犵殑璇勮..."
+ placeholder-class="placeholder"
+ />
+ <button class="submit-btn" @click="submitComment">鍙戦��</button>
+ </view>
+ </view>
+ </uni-popup>
+
+
<custom-tabbar bgColor="#333333" selected="index" selectedTextColor="#ffffff"></custom-tabbar>
</view>
</template>
<script>
-import { getRecommendVideos } from "@/api/video.js";
+import { getRecommendVideos, savePlayRecord, subscribe, getVideoComments, addVideoComment } from "@/api/video.js";
import { changeCollect } from "@/api/collect.js";
export default {
data() {
return {
- currentVideoIsPlaying: false, // 褰撳墠瑙嗛鏄惁姝ｅ湪鎾斁
- isFullScreen: false,
- windowHeight: 0,
- currentIndex: 0, // 褰撳墠鎾斁鐨勮棰戠储寮�
- videoList: [
+ commentQuery: {
+ pageNumber: 1,
+ pageSize: 5,
+ videoId: '',
+ masterCommentId: ''
+ },
+ commentForm: { // 璇勮琛ㄥ崟鏁版嵁
+ id: null,
+ videoId: null,
+ commentContent: '',
+ replyId: null
+ },
+ comments: [], // 璇勮鍒楄〃
+ commentLoading: false, // 璇勮鍔犺浇鐘舵��
+ startHidenTime: 0, // 璁板綍鍒囨崲鑷冲叾瀹冮〉闈㈢殑鏃堕棿锛岀敤浜庤绠楄棰戣鐪嬫椂闂村噺鍘荤殑閮ㄥ垎
+ totalHidenTime: 0, // 鎬诲叡闅愯棌椤甸潰鐨勬椂闂�
+ startPauseTime: 0, // 寮�濮嬫殏鍋滅殑鏃堕棿
+ totalPauseTime: 0, // 鎬诲叡鏆傚仠鐨勬椂闂�
+ playRecord: {
+ videoId: null,
+ viewDuration: 0, // 杩欎釜瑙嗛鎬诲叡瑙傜湅浜嗗涔�
+ playAt: 0 ,// 杩欎釜瑙嗛鎾斁鍒板摢浜�
+ startPlayTime: 0 // 杩欎釜瑙嗛浠庝粈涔堟椂鍊欏紑濮嬫挱鏀剧殑
+ },
+ currentVideoIsPlaying: null, // 褰撳墠瑙嗛鏄惁姝ｅ湪鎾斁
+ isFullScreen: false,
+ windowHeight: 0,
+ currentIndex: 0, // 褰撳墠鎾斁鐨勮棰戠储寮�
+ videoList: [
- ], // 瑙嗛鍒楄〃鏁版嵁
- videoContexts: [], // 瑙嗛涓婁笅鏂囧璞￠泦鍚�
- loading: false, // 鏄惁姝ｅ湪鍔犺浇
- page: 1, // 褰撳墠椤电爜
- pageSize: 10 // 姣忛〉鏁伴噺
+ ], // 瑙嗛鍒楄〃鏁版嵁
+ videoContexts: [], // 瑙嗛涓婁笅鏂囧璞￠泦鍚�
+ loading: false, // 鏄惁姝ｅ湪鍔犺浇
+ page: 1, // 褰撳墠椤电爜
+ pageSize: 10 // 姣忛〉鏁伴噺
}
},
onShow() {
- this.loadVideos();
+ // 濡傛灉瑙嗛鎸変笅鏆傚仠鍚庡垏鎹㈤〉闈㈠啀鍥炲埌椤甸潰鏃讹紝鍙畻鏆傚仠鏃堕棿锛堝洜涓烘殏鍋滄椂闂村拰绂诲紑椤甸潰鏃堕棿鏄噸澶嶇殑锛屽彧绠椾竴涓級
+ if(this.startHidenTime !== 0 && this.currentVideoIsPlaying) {
+ const duration = Date.now() - this.startHidenTime
+ this.totalHidenTime += duration
+ }
+ },
+ onHide() {
+ this.startHidenTime = Date.now()
},
onLoad() {
this.loadVideos();
@@ -124,6 +198,107 @@
this.initVideoContexts();
},
methods: {
+ // 鏍煎紡鍖栨椂闂�
+ formatTime(time) {
+ const date = new Date(time);
+ const now = new Date();
+ const diff = Math.floor((now - date) / 1000); // 绉�
+
+ if (diff < 60) return '鍒氬垰';
+ if (diff < 3600) return `${Math.floor(diff / 60)}鍒嗛挓鍓峘;
+ if (diff < 86400) return `${Math.floor(diff / 3600)}灏忔椂鍓峘;
+
+ return `${date.getMonth() + 1}鏈�${date.getDate()}鏃;
+ },
+ // 鎻愪氦璇勮
+ async submitComment() {
+ if (!this.commentForm.commentContent.trim()) {
+ uni.showToast({
+ title: '璇勮鍐呭涓嶈兘涓虹┖',
+ icon: 'none'
+ });
+ return;
+ }
+ // 鍙戣〃璇勮
+ addVideoComment(this.commentForm).then(res => {
+ if(res.data.code === 200) {
+ this.commentForm = {
+ id: null,
+ videoId: null,
+ commentContent: '',
+ replyId: null
+ }
+ this.comments.unshift(res.data.data);
+ uni.showToast({
+ title: '璇勮鎴愬姛'
+ });
+ // 褰撳墠瑙嗛璇勮鏁板姞涓�
+ this.videoList[this.currentIndex].commentNum += 1;
+ } else {
+ uni.showToast({
+ title: res.data.msg,
+ icon: 'none'
+ });
+ }
+ }).catch(() => {
+ uni.showToast({
+ title: '璇勮澶辫触',
+ icon: 'none'
+ });
+ })
+ },
+ // 鍏抽棴璇勮寮圭獥
+ closeCommentPopup() {
+ console.log("瑙﹀彂浜�");
+ this.$refs.commentPopup.close()
+ this.showCommentPopup = false;
+ this.comments = [];
+ this.commentForm = {
+ id: null,
+ videoId: null,
+ commentContent: '',
+ replyId: null
+ }
+ },
+ // 鏄剧ず璇勮寮圭獥
+ async showComments(item) {
+ this.commentForm.videoId = item.id;
+ this.$refs.commentPopup.open();
+ this.commentLoading = true;
+ this.commentQuery.videoId = item.id
+ getVideoComments(this.commentQuery).then(res => {
+ this.comments = res.data.data
+ }).catch(() => {
+ uni.showToast({
+ title: '鑾峰彇璇勮澶辫触',
+ icon: 'none'
+ });
+ }).finally(() => {
+ this.commentLoading = false;
+ })
+ },
+ // 鍏虫敞浣滆��
+ subscribeAuth(index, authorId) {
+ this.videoList.forEach(video => {
+ if(video.authorId === authorId) {
+ video.subscribeThisAuthor = true
+ }
+ })
+ subscribe(authorId).then(res => {
+ if(res.data.code === 200) {
+ uni.showToast({
+ title: '鍏虫敞鎴愬姛~',
+ icon: 'none'
+ });
+ } else {
+ this.videoList.forEach(video => {
+ if(video.authorId === authorId) {
+ video.subscribeThisAuthor = false
+ }
+ })
+ }
+ })
+ },
// 鍒濆鍖栬棰戜笂涓嬫枃
initVideoContexts() {
this.videoContexts = this.videoList.map((_, index) => {
@@ -155,18 +330,29 @@
// 婊戝姩鍒囨崲瑙嗛
onSwiperChange(e) {
- const oldIndex = this.currentIndex;
- this.currentIndex = e.detail.current;
-
- // 鏆傚仠涓婁竴涓棰�
- if (this.videoContexts[oldIndex]) {
- this.videoContexts[oldIndex].pause();
- }
-
- // 鎾斁褰撳墠瑙嗛
- if (this.videoContexts[this.currentIndex]) {
- this.videoContexts[this.currentIndex].play();
- }
+ // 濡傛灉瑙嗛澶勪簬鏆傚仠鐘舵�佸線涓嬪埛瑙嗛锛岄偅涔堥渶瑕佸啀璁＄畻涓�娆℃殏鍋滄椂闂�
+ if(!this.currentVideoIsPlaying) {
+ if(this.startPauseTime !== 0) {
+ const duration = Date.now() - this.startPauseTime
+ this.totalPauseTime += duration
+ }
+ }
+ // 淇濆瓨涓婁竴涓棰戠殑鎾斁璁板綍
+ this.savePlayRecord()
+ const oldIndex = this.currentIndex;
+ console.log("瑙嗛涓婁笅鏂�",this.videoContexts[oldIndex]);
+ this.currentIndex = e.detail.current;
+
+ // 鏆傚仠涓婁竴涓棰�
+ if (this.videoContexts[oldIndex]) {
+ this.videoContexts[oldIndex].pause();
+ }
+ this.currentVideoIsPlaying = true;
+ this.startPauseTime = 0;
+ // 鎾斁褰撳墠瑙嗛
+ if (this.videoContexts[this.currentIndex]) {
+ this.videoContexts[this.currentIndex].play();
+ }
},
// 鏀惰棌/鍙栨秷鏀惰棌
@@ -200,19 +386,54 @@
}
},
// 瑙嗛鎾斁浜嬩欢
- onPlay(index) {
+ onPlay(id, index) {
this.currentVideoIsPlaying = true;
+ this.playRecord.videoId = id;
+ // 娌″垵濮嬪寲鎵嶈祴鍊硷紝鍥犱负涓�涓棰戦噸澶嶆挱鏀緊nPlay浼氶噸澶嶈Е鍙�
+ if(this.playRecord.startPlayTime === 0) {
+ this.playRecord.startPlayTime = Date.now();
+ }
+ if(this.startPauseTime !== 0) {
+ const duration = Date.now() - this.startPauseTime
+ this.totalPauseTime += duration
+ }
},
// 瑙嗛鏆傚仠浜嬩欢
onPause(index) {
this.currentVideoIsPlaying = false;
+ this.startPauseTime = Date.now()
},
// 瑙嗛缁撴潫浜嬩欢
onEnded(index) {
- this.currentVideoIsPlaying = false;
- }
+ // this.currentVideoIsPlaying = false;
+ },
+
+ // 璁板綍鎾斁鏃堕暱
+ onTimeUpdate(e) {
+ this.playRecord.playAt = e.detail.currentTime
+ },
+
+ // 淇濆瓨鎾斁璁板綍
+ async savePlayRecord() {
+ console.log(Date.now(), this.playRecord.startPlayTime, this.totalHidenTime);
+
+ const data = {
+ videoId: this.playRecord.videoId,
+ viewDuration: Date.now() - this.playRecord.startPlayTime - this.totalHidenTime - this.totalPauseTime,
+ playAt: this.playRecord.playAt
+ }
+ this.playRecord = {
+ videoId: null,
+ viewDuration: 0, // 杩欎釜瑙嗛鎬诲叡瑙傜湅浜嗗涔�
+ playAt: 0 ,// 杩欎釜瑙嗛鎾斁鍒板摢浜�
+ startPlayTime: 0 // 杩欎釜瑙嗛浠庝粈涔堟椂鍊欏紑濮嬫挱鏀剧殑
+ }
+ this.totalHidenTime = 0
+ this.totalPauseTime = 0
+ savePlayRecord(data)
+ }
}
}
</script>
@@ -394,5 +615,110 @@
font-size: 26rpx;
font-weight: bold;
}
+ /* 璇勮寮圭獥鏍峰紡 */
+ .comment-popup {
+ background-color: #fff;
+ border-radius: 20rpx 20rpx 0 0;
+ padding-bottom: env(safe-area-inset-bottom);
+ height: 50vh;
+ display: flex;
+ flex-direction: column;
+ }
+ .popup-header {
+ padding: 30rpx;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ border-bottom: 1rpx solid #f5f5f5;
+ }
+
+ .popup-title {
+ font-size: 32rpx;
+ font-weight: bold;
+ }
+
+ .close-icon {
+ /* font-size: 36rpx; */
+ color: #999;
+ }
+
+ .comment-list {
+ flex: 1;
+ padding: 20rpx;
+ box-sizing: border-box;
+ }
+
+ .comment-item {
+ display: flex;
+ padding: 20rpx 0;
+ border-bottom: 1rpx solid #f5f5f5;
+ }
+
+ .avatar {
+ width: 80rpx;
+ height: 80rpx;
+ border-radius: 50%;
+ margin-right: 20rpx;
+ }
+
+ .comment-content {
+ flex: 1;
+ }
+
+ .nickname {
+ font-size: 26rpx;
+ color: #666;
+ display: block;
+ margin-bottom: 10rpx;
+ }
+
+ .content {
+ font-size: 30rpx;
+ color: #333;
+ display: block;
+ margin-bottom: 10rpx;
+ }
+
+ .time {
+ font-size: 24rpx;
+ color: #999;
+ }
+
+ .comment-input-area {
+ display: flex;
+ padding: 20rpx 30rpx;
+ align-items: center;
+ }
+
+ .comment-input {
+ flex: 1;
+ background-color: #fff;
+ height: 80rpx;
+ border: 1px solid #dcdcdc;
+ border-radius: 40rpx;
+ padding: 0 30rpx;
+ font-size: 28rpx;
+ }
+
+ .placeholder {
+ color: #ccc;
+ }
+
+ .submit-btn {
+ margin-left: 20rpx;
+ background-color: #07c160;
+ color: #fff;
+ border-radius: 40rpx;
+ padding: 0 30rpx;
+ height: 80rpx;
+ line-height: 80rpx;
+ font-size: 28rpx;
+ }
+
+ .loading, .empty {
+ padding: 40rpx 0;
+ text-align: center;
+ color: #999;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.8.0