Merge remote-tracking branch 'origin/dev_fix_sub' into dev_fix_sub

peng

2025-08-06 64772c366d7a81bbadad32d45746ec18df5cb5f1

 pages/tabbar/index/home.vue

@@ -39,6 +39,8 @@
            :object-fit="item.videoFit"
            :enable-progress-gesture="false"
            :show-center-play-btn="false"
            :show-progress="true"
            :show-fullscreen-btn="true"
            class="video-item"
            @play="onPlay(item.id, index)"
            @pause="onPause(index)"
@@ -56,9 +58,10 @@
            :style="{bottom: marginBottom + 'px'}"
            class="container">
            <!-- 进度条 - 整个区域可拖动 -->
            <view class="process-warp" :style="{ opacity: showProcess ? 1 : 0 }">
            <!-- <view class="process-warp" :style="{ opacity: showProcess ? 1 : 0 }"> -->
            <view class="process-warp">
              <!-- 显示当前进度 -->
              <view class="progress-text">{{ hasPlayTime }}/{{formartDuration}}</view>
              <view v-show="isTouch" class="progress-text">{{ hasPlayTime }}/{{formartDuration}}</view>
              <view
               class="progress-bar"
               id="progressBar"
@@ -189,7 +192,7 @@
         <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="nickname">{{comment.userNickname}} <text v-if="userId===comment.userId">(我)</text> </text>
              <text class="content">{{comment.commentContent}}</text>
              <view style="position: relative;">
               <text class="time">{{formatTime(comment.createTime)}}</text>
@@ -205,8 +208,8 @@
              <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>
                  <text class="nickname">{{reply.userNickname}}<text v-if="userId===comment.userId">(我)</text></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 v-if="userId===comment.userId">(我)</text></text>
               </view>
               <text class="content">{{reply.commentContent}}</text>
               <view class="reply-footer">
@@ -276,6 +279,8 @@
  },
  data() {
    return {
      isTouch:false,
      userId :'',
      currentImgIndex: 0, // 播放到第几张图--索引
      currentGoodsIndex: 0, // 播放到第几个商品--索引
      currentTime: 0,
@@ -288,7 +293,7 @@
      barWidth: 0, // 进度条宽度
      isDragging: false, // 是否正在拖动
      processHidenTimer: null, // 进度条隐藏定时器
      showProcess: false, // 是否显示进度条
      showProcess: true, // 是否显示进度条
      videoNoMore: false, // 是否还有更多视频
      commentNoMore: false, // 是否还有更多评论
      commentQuery: {
@@ -359,6 +364,9 @@
    }
  },
  onShow() {
     if(!this.userId){
        this.getUserId()
     }
     // const token = storage.getAccessToken();
     // if (! token) {
       //  this.wxSilentLogin(() => {
@@ -368,6 +376,9 @@
     //      this.loadVideos();
     // }
     if (this.videoList.length < 1) {
        this.loading = false;
        this.videoNoMore = false;
        console.log('触发数据加载')
        this.loadVideos();
     }
     // 如果视频按下暂停后切换页面再回到页面时，只算暂停时间（因为暂停时间和离开页面时间是重复的，只算一个）
@@ -380,6 +391,7 @@
     this.startHidenTime = Date.now()
  },
  onLoad(option) {

     console.log('-----------分享出的数据---------->',option)
     //处理扫码出来的视频
     this.marginBottom = uni.getSystemInfoSync().safeAreaInsets.bottom
@@ -439,6 +451,10 @@
     }
  },
  methods: {  
     getUserId(){
        const {id} = uni.getStorageSync('user_info_obj_dev')
        this.userId = id;
     },
     // 解析URL参数
    parseUrlParams(url) {
      const params = {};
@@ -758,6 +774,7 @@
        getVideoComments(this.commentQuery).then(res => {
           this.commentsTotal = res.data.total;
           this.comments = res.data.data;
           console.log('------------------------>',this.comments)
           this.commentQuery.pageNumber += 2;
           this.commentQuery.pageSize /= 2;
        }).catch(() => {
@@ -1077,6 +1094,7 @@
   handleTouchStart(e) {
     this.isDragging = true;
     this.showProcess = true;
     this.isTouch = true;
     this.startProgress = this.progress; // 记录开始时的进度
     this.startX = e.touches[0].pageX;
     console.log("记录开始时的进度", this.startProgress);
@@ -1100,7 +1118,8 @@
     videoContext.seek(this.duration * this.progress / 100)
     videoContext.play()
     this.processHidenTimer = setTimeout(() => {
        this.showProcess = false;
        // this.showProcess = true;
        this.isTouch = false;
      }, 1000);
   },

@@ -1542,16 +1561,21 @@
   .progress-bar {
     position: relative;
     width: 100%;
     height: 16px;
     background-color: #eee;
     height: 5px;
     background-color: rgba(255, 255, 255, 0.2); /* 半透明背景 */
     overflow: hidden;
     border-radius: 1.5px;
     cursor: pointer;
     transition: height 0.2s;
   }

   .progress-fill {
		
     position: absolute;
     left: 0;
     top: 0;
     height: 100%;
     border-radius: 2px;
     background-color: lightgray;
     transition: width 0.1s;
   }