From fdd38a72d0b0b87724aa94f7f9b5b0885f34cff5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 十二月 2024 16:51:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/task/vDangetAppr.vue | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/h5/pages/staff/task/vDangetAppr.vue b/h5/pages/staff/task/vDangetAppr.vue
index 875f418..74c1459 100644
--- a/h5/pages/staff/task/vDangetAppr.vue
+++ b/h5/pages/staff/task/vDangetAppr.vue
@@ -42,8 +42,8 @@
<view class="label">{{info.status == '1' ? '鏁存敼鍓�' : '瑙嗛/鍥剧墖'}}</view>
<view class="value">
<view class="adduser_list_item_ipt1_upload" v-for="(item, i) in info.dealBeforeFileList" :key="i">
- <image v-if="item.type == 0" :src="item.fileurlFull" mode="widthFix"></image>
- <video v-if="item.type == 1" :src="item.fileurlFull" :controls="false"></video>
+ <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>
</view>
</view>
</view>
@@ -51,8 +51,8 @@
<view class="label">鏁存敼鍚�</view>
<view class="value">
<view class="adduser_list_item_ipt1_upload" v-for="(item, i) in info.dealAfterFileList" :key="i">
- <image v-if="item.type == 0" :src="item.fileurlFull" mode="widthFix"></image>
- <video v-if="item.type == 1" :src="item.fileurlFull" :controls="false"></video>
+ <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>
</view>
</view>
</view>
@@ -133,8 +133,8 @@
<view class="adduser_list_item_ipt1_upload" v-for="(item, i) in dealBeforeFileList" :key="i">
<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>
+ <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>
</view>
</view>
<view class="label">閫�鍥炶鏄�</view>
@@ -363,13 +363,11 @@
},
videoClick(item, i) {
this.videoContext = uni.createVideoContext("myvideo", this); // this杩欎釜鏄疄渚嬪璞� 蹇呬紶
- console.log(item)
- this.videoUrl = item.fileurlFull;
+ console.log(item)
this.videoPlay = true;
+ this.videoUrl = item.fileurlFull;
this.$nextTick(() => {
- this.videoContext.requestFullScreen({
- direction: 90
- });
+ this.videoContext.requestFullScreen();
this.videoContext.play();
})
@@ -804,7 +802,7 @@
.flow_wrap {
padding: 30rpx 0 90rpx;
-
+
.list {
.item {
display: flex;
@@ -826,7 +824,7 @@
height: 80rpx;
position: relative;
margin-right: 20rpx;
-
+
.img {
width: 80rpx;
height: 80rpx;
@@ -839,7 +837,8 @@
border-radius: 50%;
position: absolute;
right: 0;
- bottom: 0;
+ bottom: 0;
+ z-index: 999;
}
}
@@ -1130,7 +1129,8 @@
.main_footer {
position: fixed;
bottom: 0;
- width: 100%;
+ width: 100%;
+ z-index: 9999;
left: 0;
padding: 30rpx 10rpx 60rpx;
display: flex;
@@ -1373,8 +1373,10 @@
}
.video_app{
position: absolute;
- left: 3000rpx;
- top: 3000rpx;
+ left: 0;
+ top: 0;
+ width: 100vw;
+ height: 100vh;
}
.Transfer_footer {
display: flex;
--
Gitblit v1.9.3