From 92bd763024d8b6e53ea4b784ae81719ee2559bc0 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 15 十月 2025 09:27:14 +0800
Subject: [PATCH] Merge branch 'dev_fix_sub' into user_action
---
pages/tabbar/index/home.vue | 50 +++++++++++++++++++++++++++-----------------------
1 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/pages/tabbar/index/home.vue b/pages/tabbar/index/home.vue
index 054c85e..bf2e045 100644
--- a/pages/tabbar/index/home.vue
+++ b/pages/tabbar/index/home.vue
@@ -15,12 +15,13 @@
mode="aspectFit"></image>
</view>
<video v-if="index >= currentIndex - videoLiveOffset && index <= currentIndex + videoLiveOffset"
- :id="'video' + index" :ref="'video' + index" :src="item.videoUrl" :autoplay="index === currentIndex"
- :controls="isControls" :loop="true" :object-fit="item.videoFit" :enable-progress-gesture="false"
- :show-center-play-btn="false" :show-progress="false" :show-fullscreen-btn="isControls"
- :show-play-btn="isControls" :show-mute-btn="false" class="video-item"
- @fullscreenchange="onFullscreenChange" @play="onPlay(item.id, index)" @pause="onPause(index)"
- @ended="onEnded(index)" @click="togglePlay(index)" @timeupdate="onTimeUpdate($event)"
+ :id="'video' + index" :ref="'video' + index" :src="item.videoUrl"
+ :autoplay="index === currentIndex" :controls="isControls" :loop="true"
+ :object-fit="item.videoFit" :enable-progress-gesture="false" :show-center-play-btn="false"
+ :show-progress="false" :show-fullscreen-btn="isControls" :show-play-btn="isControls"
+ :show-mute-btn="false" class="video-item" @fullscreenchange="onFullscreenChange"
+ @play="onPlay(item.id, index)" @pause="onPause(index)" @ended="onEnded(index)"
+ @click="togglePlay(index)" @timeupdate="onTimeUpdate($event)"
@loadedmetadata="onLoadedMetadata($event)" @waiting="videoWaiting(index)"></video>
<view class="fullscreen-btn">
<image class="fullscreen-icon" :src="isFullScreen ? off_screen : on_screen" mode="aspectFit"
@@ -61,7 +62,8 @@
<!-- 鎮寕鍟嗗搧閾炬帴灞� -->
- <view class="goods-link-warp" :style="{ bottom: marginBottom + 55 + 'px' }" v-if="item.goodsList.length > 0">
+ <view class="goods-link-warp" :style="{ bottom: marginBottom + 55 + 'px' }"
+ v-if="item.goodsList.length > 0">
<view class="goods-link">
<swiper @change="goodsChange" :autoplay="true" :interval="4000" style="height: 120rpx;">
<swiper-item v-for="goods in item.goodsList" :key="goods.goodsId">
@@ -74,8 +76,8 @@
<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>
+ <text class="original-price" v-if="goods.originalPrice">楼{{
+ goods.originalPrice }}</text>
</view>
</view>
</view>
@@ -94,8 +96,8 @@
</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.id">#{{ tag.tagName }}</text>
+ <text class="video-tag" v-for="(tag, index) in item.tagList" :key="tag.id">#{{ tag.tagName
+ }}</text>
</view>
</view>
@@ -171,12 +173,12 @@
<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)"><text
- v-show="comment.thumbsUpNum > 0"
- class="thumbs-num">{{ comment.thumbsUpNum }}</text></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)"><text
- v-show="comment.thumbsUpNum > 0"
- class="thumbs-num">{{ comment.thumbsUpNum }}</text></text>
+ v-show="comment.thumbsUpNum > 0" class="thumbs-num">{{ comment.thumbsUpNum
+ }}</text></text>
</view>
</view>
</view>
@@ -200,12 +202,12 @@
<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)"><text
- v-show="reply.thumbsUpNum > 0"
- class="thumbs-num">{{ reply.thumbsUpNum }}</text></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)"><text
- v-show="reply.thumbsUpNum > 0"
- class="thumbs-num">{{ reply.thumbsUpNum }}</text></text>
+ v-show="reply.thumbsUpNum > 0" class="thumbs-num">{{ reply.thumbsUpNum
+ }}</text></text>
</view>
</view>
</view>
@@ -356,12 +358,12 @@
loading: false, // 鏄惁姝ｅ湪鍔犺浇
videoQuery: {
pageNumber: 1,
- pageSize: 10,
+ pageSize: 3,
videoFrom: 'recommend'
},
goodsSimilarlyQuery: { // 鐩镐技瑙嗛鏌ヨ
pageNumber: 1,
- pageSize: 10,
+ pageSize: 3,
videoFrom: 'goodsSimilarly',
goodsIds: [],
currentVideoId: ''
@@ -1053,7 +1055,8 @@
const data = res.data.data.map(item => {
return {
...item,
- updateKey: item.id
+ updateKey: item.id,
+ videoUrl: item.videoUrl.replace('https://lmk-1356772813.cos.ap-chengdu.myqcloud.com/', 'https://media.meiyikuang.com/')
}
})
if (this.videoQuery.pageNumber === 1) {
@@ -1083,7 +1086,8 @@
const data = res.data.data.map(item => {
return {
...item,
- updateKey: item.id
+ updateKey: item.id,
+ videoUrl: item.videoUrl.replace('https://lmk-1356772813.cos.ap-chengdu.myqcloud.com/', 'https://media.meiyikuang.com/')
}
})
if (this.videoQuery.pageNumber === 1) {
--
Gitblit v1.8.0