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

peng

2025-07-02 d3d0b4dbb4f1f8c4784c834e0a39feba8aa5afa5

 pages/health/healthVideo.vue

@@ -129,30 +129,34 @@
        </view>
        </view>

        <!-- 右侧互动按钮 -->
       <!-- 右侧互动按钮 -->
       <view class="action-buttons" v-if="false">
         <view class="avatar-container">
            <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>
            </view>
         </view>
          <view class="action-item" @click="toggleCollect(item, index)">
         <text class="iconfont" v-if="item.collected">&#xe605;</text>
         <text class="iconfont" v-else>&#xe601;</text>
         <text style="font-size: 10px;font-weight: lighter;">{{item.collectNum}}</text>
          <view class="avatar-container">
             <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>
             </view>
          </view>
          <view class="action-item" @click="toggleThumbsUp(item, index)">
                <text class="iconfont" v-if="item.thumbsUp">&#xe605;</text>
                <text class="iconfont" v-else>&#xe601;</text>
                <text style="font-size: 10px;font-weight: lighter;">{{item.thumbsUpNum}}</text>
          </view>
         <view class="action-item" @click="showComments(item)">
            <text class="iconfont">&#xe7f7;</text>
            <text style="font-size: 10px;font-weight: lighter;">{{item.commentNum}}</text>
          </view>
        <view class="action-item">
           <button open-type="share" class="custom-share-btn" :data-obj="item">
                 <text class="iconfont">&#xe602;</text>
               </button>

        </view>
         <view class="action-item" @click="toggleCollect(item, index)">
           <text class="iconfont" v-if="item.collected">&#xeb9d;</text>
           <text class="iconfont" v-else>&#xe603;</text>
           <text style="font-size: 10px;font-weight: lighter;">{{item.collectNum}}</text>
          </view>
         <view class="action-item">
            <button open-type="share" class="custom-share-btn" :data-obj="item">
             <text class="iconfont">&#xe602;</text>
            </button>
         </view>
        </view>

      </swiper-item>
@@ -244,7 +248,16 @@

<script>
import TopBar from "@/components/TopBar.vue";
import { getHealthRecommendVideos, savePlayRecord, subscribe, getVideoComments, addVideoComment, thubmsUpComment, cancelThubmsUpComment } from "@/api/video.js";
import { 
 getHealthRecommendVideos,
 savePlayRecord, 
 subscribe, 
 getVideoComments, 
 addVideoComment, 
 thubmsUpComment, 
 cancelThubmsUpComment,
 changeThumbsUp
} from "@/api/video.js";
import { changeCollect } from "@/api/collect.js";
import { saveShare, saveShareClickRecord } from "@/api/share.js";
import { silentLogin } from "@/api/connect.js";
@@ -805,6 +818,28 @@
        }
     })
    },
   // 点赞/取消点赞
   toggleThumbsUp(item, index) {
     let data = {
             refId: item.id,
             thumbsUpType: 'video'
     }
     const beforeThumbsUp = item.thumbsUp
     const beforeThumbsUpNum = item.thumbsUpNum
     if(item.thumbsUp) {
             this.videoList[index].thumbsUp = false
             this.videoList[index].thumbsUpNum -= 1
     } else {
             this.videoList[index].thumbsUp = true
             this.videoList[index].thumbsUpNum += 1
     }
     changeThumbsUp(data).then(res => {
             if(res.data.code !== 200) {
                this.videoList[index].thumbsUp = beforeThumbsUp
                this.videoList[index].thumbsUpNum = beforeThumbsUpNum
             }
     })
   },
    // 单击屏幕：暂停或继续播放
   togglePlay(index) {
      console.log("单击视频", index);