From aea82fc6285fd37a33e0efd6cd0e5089dfa32faf Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 01 九月 2025 22:05:58 +0800
Subject: [PATCH] Merge branch 'dev_fix_sub' of http://42.193.1.25:9521/r/lmk-shop-wx into dev_fix_sub
---
pages/tabbar/index/home.vue | 52 ++++++++++++++++++++++++++++------------------------
1 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/pages/tabbar/index/home.vue b/pages/tabbar/index/home.vue
index b827c82..2933c58 100644
--- a/pages/tabbar/index/home.vue
+++ b/pages/tabbar/index/home.vue
@@ -15,13 +15,12 @@
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"
@@ -75,8 +74,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>
@@ -88,14 +87,15 @@
<!-- 瑙嗛淇℃伅灞� -->
<view class="video-info" :style="{ bottom: marginBottom + 20 + 'px' }">
- <view style="width: 100%; position: relative;" @click="jumpToSearch">
+ <view style="width: 100%; position: relative;">
<text class="video-author">@{{ item.authorName }}</text>
- <text class="iconfont" style="position: absolute;right: 42px;bottom: 50rpx;"></text>
+ <text class="iconfont" @click="jumpToSearch"
+ style="position: absolute;right: 42px;bottom: 50rpx;"></text>
</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 +171,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 +200,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>
@@ -984,7 +984,9 @@
this.videoNoMore = true;
return;
}
- this.videoQuery.pageNumber++;
+ if (res.data.code === 200) {
+ this.videoQuery.pageNumber++;
+ }
})
} else {
@@ -1012,7 +1014,9 @@
this.videoNoMore = true;
return;
}
- this.videoQuery.pageNumber++;
+ if (res.data.code === 200) {
+ this.videoQuery.pageNumber++;
+ }
})
}
@@ -1472,7 +1476,7 @@
/* 鍟嗗搧閾炬帴鎮寕灞傛牱寮� */
.goods-link-warp {
position: absolute;
- bottom: 160px;
+ bottom: 100px;
left: 20px;
color: #f8f8f8;
z-index: 10;
--
Gitblit v1.8.0