From 962764e90a4cd06b9f8a18ec8f542e689fd50131 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 16 六月 2025 12:08:21 +0800
Subject: [PATCH] 刷视频-轮播展示多商品,发布视频字段bug

---
 pages/tabbar/index/home.vue |  646 +++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 546 insertions(+), 100 deletions(-)

diff --git a/pages/tabbar/index/home.vue b/pages/tabbar/index/home.vue
index 4b7f2e1..d665256 100644
--- a/pages/tabbar/index/home.vue
+++ b/pages/tabbar/index/home.vue
@@ -9,52 +9,98 @@
       @change="onSwiperChange"
     >
       <swiper-item v-for="(item, index) in videoList" :key="item.id">
-		<!-- 鎾斁鎸夐挳锛堜粎褰撹棰戞殏鍋滄椂鏄剧ず锛� -->
-		<view 
-		  class="play-icon" 
-		  @click="togglePlay(index)"
-		  v-if="!currentVideoIsPlaying"
-		>
-		  <image src="/static/video/play.png" style="width: 45px;height: 45px" mode="aspectFit"></image>
+		<view style="width: 100%;height: 100%;" v-if="item.videoContentType === 'video'">
+			  <!-- 鎾斁鎸夐挳锛堜粎褰撹棰戞殏鍋滄椂鏄剧ず锛� -->
+			  <view 
+				class="play-icon" 
+				@click="togglePlay(index)"
+				v-if="!currentVideoIsPlaying"
+			  >
+				<image src="/static/video/play.png" style="width: 45px;height: 45px" mode="aspectFit"></image>
+			  </view>
+			  <video
+				:id="'video'+index"
+				:ref="'video'+index"
+				:src="item.videoUrl"
+				:autoplay="currentIndex === index"
+				:controls="false"
+				:loop="true"
+				:object-fit="item.objectFit"
+				:enable-progress-gesture="false"
+				class="video-item"
+				@play="onPlay(item.id, index)"
+				@pause="onPause(index)"
+				@ended="onEnded(index)"
+				@click="togglePlay(index)"
+				@timeupdate="onTimeUpdate($event)"
+				@loadedmetadata="onLoadedMetadata($event)"
+				
+			  ></video>
+			  <!-- 鑷畾涔夋帶鍒舵潯 -->
+			  <view 
+				@touchstart="handleTouchStart"
+				@touchmove="handleTouchMove"
+				@touchend="handleTouchEnd"
+				class="container">
+				<!-- 杩涘害鏉� - 鏁翠釜鍖哄煙鍙嫋鍔� -->
+				<view class="process-warp" :style="{ opacity: showProcess ? 1 : 0 }">
+				  <!-- 鏄剧ず褰撳墠杩涘害 -->
+				  <view class="progress-text">{{ hasPlayTime }}/{{formartDuration}}</view>
+				  <view 
+					class="progress-bar" 
+					id="progressBar"
+				  >
+							  
+					<!-- 宸插~鍏呴儴鍒� -->
+					<view class="progress-fill" :style="{ width: progress + '%' }"></view>
+				  </view>
+				</view>
+			  </view>
 		</view>
-        <video 
-          :id="'video'+index"
-		  :ref="'video'+index"
-          :src="item.videoUrl"
-          :autoplay="currentIndex === index"
-          :controls="false"
-          :loop="true"
-		  :object-fit="item.objectFit"
-          class="video-item"
-          @play="onPlay(item.id, index)"
-          @pause="onPause(index)"
-          @ended="onEnded(index)"
-		  @click="togglePlay(index)"
-		  @timeupdate="onTimeUpdate($event)"
-        ></video>
+		<view style="width: 100%; height: 100%;" v-else-if="item.videoContentType === 'img'">
+		  <uni-swiper-dot 
+			:info="item.imgs" 
+			:current="currentImgIndex" 
+			mode="round" 
+			style="width: 100%;height: 100%;display: flex;justify-content: center;align-items: center;"
+			:dots-styles="{width: 24, bottom: 24,selectedBackgroundColor: 'green', backgroundColor: 'gray'}"
+			>
+		    <swiper class="swiper-box" @change="imgChange" :autoplay="true" :interval="3000">
+		      <swiper-item v-for="img in item.imgs" :key="img">
+		        <view class="swiper-item">
+		          <!-- 璋冩暣 image 鏍峰紡锛屼娇鍏跺眳涓笖鎸夋瘮渚嬬缉鏀� -->
+		          <image 
+		            :src="img" 
+		            mode="aspectFit" 
+		            style="width: 100%; height: 100%; display: block; margin: 0 auto;"
+		          ></image>
+		        </view>
+		      </swiper-item>
+		    </swiper>
+		  </uni-swiper-dot>
+		</view>
+		
 		
 		<!-- 鎮寕鍟嗗搧閾炬帴灞� -->
-		<view class="goods-link-warp">
+		<view class="goods-link-warp" v-if="item.goodsList.length > 0">
 			<view class="goods-link">
-			  <view class="goods-container">
-			    <!-- 鍟嗗搧鍥剧墖 -->
-			    <image class="goods-image" :src="item.goods.imageUrl" mode="aspectFill"></image>
-			    
-			    <!-- 鍟嗗搧淇℃伅 -->
-			    <view class="goods-info">
-			      <text class="goods-name">{{item.goods.name}}</text>
-			      <view class="price-section">
-			        <text class="current-price">楼{{item.goods.price}}</text>
-			        <text class="original-price" v-if="item.goods.originalPrice">楼{{item.goods.originalPrice}}</text>
-			      </view>
-			      <text class="sales-count">{{item.goods.saleNum}}浜哄凡璐�</text>
-			    </view>
-			    
-			    <!-- 璐拱鎸夐挳 -->
-			    <view class="buy-button">
-			      <text>璐拱</text>
-			    </view>
-			  </view>
+			  <swiper @change="goodsChange" :autoplay="true" :interval="4000" style="height: 120rpx;">
+				<swiper-item v-for="goods in item.goodsList" :key="goods.goodsId">
+				  <view class="goods-container">
+					<!-- 鍟嗗搧鍥剧墖 -->
+					<image class="goods-image" :src="goods.thumbnail" mode="aspectFill"></image>
+					
+					<!-- 鍟嗗搧淇℃伅 -->
+					<view class="goods-info">
+					  <text class="goods-name">{{goods.goodsName}}</text>
+					  <view class="price-section">
+						<text class="current-price">楼{{goods.price}}</text>
+						<text class="original-price" v-if="goods.originalPrice">楼{{goods.originalPrice}}</text>
+					  </view>
+					</view>
+				  </view>
+				</swiper-item>
+			  </swiper>
 			</view>
 		</view>
 		
@@ -66,14 +112,14 @@
 		  </view>
           <view style="width: 100%;word-wrap: break-word;white-space: normal;overflow-wrap: break-word;">
 			  <text class="video-title">{{item.title}}</text>
-			  <text class="video-tag" v-for="(tag, index) in item.tagList" :key="tag">#{{tag.tagName}}</text>
+			  <text class="video-tag" v-for="(tag, index) in item.tagList" :key="tag.id">#{{tag.tagName}}</text>
 		  </view>
         </view>
         
         <!-- 鍙充晶浜掑姩鎸夐挳 -->
        <view class="action-buttons">
 		   <view class="avatar-container">
-			   <image class="avatar" :src="item.authorAvatar" mode="aspectFill"></image>
+			   <image class="avatar" @click="jumpToHomePage(item.authorId)" :src="item.authorAvatar" mode="aspectFill"></image>
 			   <!-- 鍏虫敞鍥炬爣 - 浣跨敤缁濆瀹氫綅 -->
 			   <view v-if="!item.subscribeThisAuthor" class="follow-icon" @click="subscribeAuth(index, item.authorId)">
 				 <text class="iconfont">&#xe629;</text>
@@ -97,7 +143,11 @@
 	<uni-popup ref="commentPopup" type="bottom" :is-mask-click="true" @maskClick="closeCommentPopup">
 	  <view class="comment-popup">
 	    <view class="popup-header">
-	      <text class="popup-title">璇勮({{commentsTotal}})</text>
+	      <text class="popup-title" v-if="!commentForm.replyId">璇勮({{commentsTotal}})</text>
+		  <view class="reply-title" v-else>
+		    <text>鍥炲 @{{commentForm.replyUserNickname}}</text>
+		    <text class="cancel-reply" @click="cancelReply">鍙栨秷</text>
+		  </view>
 	      <text class="iconfont close-icon" @click="closeCommentPopup">&#xe675;</text>
 	    </view>
 	    
@@ -110,25 +160,61 @@
 	        鏆傛棤璇勮锛屽揩鏉ュ彂琛ㄧ涓�鏉¤瘎璁哄惂~
 	      </view>
 	      
-	      <view v-else class="comment-item" v-for="comment in comments" :key="comment.id">
-	        <image class="avatar" :src="comment.userAvatar || '/static/default-avatar.png'"></image>
-	        <view class="comment-content">
-	          <text class="nickname">{{comment.userNickname}}</text>
-	          <text class="content">{{comment.commentContent}}</text>
-	          <text class="time">{{formatTime(comment.createTime)}}</text>
-	        </view>
+	      <view v-else class="comment-item" v-for="(comment, index) in comments" :key="comment.id">
+			<view style="display: flex;">
+				<image class="comment-avatar" :src="comment.userAvatar || '/static/default-avatar.png'"></image>
+				<view class="comment-content">
+				  <text class="nickname">{{comment.userNickname}}</text>
+				  <text class="content">{{comment.commentContent}}</text>
+				  <view style="position: relative;">  
+					<text class="time">{{formatTime(comment.createTime)}}</text>
+					<text @click="openReply(comment)" class="reply-btu time">鍥炲</text>
+					<text v-if="!comment.hasThumbsUp" class="thumbs-up time iconfont" @click="thubmsUp(comment.id, index, null)">&#xe614;<text v-show="comment.thumbsUpNum > 0" class="thumbs-num">{{comment.thumbsUpNum}}</text></text>
+					<text v-else class="thumbs-up time iconfont" @click="cancelThumbsUp(comment.id, index, null)">&#xe607;<text v-show="comment.thumbsUpNum > 0" class="thumbs-num">{{comment.thumbsUpNum}}</text></text>
+				  </view>
+				</view>
+			</view>
+			<!-- 鍥炲鍒楄〃 -->
+			  <view class="reply-list" v-if="comment.replies && comment.replies.length > 0">
+				<view class="reply-item" v-for="(reply, replyIndex) in comment.replies" :key="reply.id">
+				  <view class="reply-content">
+					<view style="display: flex;">
+						<image class="comment-reply-avatar" :src="reply.replyUserAvatar || '/static/default-avatar.png'"></image>
+						<text class="nickname">{{reply.userNickname}}</text>
+						<text v-if="reply.replyUserId && reply.masterCommentId !== reply.replyId" class="reply-to"><text style="margin-right: 10rpx;font-size: 28rpx;" class="iconfont">&#xe666;</text>{{reply.replyUserNickname}}</text>
+					</view>
+					<text class="content">{{reply.commentContent}}</text>
+					<view class="reply-footer">
+					  <text class="time">{{formatTime(reply.createTime)}}</text>
+					  <text @click="openReply(comment, reply)" class="reply-btu time">鍥炲</text>
+					  <text v-if="!reply.hasThumbsUp" class="thumbs-up time iconfont" @click="thubmsUp(reply.id, index, replyIndex)">&#xe614;<text v-show="reply.thumbsUpNum > 0" class="thumbs-num">{{reply.thumbsUpNum}}</text></text>
+					  <text v-else class="thumbs-up time iconfont" @click="cancelThumbsUp(reply.id, index, replyIndex)">&#xe607;<text v-show="reply.thumbsUpNum > 0" class="thumbs-num">{{reply.thumbsUpNum}}</text></text>
+					</view>
+				  </view>
+				</view>
+			  </view>
+			  <view class="view-more-replies" v-if="comment.replyTotalCount > 0 && !comment.expandReply" @click="loadRepliesPage(comment, index)">
+				<text class="line">鈥斺��</text>灞曞紑{{comment.replyTotalCount}}鏉″洖澶� 鈫�
+			  </view>
+			  <view class="reply-op" v-if="comment.replyTotalCount > replyCommentQuery.pageNumber * replyCommentQuery.pageSize && comment.expandReply">
+			  	<view @click="loadNextPageReply(index)" class="reply-op-item"><text class="line">鈥斺��</text>灞曞紑鏇村<text class="iconfont textSideIcon">&#xeb8d;</text></view>
+			  	<view @click="retractReplyComment(index)" class="reply-op-item" style="margin-left: 50rpx;">鏀惰捣<text class="iconfont textSideIcon">&#xeb9b;</text></view>
+			  </view>
+			  <view class="reply-op" v-else-if="comment.replyTotalCount <= replyCommentQuery.pageNumber * replyCommentQuery.pageSize && comment.expandReply">
+			  	<view @click="retractReplyComment(index)" class="reply-op-item"><text class="line">鈥斺��</text>鏀惰捣<text class="iconfont textSideIcon">&#xeb9b;</text></view>
+			  </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>
+		  <input 
+			ref="commentInput"
+			class="comment-input" 
+			v-model="commentForm.commentContent" 
+			:placeholder="commentForm.replyId ? `鍥炲 @${commentForm.replyUserNickname}` : '鍐欎笅浣犵殑璇勮...'" 
+			placeholder-class="placeholder"
+		  />
+		  <button class="submit-btn" @click="submitComment" :disabled="!commentForm.commentContent.trim()">鍙戦��</button>
+		</view>
 	  </view>
 	</uni-popup>
 	
@@ -138,11 +224,30 @@
 </template>
 
 <script>
-import { getRecommendVideos, savePlayRecord, subscribe, getVideoComments, addVideoComment } from "@/api/video.js";
+import { getRecommendVideos, savePlayRecord, subscribe, getVideoComments, addVideoComment, thubmsUpComment, cancelThubmsUpComment } from "@/api/video.js";
 import { changeCollect } from "@/api/collect.js";
 export default {
+  computed: {
+	    hasPlayTime() {
+	      return this.sliderFormatTime(this.progress > 0 ? this.duration * this.progress / 100 : 0);
+	    }
+  },
   data() {
     return {
+		currentImgIndex: 0, // 鎾斁鍒扮鍑犲紶鍥�--绱㈠紩
+		currentGoodsIndex: 0, // 鎾斁鍒扮鍑犱釜鍟嗗搧--绱㈠紩
+		currentTime: 0,
+		formartDuration: '',
+		duration: 0,
+		startX: 0,
+		progress: 0, // 瑙嗛杩涘害
+		startProgress : 0, // 寮�濮嬫粦鍔ㄦ椂鐨勮繘搴�
+		barLeft: 0, // 杩涘害鏉″乏杈圭晫浣嶇疆
+		barWidth: 0, // 杩涘害鏉″搴�
+		isDragging: false, // 鏄惁姝e湪鎷栧姩
+		processHidenTimer: null, // 杩涘害鏉¢殣钘忓畾鏃跺櫒
+		showProcess: false, // 鏄惁鏄剧ず杩涘害鏉�
+		videoNoMore: false, // 鏄惁杩樻湁鏇村瑙嗛
 		commentNoMore: false, // 鏄惁杩樻湁鏇村璇勮
 		commentQuery: {
 			pageNumber: 1,
@@ -150,11 +255,21 @@
 			videoId: '',
 			masterCommentId: ''
 		},
+		replyCommentQuery: {
+			pageNumber: 1,
+			pageSize: 5,
+			videoId: '',
+			masterCommentId: ''
+		},
 		commentForm: { // 璇勮琛ㄥ崟鏁版嵁
-			id: null,
-			videoId: null,
+			id: '',
+			videoId: '',
 			commentContent: '',
-			replyId: null
+			replyId: '',
+			replyUserId: '',
+			replyUserNickname: '',
+			replyUserAvatar: '',
+			masterCommentId: null
 		},
 		comments: [],            // 璇勮鍒楄〃
 		commentsTotal: 0,            // 璇勮鎬绘潯鏁�
@@ -178,8 +293,11 @@
 		],   // 瑙嗛鍒楄〃鏁版嵁
 		videoContexts: [], // 瑙嗛涓婁笅鏂囧璞¢泦鍚�
 		loading: false,  // 鏄惁姝e湪鍔犺浇
-		page: 1,         // 褰撳墠椤电爜
-		pageSize: 10     // 姣忛〉鏁伴噺
+		videoQuery: {
+			pageNumber: 1,
+			pageSize: 6,
+			videoFrom: 'recommend'
+		}
     }
   },
   onShow() {
@@ -201,6 +319,127 @@
     this.initVideoContexts();
   },
   methods: {
+	  // 杞挱鍥惧彉鍖�
+	  imgChange(e) {
+		  this.currentImgIndex = e.detail.current;
+	  },
+	  // 鍟嗗搧杞挱鍥惧彉鍖�
+	  goodsChange(e) {
+		  this.currentGoodsIndex = e.detail.current;
+	  },
+	  // 鑾峰彇杩涘害鏉$殑浣嶇疆鍜屽昂瀵�
+	  getBarRect() {
+	    const query = uni.createSelectorQuery().in(this);
+	    query.select('#progressBar').boundingClientRect(rect => {
+	      if (rect) {
+	        this.barLeft = rect.left;
+	        this.barWidth = rect.width;
+	      }
+	    }).exec();
+	  },
+		// 璺宠浆涓汉涓婚〉
+		jumpToHomePage(authorId) {
+			uni.navigateTo({
+				url: "/pages/video/home-page?authorId=" + authorId
+			})
+		},
+		// 鍙栨秷鐐硅禐
+		async cancelThumbsUp(id, commentIndex, replyIndex) {
+			const data = {
+				refId: id,
+				thumbsUpType: 'video_comment'
+			}
+			cancelThubmsUpComment(data).then(res => {
+				if(replyIndex != null) {
+					this.comments[commentIndex].replies[replyIndex].hasThumbsUp = false;
+					this.comments[commentIndex].replies[replyIndex].thumbsUpNum -= 1;
+				} else {
+					this.comments[commentIndex].hasThumbsUp = false;
+					this.comments[commentIndex].thumbsUpNum -= 1;
+				}
+			})
+		},
+		// 璇勮鐐硅禐
+		async thubmsUp(id, commentIndex, replyIndex) {
+			const data = {
+				refId: id,
+				thumbsUpType: 'video_comment'
+			}
+			thubmsUpComment(data).then(res => {
+				if(replyIndex != null) {
+					this.comments[commentIndex].replies[replyIndex].hasThumbsUp = true;
+					this.comments[commentIndex].replies[replyIndex].thumbsUpNum += 1;
+				} else {
+					this.comments[commentIndex].hasThumbsUp = true;
+					this.comments[commentIndex].thumbsUpNum += 1;
+				}
+			})
+		},
+		// 鍔犺浇涓嬩竴椤靛洖澶�
+		loadNextPageReply(index) {
+			this.replyCommentQuery.pageNumber++;
+			getVideoComments(this.replyCommentQuery).then(res => {
+				this.comments[index].replies = [
+				  ...this.comments[index].replies,
+				  ...res.data.data.filter(
+				    (newItem) => !this.comments[index].replies.some((oldItem) => oldItem.id === newItem.id)
+				  ),
+				];
+			})
+		},
+		// 鏀惰捣鍥炲
+		retractReplyComment(index) {
+			this.comments[index].expandReply = false;
+			this.comments[index].replies = [];
+		},
+		// 鍔犺浇鍥炲
+		loadRepliesPage(comment, index) {
+			this.replyCommentQuery.pageNumber = 1;
+			this.replyCommentQuery.masterCommentId = comment.id
+		    getVideoComments(this.replyCommentQuery).then(res => {
+				this.comments[index].replies = res.data.data;
+				this.comments[index].expandReply = true;
+			})
+		},
+		resetCommentForm() {
+			const videoId = this.commentForm.videoId;
+			this.commentForm = { // 璇勮琛ㄥ崟鏁版嵁
+				id: '',
+				videoId: videoId,
+				commentContent: '',
+				replyId: '',
+				replyUserId: '',
+				replyUserNickname: '',
+				replyUserAvatar: '',
+				masterCommentId: null
+			}
+		},
+	    // 鍙栨秷鍥炲
+	    cancelReply() {
+	        this.resetCommentForm()
+	      },
+		// 鎵撳紑鍥炲妗�
+		openReply(comment, reply = null) {
+		  if(reply) {
+			comment = reply
+		  }
+		  this.commentForm.masterCommentId = comment.masterCommentId ? comment.masterCommentId : comment.id;
+		  this.commentForm.replyId = comment.id;
+		  this.commentForm.replyUserId = comment.userId;
+		  this.commentForm.replyUserNickname = comment.userNickname;
+		  this.commentForm.replyUserAvatar = comment.userAvatar;
+		  // 鑷姩鑱氱劍杈撳叆妗�
+		  this.$nextTick(() => {
+			const input = this.$refs.commentInput;
+			if (input) input.focus();
+		  });
+		},
+		// 杩涘害鏉℃椂闂存牸寮忓寲 (00:00)
+		sliderFormatTime(seconds) {
+		  const mins = Math.floor(seconds / 60);
+		  const secs = Math.floor(seconds % 60);
+		  return `${mins.toString().padStart(2, '0')}:${secs.toString().padStart(2, '0')}`;
+		},
 		// 鏍煎紡鍖栨椂闂�
 	    formatTime(time) {
 	      const date = new Date(time);
@@ -225,13 +464,20 @@
 		  // 鍙戣〃璇勮
 	      addVideoComment(this.commentForm).then(res => {
 			  if(res.data.code === 200) {
-				  this.commentForm = {
-				  			  id: null,
-				  			  videoId: null,
-				  			  commentContent: '',
-				  			  replyId: null
+				  this.resetCommentForm()
+				  
+				  // 濡傛灉鏄瘎璁哄埆浜虹殑鍥炲锛岄偅涔堝氨灏嗚繖涓彂甯冨埌replies閲岄潰
+				  if(res.data.data.replyId) {
+					  for (const [index, item] of this.comments.entries()) {
+					    if (item.id === res.data.data.replyId) {
+					      item.replies.unshift(res.data.data);
+					      // this.loadRepliesPage(item, index)
+					      break; // 璺冲嚭寰幆
+					    }
+					  }
+				  } else {
+					this.comments.unshift(res.data.data);
 				  }
-				  this.comments.unshift(res.data.data);
 				  console.log("鏂板鍚�",this.comments);
 				  uni.showToast({
 				    title: '璇勮鎴愬姛'
@@ -257,12 +503,7 @@
 		  this.$refs.commentPopup.close()
 	      this.showCommentPopup = false;
 	      this.comments = [];
-	      this.commentForm = {
-			  id: null,
-			  videoId: null,
-			  commentContent: '',
-			  replyId: null
-		  }
+	      this.resetCommentForm()
 		  this.commentQuery.pageNumber = 1;
 		  this.commentNoMore = false;
 	    },
@@ -295,6 +536,7 @@
 	      this.$refs.commentPopup.open();
 	      this.commentLoading = true;
 	      this.commentQuery.videoId = item.id
+	      this.replyCommentQuery.videoId = item.id
 		  // 棣栨鍔犺浇璇勮鍒嗛〉澶у皬澧炲姞涓�鍊嶏紝浠ヤ骇鐢熸粴鍔ㄦ潯锛屽悗缁彲瑙﹀彂
 		  this.commentQuery.pageSize *= 2;
 		  getVideoComments(this.commentQuery).then(res => {
@@ -343,22 +585,31 @@
     
     // 鍔犺浇瑙嗛鏁版嵁
     async loadVideos() {
-      if (this.loading) return;
+      if (this.loading || this.videoNoMore) return;
       this.loading = true;
       
-	  getRecommendVideos({pageNumber: this.page, pageSize: this.pageSize}).then(res => {
+	  getRecommendVideos(this.videoQuery).then(res => {
 		  console.log(res, "瑙嗛鏁版嵁");
-		  if (this.page === 1) {
+		  if (this.videoQuery.pageNumber === 1) {
 		    this.videoList = res.data.data;
 		  } else {
-		    this.videoList = [...this.videoList, ...res.data.data];
+			this.videoList = [
+			  ...this.videoList,
+			  ...res.data.data.filter(
+			    (newItem) => !this.videoList.some((oldItem) => oldItem.id === newItem.id)
+			  ),
+			];
 		  }
-		  
-		  this.page++;
 		  this.$nextTick(() => {
 		    this.initVideoContexts();
 		  });
 		  this.loading = false;
+		  if(res.data.data.length < this.videoQuery.pageSize) {
+			  this.videoNoMore = true;
+			  return;
+		  }
+		  this.videoQuery.pageNumber++;
+		  
 	  })
     },
     
@@ -412,6 +663,7 @@
     },
     // 鍗曞嚮灞忓箷锛氭殏鍋滄垨缁х画鎾斁
 	togglePlay(index) {
+		console.log("鍗曞嚮瑙嗛", index, this.videoContexts);
 		if(this.currentVideoIsPlaying) {
 			this.videoContexts[index].pause();
 		} else {
@@ -420,6 +672,8 @@
 	},
     // 瑙嗛鎾斁浜嬩欢
     onPlay(id, index) {
+		this.getBarRect()
+		this.progress = 0
 		console.log(id, index, "瑙﹀彂鎾斁");
 		if(index === this.currentIndex) {
 			this.currentVideoIsPlaying = true;
@@ -449,7 +703,6 @@
 		}
 	  this.startPauseTime = Date.now()
     },
-    
     // 瑙嗛缁撴潫浜嬩欢
     onEnded(index) {
       // this.currentVideoIsPlaying = false;
@@ -457,9 +710,66 @@
 	
 	// 璁板綍鎾斁鏃堕暱
 	onTimeUpdate(e) {
-		this.playRecord.playAt = e.detail.currentTime
+		this.playRecord.playAt = e.detail.currentTime;
+		
+		this.currentTime = e.detail.currentTime;
+		this.progress = (e.detail.currentTime / this.duration) * 100
+	},
+	// 瑙︽懜寮�濮�
+	handleTouchStart(e) {
+	  this.isDragging = true;
+	  this.showProcess = true;
+	  this.startProgress = this.progress; // 璁板綍寮�濮嬫椂鐨勮繘搴�
+	  this.startX = e.touches[0].pageX;
+	  console.log("璁板綍寮�濮嬫椂鐨勮繘搴�", this.startProgress);
+	  this.videoContexts[this.currentIndex].pause()
+	  // this.updateProgress(e);
 	},
 	
+	// 瑙︽懜绉诲姩
+	handleTouchMove(e) {
+	  if (!this.isDragging || !this.barWidth) return;
+	  clearTimeout(this.processHidenTimer)
+	  this.videoContexts[this.currentIndex].pause()
+	  this.updateProgress(e);
+	},
+	
+	// 瑙︽懜缁撴潫
+	handleTouchEnd() {
+	  this.isDragging = false;
+	  console.log("婊戝姩缁撴潫", this.duration * this.progress);
+	  this.videoContexts[this.currentIndex].seek(this.duration * this.progress / 100)
+	  this.videoContexts[this.currentIndex].play()
+	  this.processHidenTimer = setTimeout(() => {
+		  this.showProcess = false;
+		}, 1000);
+	},
+	
+	// 鏇存柊杩涘害
+	updateProgress(e) {
+		// 鑾峰彇褰撳墠瑙︽懜鐐筙鍧愭爣
+		const currentX = e.touches[0].pageX;
+		
+		// 璁$畻婊戝姩璺濈(鍍忕礌)
+		const deltaX = currentX - this.startX;
+		
+		// 灏嗗儚绱犺窛绂昏浆鎹负杩涘害澧為噺
+		const deltaProgress = (deltaX / this.barWidth) * 100;
+		console.log("杩涘害澧為噺", deltaProgress);
+		// 璁$畻鏂拌繘搴� = 寮�濮嬫椂鐨勮繘搴� + 婊戝姩澧為噺
+		let newProgress = this.startProgress + deltaProgress;
+		
+		// 闄愬埗鑼冨洿鍦�0-100涔嬮棿
+		newProgress = Math.max(0, Math.min(100, newProgress));
+		
+		this.progress = newProgress;
+	},
+	// 鑾峰彇瑙嗛鎬绘椂闀�
+	onLoadedMetadata(e) {
+	  this.duration = e.detail.duration;
+	  this.formartDuration = this.sliderFormatTime(this.duration);
+	  console.log("瑙嗛鎬绘椂闀�", this.duration);
+	},
 	// 淇濆瓨鎾斁璁板綍
 	async savePlayRecord() {
 		console.log(Date.now(), this.playRecord.startPlayTime, this.totalHidenTime);
@@ -495,7 +805,7 @@
 	
 	.video-swiper {
 	  width: 100%;
-	  height: 100%;
+	  height: calc(100% - 50px);
 	}
 	
 	.video-item {
@@ -591,6 +901,7 @@
 	}
 	.goods-link {
 	  position: relative;
+	  width: 450rpx;
 	  margin: 20rpx 0;
 	  padding: 12rpx;
 	  background-color: rgba(255, 255, 255, 0.9);
@@ -599,6 +910,7 @@
 	}
 	
 	.goods-container {
+	  width: 100%;
 	  display: flex;
 	  align-items: center;
 	}
@@ -621,11 +933,13 @@
 	  font-size: 28rpx;
 	  color: #333;
 	  font-weight: bold;
-	  display: -webkit-box;
 	  -webkit-line-clamp: 2;
 	  -webkit-box-orient: vertical;
-	  overflow: hidden;
 	  margin-bottom: 8rpx;
+	  width: 280rpx; /* 闇�瑕佹寚瀹氬搴� */
+	  overflow: hidden;
+	  white-space: nowrap;
+	  text-overflow: ellipsis;
 	}
 	
 	.price-section {
@@ -642,7 +956,7 @@
 	}
 	
 	.original-price {
-	  font-size: 24rpx;
+	  font-size: 28rpx;
 	  color: #999;
 	  text-decoration: line-through;
 	}
@@ -655,7 +969,7 @@
 	.buy-button {
 	  background: linear-gradient(to right, #ff5a5f, #ff2e4d);
 	  color: white;
-	  padding: 10rpx 24rpx;
+	  padding: 10rpx 28rpx;
 	  border-radius: 20rpx;
 	  font-size: 26rpx;
 	  font-weight: bold;
@@ -697,14 +1011,21 @@
 
 	.comment-item {
 	  display: flex;
-	  padding: 10rpx 0;
+	  flex-direction: column;
+	  padding: 10rpx 0 20rpx 0;
 	}
 
-	.avatar {
-	  width: 80rpx;
-	  height: 80rpx;
+	.comment-avatar {
+	  width: 70rpx;
+	  height: 70rpx;
 	  border-radius: 50%;
-	  margin-right: 20rpx;
+	  margin-right: 10rpx;
+	}
+	.comment-reply-avatar {
+		width: 40rpx;
+		height: 40rpx;
+		border-radius: 50%;
+		margin-right: 10rpx;
 	}
 
 	.comment-content {
@@ -712,21 +1033,21 @@
 	}
 
 	.nickname {
-	  font-size: 24rpx;
+	  font-size: 28rpx;
 	  color: #666;
 	  display: block;
 	  margin-bottom: 10rpx;
 	}
 
 	.content {
-	  font-size: 24rpx;
+	  font-size: 28rpx;
 	  color: #333;
 	  display: block;
 	  margin-bottom: 10rpx;
 	}
 
 	.time {
-	  font-size: 24rpx;
+	  font-size: 28rpx;
 	  color: #999;
 	}
 
@@ -766,4 +1087,129 @@
 	  text-align: center;
 	  color: #999;
 	}
+	.reply-list {
+	  margin-top: 20rpx;
+	  padding-left: 80rpx;
+	}
+	.reply-op {
+		margin-top: 10rpx;
+		padding-left: 80rpx;
+		display: flex;
+		font-size: 28rpx;
+		color: #333;
+	}
+	.reply-op-item {
+		display: flex;
+		align-items: center;
+		height: 40rpx;
+	}
+	
+	.reply-item {
+	  display: flex;
+	  margin-bottom: 20rpx;
+	}
+	
+	.reply-content {
+	  flex: 1;
+	}
+	
+	.reply-to {
+	  color: #576b95;
+	  margin: 0 10rpx;
+	  font-size: 28rpx;
+	}
+	.reply-title {
+	  display: flex;
+	  align-items: center;
+	  font-size: 28rpx;
+	  color: #333;
+	}
+	
+	.cancel-reply {
+	  margin-left: 20rpx;
+	  color: #576b95;
+	  font-size: 28rpx;
+	  padding: 6rpx 12rpx;
+	  background: #f5f5f5;
+	  border-radius: 20rpx;
+	}
+	.view-more-replies {
+	  color: #576b95;
+	  font-size: 28rpx;
+	  padding: 10rpx 0;
+	  padding-left: 80rpx;
+	}
+	.comment-footer, .reply-footer {
+	  display: flex;
+	  align-items: center;
+	  font-size: 28rpx;
+	  color: #999;
+	}
+	.reply-btu {
+		margin-left: 30rpx;
+	}
+	.thumbs-up {
+		position: absolute;
+		right: 20rpx;
+		font-size: 32rpx;
+		width: 120rpx;
+	}
+	.textSideIcon {
+		font-size: 36rpx;
+		margin-left: 5rpx;
+	}
+	.line {
+		margin-right: 10rpx;
+		color: #cccccc;
+	}
+	.thumbs-num {
+		margin-left: 4rpx;
+	}
+	.container {
+	  display: flex;
+	  flex-direction: column;
+	  align-items: center;
+	  position: absolute;
+	  bottom: 0;
+	  width: 100%;
+	}
+	
+	.progress-bar {
+	  position: relative;
+	  width: 100%;
+	  height: 16px;
+	  background-color: #eee;
+	  overflow: hidden;
+	}
+	
+	.progress-fill {
+	  position: absolute;
+	  left: 0;
+	  top: 0;
+	  height: 100%;
+	  background-color: lightgray;
+	  transition: width 0.1s;
+	}
+	.process-warp {
+		width: 100%;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+	.progress-text {
+	  margin-top: 10px;
+	  font-size: 14px;
+	  color: #666;
+	}
+	.swiper-box {
+	  width: 100%;
+	  height: 1400rpx;
+	}
+	.swiper-item {
+	  display: flex;
+	  justify-content: center;
+	  align-items: center;
+	  width: 100%;
+	  height: 100%;
+	}
 </style>
\ No newline at end of file

--
Gitblit v1.8.0