From 0c83611409654cfc53c64345ba60b7e1e5fcc5b7 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 01 九月 2025 14:27:22 +0800
Subject: [PATCH] 调整弹窗样式
---
pages/tabbar/index/home.vue | 250 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 225 insertions(+), 25 deletions(-)
diff --git a/pages/tabbar/index/home.vue b/pages/tabbar/index/home.vue
index 33aed35..56c15b5 100644
--- a/pages/tabbar/index/home.vue
+++ b/pages/tabbar/index/home.vue
@@ -34,12 +34,18 @@
:ref="'video'+index"
:src="item.videoUrl"
:autoplay="index === currentIndex"
- :controls="false"
+ :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)"
@@ -48,6 +54,14 @@
@loadedmetadata="onLoadedMetadata($event)"
@waiting="videoWaiting(index)"
></video>
+ <view class="fullscreen-btn">
+ <image
+ class="fullscreen-icon"
+ :src="isFullScreen ? off_screen : on_screen"
+ mode="aspectFit"
+ @click="requestFullScreen('video'+index,item)"
+ ></image>
+ </view>
<!-- 鑷畾涔夋帶鍒舵潯 -->
<view
@touchstart.stop="handleTouchStart"
@@ -56,9 +70,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"
@@ -70,6 +85,7 @@
</view>
</view>
</view>
+
<view style="width: 100%; height: 100%;" v-else-if="item.videoContentType === 'img'">
<uni-swiper-dot
:info="item.imgs"
@@ -122,7 +138,7 @@
<view class="video-info" :style="{bottom: marginBottom + 20 + 'px'}">
<view style="width: 100%; position: relative;">
<text class="video-author">@{{item.authorName}}</text>
- <text class="iconfont" @click="jumpToSearch" style="position: absolute;right: 45px;"></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>
@@ -186,11 +202,13 @@
</view>
<view v-else class="comment-item" v-for="(comment, index) in comments" :key="comment.id">
- <view style="display: flex;">
+ <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 v-if="userId===comment.userId">(鎴�)</text> </text>
- <text class="content">{{comment.commentContent}}</text>
+ <view @click="replyClick(comment)">
+ <text class="nickname">{{comment.userNickname}} <text v-if="userId===comment.userId">(鎴�)</text> </text>
+ <text class="content">{{comment.commentContent}}</text>
+ </view>
<view style="position: relative;">
<text class="time">{{formatTime(comment.createTime)}}</text>
<text @click="openReply(comment)" class="reply-btu time">鍥炲</text>
@@ -202,7 +220,7 @@
<!-- 鍥炲鍒楄〃 -->
<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 class="reply-content" @click="replyClick(reply)">
<view style="display: flex;">
<image class="comment-reply-avatar" :src="reply.replyUserAvatar || '/static/default-avatar.png'"></image>
<text class="nickname">{{reply.userNickname}}<text v-if="userId===comment.userId">(鎴�)</text></text>
@@ -245,6 +263,16 @@
<custom-tabbar bgColor="#333333" selected="index" selectedTextColor="#ffffff"></custom-tabbar>
+
+ <ActivityPopup
+ :show="activityPopup.show"
+ :activityTitle="activityPopup.title"
+ :activityDesc="activityPopup.desc"
+ :activityImage="activityPopup.image"
+ :endTime="activityPopup.endTime"
+ :prizeActivityId="activityPopup.prizeActivityId"
+ @close="onClosePopup"
+ />
</view>
</template>
@@ -258,24 +286,37 @@
thubmsUpComment,
cancelThubmsUpComment,
changeThumbsUp,
- getGoodsSimilarlyVideos
+ getGoodsSimilarlyVideos,
+ removeByIdVideoComment,
} from "@/api/video.js";
+
+import ActivityPopup from '@/pages/ActivityPopup/ActivityPopup.vue'
+import { mapState, mapMutations } from 'vuex'
+import {setPopupRedisTime,getPopupAcitivty} from '@/api/popup.js'
import { changeCollect } from "@/api/collect.js";
import { saveShare, saveShareClickRecord } from "@/api/share.js";
import { silentLogin } from "@/api/connect.js";
import { getUserInfo } from "@/api/members";
import storage from "@/utils/storage.js";
import TopBar from "@/components/TopBar.vue";
-
+import { nextTick } from "vue";
+import {getVideoCover } from "@/api/common.js"
export default {
- components: {TopBar},
+ components: {TopBar,ActivityPopup},
computed: {
hasPlayTime() {
return this.sliderFormatTime(this.progress > 0 ? this.duration * this.progress / 100 : 0);
- }
+ },
+ // 閿欒锛氭病鏈夌敤 ... 灞曞紑锛屽鑷� activityPopup 鏄嚱鏁�
+ ...mapState(['activityPopup'])
},
data() {
return {
+ isControls:false,
+ on_screen: require('@/pages/tabbar/index/static/on_screen.png'),
+ off_screen: require('@/pages/tabbar/index/static/off_screen.png'),
+ isFullScreen:false,
+ isTouch:false,
userId :'',
currentImgIndex: 0, // 鎾斁鍒扮鍑犲紶鍥�--绱㈠紩
currentGoodsIndex: 0, // 鎾斁鍒扮鍑犱釜鍟嗗搧--绱㈠紩
@@ -289,7 +330,7 @@
barWidth: 0, // 杩涘害鏉″搴�
isDragging: false, // 鏄惁姝ｅ湪鎷栧姩
processHidenTimer: null, // 杩涘害鏉￠殣钘忓畾鏃跺櫒
- showProcess: false, // 鏄惁鏄剧ず杩涘害鏉�
+ showProcess: true, // 鏄惁鏄剧ず杩涘害鏉�
videoNoMore: false, // 鏄惁杩樻湁鏇村瑙嗛
commentNoMore: false, // 鏄惁杩樻湁鏇村璇勮
commentQuery: {
@@ -360,6 +401,10 @@
}
},
onShow() {
+
+ this.openActivityPopup()
+
+
if(!this.userId){
this.getUserId()
}
@@ -387,7 +432,7 @@
this.startHidenTime = Date.now()
},
onLoad(option) {
-
+
console.log('-----------鍒嗕韩鍑虹殑鏁版嵁---------->',option)
//澶勭悊鎵爜鍑烘潵鐨勮棰�
this.marginBottom = uni.getSystemInfoSync().safeAreaInsets.bottom
@@ -441,12 +486,133 @@
shareUser: userInfo.id
}
saveShare(data)
- return {
- title: videoInfo.title,
- path: `/pages/tabbar/index/home?videoId=${videoInfo.id}&userId=${userInfo.id}`,
- }
- },
- methods: {
+ // getVideoCover(videoInfo.id).then(res =>{
+ // if(res.statusCode === 200){
+ // imageUrl = res.data.data
+ // console.log(imageUrl)
+ // return {
+ // title: videoInfo.title,
+ // path: `/pages/tabbar/index/home?videoId=${videoInfo.id}&userId=${userInfo.id}`,
+ // imageUrl: imageUrl
+ // }
+ // }
+
+ // })
+ console.log(videoInfo)
+ return {
+ title: videoInfo.title,
+ path: `/pages/tabbar/index/home?videoId=${videoInfo.id}&userId=${userInfo.id}`,
+ imageUrl: videoInfo.coverUrl
+ }
+ // 淇濆瓨鍒嗕韩璁板綍
+ },
+ methods: {
+ async openActivityPopup() {
+ await getPopupAcitivty().then(res =>{
+ if(res.statusCode === 200){
+ let obj = res.data.data;
+ if(obj.enableStatus === 'ON'){
+ setPopupRedisTime().then(res =>{
+ if(res.statusCode === 200){
+ if(res.data.state){
+ this.showActivityPopup({
+ title: obj.activityName,
+ desc: obj.activityDes,
+ image: obj.activityCoverUrl,
+ endTime:new Date(obj.endTime).getTime(),
+ prizeActivityId:obj.id
+ })
+ }else{
+ this.hideActivityPopup()
+ }
+
+ }
+ });
+ }
+
+ }
+ })
+
+ },
+ ...mapMutations(['showActivityPopup','hideActivityPopup']), // 寮曞叆Vuex鐨勬柟娉�
+ onClosePopup() {
+ this.hideActivityPopup()
+ },
+ replyClick(reply){
+
+ if(this.userId === reply.userId){
+ let that = this;
+ uni.showModal({
+ title: '鎻愮ず',
+ content: '浣犵‘瀹氳鍒犻櫎鍚�',
+ success: function (res) {
+ if (res.confirm) {
+ console.log('纭畾');
+ //璋冪敤鍒犻櫎鐨勯�昏緫
+ console.log(reply)
+ removeByIdVideoComment(reply.id).then(res =>{
+ const item = {
+ id:reply.videoId
+ }
+ that.commentQuery.pageNumber = 1;
+ //閲嶆柊鏇存柊璇勮
+ that.showComments(item);
+ })
+
+ } else if (res.cancel) {
+ console.log('鍙栨秷');
+ }
+ }
+ });
+
+ }
+ console.log(reply)
+ },
+ // 鎴彇瑙嗛褰撳墠甯�
+ captureVideoFrame(videoCtx) {
+ return new Promise((resolve) => {
+ videoCtx.requestFrame(() => {
+ wx.canvasToTempFilePath({
+ canvasId: 'shareCanvas',
+ success: (res) => resolve(res),
+ fail: () => resolve({ tempFilePath: '/assets/default-cover.jpg' })
+ });
+ });
+ });
+ },
+ requestFullScreen(id,item){
+ console.log(item)
+
+ const videoContext = uni.createVideoContext(id, this)
+ // 鏍规嵁瑙嗛鏂瑰悜鍐冲畾鍏ㄥ睆鏂瑰悜
+ const direction = this.shouldUseLandscape(item) ? 90 : 0;
+
+ // 鍏堟殏鍋滆棰戯紙閬垮厤鍒囨崲鏃剁殑澹伴煶闂锛�
+ // videoContext.pause();
+
+ // 璇锋眰鍏ㄥ睆
+ videoContext.requestFullScreen({
+ direction: direction,
+ });
+
+
+ },
+ shouldUseLandscape(item) {
+ if(item.videoFit === 'cover'){
+ return false
+ }
+ // 榛樿妯睆锛堟牴鎹笟鍔￠渶姹傝皟鏁达級
+ return true;
+ },
+ // 鍏ㄥ睆鐘舵�佸彉鍖栦簨浠�
+ onFullscreenChange(e) {
+ console.log('鍏ㄥ睆鐘舵�佸彉鍖�:', e.detail.fullScreen)
+ if(e.detail.fullScreen){
+ this.isControls = true;
+ }else{
+ this.isControls = false;
+ }
+ },
getUserId(){
const {id} = uni.getStorageSync('user_info_obj_dev')
this.userId = id;
@@ -758,6 +924,7 @@
this.commentQuery.pageNumber++;
})
},
+
// 鏄剧ず璇勮寮圭獥
async showComments(item) {
this.commentForm.videoId = item.id;
@@ -834,7 +1001,9 @@
this.videoNoMore = true;
return;
}
+ if(res.data.code===200){
this.videoQuery.pageNumber++;
+ }
})
}else{
@@ -862,7 +1031,9 @@
this.videoNoMore = true;
return;
}
- this.videoQuery.pageNumber++;
+ if(res.data.code===200){
+ this.videoQuery.pageNumber++;
+ }
})
}
@@ -1090,6 +1261,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);
@@ -1113,7 +1285,8 @@
videoContext.seek(this.duration * this.progress / 100)
videoContext.play()
this.processHidenTimer = setTimeout(() => {
- this.showProcess = false;
+ // this.showProcess = true;
+ this.isTouch = false;
}, 1000);
},
@@ -1172,6 +1345,28 @@
</script>
<style scoped>
+ .fullscreen-btn {
+ position: absolute;
+ right: 45rpx;
+ bottom: 70rpx;
+ width: 60rpx;
+ height: 60rpx;
+ border-radius: 50%;
+ background-color: rgba(0, 0, 0, 0.4);
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ z-index: 999;
+ backdrop-filter: blur(10rpx);
+ border: 1rpx solid rgba(255, 255, 255, 0.2);
+
+ }
+ /* 鍥炬爣鏍峰紡 */
+ .fullscreen-icon {
+ width: 36rpx;
+ height: 36rpx;
+ opacity: 0.9;
+ }
::v-deep .custom-tabbar {
border-top: none !important;
}
@@ -1272,7 +1467,7 @@
/* 鍟嗗搧閾炬帴鎮寕灞傛牱寮� */
.goods-link-warp {
position: absolute;
- bottom: 160px;
+ bottom: 100px;
left: 20px;
color: #f8f8f8;
z-index: 10;
@@ -1555,16 +1750,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;
}
--
Gitblit v1.8.0