From e661ea6782bf6e7283689224506eef0869a27e6d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 19 十二月 2024 14:58:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/task/vDangetAppr.vue | 115 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 73 insertions(+), 42 deletions(-)
diff --git a/h5/pages/staff/task/vDangetAppr.vue b/h5/pages/staff/task/vDangetAppr.vue
index 3138b6b..c4b2238 100644
--- a/h5/pages/staff/task/vDangetAppr.vue
+++ b/h5/pages/staff/task/vDangetAppr.vue
@@ -13,8 +13,8 @@
<image v-if="item.type == 0" :src="item.fileurlFull" @click="priviewImage(item.fileurlFull)" mode="widthFix"
class="img" />
<view v-if="item.type == 1" @click="videoClick(item, i)" class="video_wrap">
- <video :id="'id' + i" :show-center-play-btn="false" :src="item.fileurlFull" muted class="video"
- :controls="false" />
+ <video :src="item.fileurlFull" initial-time="0.01" :show-center-play-btn="false" :controls="false"
+ class="video" :enable-progress-gesture="false" autoplay muted />
<image src="@/static/play.png" class="play" mode=""></image>
</view>
</view>
@@ -44,7 +44,13 @@
<view class="adduser_list_item_ipt1_upload" v-for="(item, i) in info.dealBeforeFileList" :key="i">
<image v-if="item.type == 0" @click="priviewImage(item.fileurlFull)" :src="item.fileurlFull"
mode="widthFix"></image>
- <video v-if="item.type == 1" @click="videoClick(item, i)" :src="item.fileurlFull" :controls="false"></video>
+ <!-- <video v-if="item.type == 1" @click="videoClick(item, i)" :src="item.fileurlFull" :show-center-play-btn="false" :controls="false" class="video"
+ :enable-progress-gesture="false" autoplay muted></video> -->
+ <view v-if="item.type == 1" @click="videoClick(item, i)" class="video_wrap">
+ <video :src="item.fileurlFull" :initial-time="0.01" :show-center-play-btn="false" :controls="false"
+ class="video" :enable-progress-gesture="false" muted />
+ <image src="@/static/play.png" class="play" mode=""></image>
+ </view>
</view>
</view>
</view>
@@ -54,7 +60,13 @@
<view class="adduser_list_item_ipt1_upload" v-for="(item, i) in info.dealAfterFileList" :key="i">
<image v-if="item.type == 0" @click="priviewImage(item.fileurlFull)" :src="item.fileurlFull"
mode="widthFix"></image>
- <video v-if="item.type == 1" @click="videoClick(item, i)" :src="item.fileurlFull" :controls="false"></video>
+ <!-- <video v-if="item.type == 1" @click="videoClick(item, i)" :src="item.fileurlFull" initial-time="0.01" :show-center-play-btn="false" :controls="false" class="video"
+ :enable-progress-gesture="false" autoplay muted></video> -->
+ <view v-if="item.type == 1" @click="videoClick(item, i)" class="video_wrap">
+ <video :src="item.fileurlFull" :initial-time="0.01" :show-center-play-btn="false" :controls="false"
+ class="video" :enable-progress-gesture="false" muted />
+ <image src="@/static/play.png" class="play" mode=""></image>
+ </view>
</view>
</view>
</view>
@@ -137,7 +149,13 @@
@click="fileDel('dealBeforeFileList', i)"></u-icon>
<image v-if="item.type == 0" @click="priviewImage(item.fileurlFull)" :src="item.fileurlFull"
mode="widthFix"></image>
- <video v-if="item.type == 1" @click="videoClick(item, i)" :src="item.fileurlFull" :controls="false"></video>
+ <!-- <video v-if="item.type == 1" @click="videoClick(item, i)" :src="item.fileurlFull" show-center-play-btn="false" :controls="false" class="video"
+ :enable-progress-gesture="false" autoplay muted></video> -->
+ <view v-if="item.type == 1" @click="videoClick(item, i)" class="video_wrap">
+ <video :src="item.fileurlFull" :initial-time="0.01" :show-center-play-btn="false" :controls="false"
+ class="video" :enable-progress-gesture="false" muted />
+ <image src="@/static/play.png" class="play" mode=""></image>
+ </view>
</view>
</view>
<view class="label">閫�鍥炶鏄�</view>
@@ -177,7 +195,13 @@
<u-icon class="close" size="20" name="close-circle-fill" color="red"
@click="fileDel('dealBeforeFileList', i)"></u-icon>
<image v-if="item.type == 0" :src="item.fileurlFull" mode="widthFix"></image>
- <video v-if="item.type == 1" :src="item.fileurlFull" :controls="false"></video>
+ <!-- <video v-if="item.type == 1" :src="item.fileurlFull" :show-center-play-btn="false" :controls="false" class="video"
+ :enable-progress-gesture="false" muted></video> -->
+ <view v-if="item.type == 1" class="video_wrap">
+ <video :src="item.fileurlFull" :initial-time="0.01" :show-center-play-btn="false" :controls="false"
+ class="video" :enable-progress-gesture="false" muted />
+ <image src="@/static/play.png" class="play" mode=""></image>
+ </view>
</view>
</view>
<view class="label">
@@ -193,7 +217,12 @@
<u-icon class="close" size="20" name="close-circle-fill" color="red"
@click="fileDel('dealAfterFileList', i)"></u-icon>
<image v-if="item.type == 0" :src="item.fileurlFull" mode="widthFix"></image>
- <video v-if="item.type == 1" :src="item.fileurlFull" :controls="false"></video>
+ <!-- <video v-if="item.type == 1" :src="item.fileurlFull" :show-center-play-btn="false" :controls="false"></video> -->
+ <view v-if="item.type == 1" class="video_wrap">
+ <video :src="item.fileurlFull" :initial-time="0.01" :show-center-play-btn="false" :controls="false"
+ class="video" :enable-progress-gesture="false" muted />
+ <image src="@/static/play.png" class="play" mode=""></image>
+ </view>
</view>
</view>
<view class="label">鏁存敼璇存槑</view>
@@ -266,9 +295,9 @@
@cancel="isShowHandleDate = false" mode="datetime"></u-datetime-picker>
<!-- -->
- <view v-if="videoPlay" class="video_app" >
- <video controls autoplay muted x5-video-player-type="h5"
- x5-video-player-fullscreen="true" id="myvideo" :src="videoUrl" @fullscreenchange="screenChange"></video>
+ <view v-if="videoPlay" class="video_app">
+ <video controls autoplay muted x5-video-player-type="h5" x5-video-player-fullscreen="true" id="myvideo"
+ :src="videoUrl" @fullscreenchange="screenChange"></video>
<view class="bg" @click="closeVideo"></view>
</view>
</view>
@@ -348,9 +377,9 @@
videoUrl: ''
};
},
- onLoad(op) {
+ onLoad(op) {
+ uni.setStorageSync('ywinfo',{})
this.id = op.id;
- this.type = op.objType;
this.getDetail();
},
methods: {
@@ -365,10 +394,10 @@
//閫�鍑哄叏灞�
this.videoPlay = false; // 闅愯棌鎾斁鐩掑瓙
}
- },
- closeVideo() {
- this.videoPlay = false
- this.videoContext = null
+ },
+ closeVideo() {
+ this.videoPlay = false
+ this.videoContext = null
},
videoClick(item, i) {
this.videoPlay = true;
@@ -1068,22 +1097,6 @@
}
}
- .video_wrap {
- position: relative;
- border: 1px solid;
- width: 156rpx;
- height: 156rpx;
- border-radius: 4rpx;
-
- .play {
- width: 60rpx;
- height: 60rpx;
- position: absolute;
- top: 50%;
- left: 50%;
- transform: translate(-50%, -50%);
- }
- }
.img {
width: 100%;
@@ -1263,7 +1276,8 @@
position: absolute;
right: -20rpx;
top: -20rpx;
- z-index: 9999;
+ z-index: 999999999999;
+ color: #fff;
}
image {
@@ -1285,7 +1299,22 @@
margin: 0 -30rpx;
}
}
+ .video_wrap {
+ position: relative;
+ border: 1px solid;
+ width: 156rpx;
+ height: 156rpx;
+ border-radius: 4rpx;
+ .play {
+ width: 60rpx !important;
+ height: 60rpx !important;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ }
+ }
.sel_upload_wrap {
width: 100%;
border-top: 1px solid #333333;
@@ -1384,22 +1413,24 @@
}
}
- .video_app {
+ .video_app {
overflow: hidden;
position: fixed;
left: 0;
top: 0;
width: 100vw;
- height: 100vh;
- display: flex;
+ height: 100vh;
+ display: flex;
align-items: center;
- .bg{
- background-color: rgba(0,0,0,.6);
- position: absolute;
- width: 100%;
- height: 100%;
- z-index: -1;
+ z-index: 9990;
+ .bg {
+ background-color: rgba(0, 0, 0, .6);
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ z-index: -1;
}
+
video {
width: 100%;
height: 42vh;
--
Gitblit v1.9.3