From 249a271a867df4802a8d59371e0ff10d3eb54298 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 09 八月 2024 18:07:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/task/vDangetAppr.vue | 90 +++++++++++++++++++++++++++------------------
1 files changed, 54 insertions(+), 36 deletions(-)
diff --git a/h5/pages/staff/task/vDangetAppr.vue b/h5/pages/staff/task/vDangetAppr.vue
index f9df6eb..6eb1460 100644
--- a/h5/pages/staff/task/vDangetAppr.vue
+++ b/h5/pages/staff/task/vDangetAppr.vue
@@ -33,13 +33,14 @@
<image
v-if="item.type == 0"
:src="item.fileurlFull"
+ @click="priviewImage(item.fileurlFull)"
mode="widthFix"
class="img"
/>
<video
v-if="item.type == 1"
:src="item.fileurlFull"
- class="img"
+ class="video"
controls
/>
</view>
@@ -177,7 +178,15 @@
</view>
</view>
<view class="emyty"></view>
- <view v-if="info.approveDateVO!=null&& info.approveDateVO.canBeApproved!=null &&info.approveDateVO.canBeApproved ==1 && info.status == 0" class="main_footer" >
+ <view
+ v-if="
+ info.approveDateVO != null &&
+ info.approveDateVO.canBeApproved != null &&
+ info.approveDateVO.canBeApproved == 1 &&
+ info.status == 0
+ "
+ class="main_footer"
+ >
<view class="btn" @click="handleBack">閫�鍥�</view>
<view class="btn transfer" @click="handleTransfer">杞氦</view>
<view class="btn handle" @click="handleOpen">澶勭悊</view>
@@ -516,6 +525,11 @@
this.getDetail()
},
methods: {
+ priviewImage(url) {
+ uni.previewImage({
+ urls: [url]
+ })
+ },
handleOpen() {
this.isShowHandle = true
console.log('info', this.info)
@@ -593,10 +607,10 @@
},
getMemList() {
findHiddenAreaMemberList({
- model: {
+ model: {
...this.transferModel,
id: this.info.areaId
- },
+ },
...this.pagination,
}).then(res => {
this.memberList = res.data || []
@@ -1024,33 +1038,33 @@
}
}
.adduser_list_item_ipt1_upload {
- width: 120rpx;
- height: 120rpx;
- margin-right: 24rpx;
- border: 2rpx solid #e5e5e5;
- background: #f7f7f7;
- color: #666666;
- font-size: 22rpx;
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- position: relative;
- .close {
- position: absolute;
- right: -20rpx;
- top: -20rpx;
- z-index: 9999;
- }
- image {
- width: 100%;
- height: 100%;
- }
- video {
- width: 100%;
- max-height: 120rpx;
- }
+ width: 120rpx;
+ height: 120rpx;
+ margin-right: 24rpx;
+ border: 2rpx solid #e5e5e5;
+ background: #f7f7f7;
+ color: #666666;
+ font-size: 22rpx;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ position: relative;
+ .close {
+ position: absolute;
+ right: -20rpx;
+ top: -20rpx;
+ z-index: 9999;
}
+ image {
+ width: 100%;
+ height: 100%;
+ }
+ video {
+ width: 100%;
+ max-height: 120rpx;
+ }
+ }
.module_list {
.item {
@@ -1113,13 +1127,12 @@
}
.file_list {
display: flex;
- flex-wrap: wrap;
margin-bottom: 20rpx;
+ overflow-x: auto;
.img_wrap {
margin-top: 24rpx;
- width: 120rpx;
- height: 120rpx;
- margin-right: 24rpx;
+ min-width: 160rpx;
+ height: 160rpx;
border: 2rpx solid #e5e5e5;
background: #f7f7f7;
color: #666666;
@@ -1129,10 +1142,15 @@
align-items: center;
justify-content: center;
position: relative;
+ margin-right: 16rpx;
+ flex-shrink: 0;
}
.img {
- width: 120rpx;
- max-height: 120rpx;
+ width: 100%;
+ max-height: 100%;
+ }
+ .video {
+ height: 160rpx;
}
}
.text_wrap {
--
Gitblit v1.9.3