From a40e6a45b2207a9b172b7687ce6e4fe7da8b9ac6 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 03 十二月 2024 16:46:49 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei

---
 h5/pages/workOrder/detail.vue |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/h5/pages/workOrder/detail.vue b/h5/pages/workOrder/detail.vue
index a3bf40d..6e74b6a 100644
--- a/h5/pages/workOrder/detail.vue
+++ b/h5/pages/workOrder/detail.vue
@@ -10,7 +10,7 @@
 			<view class="desc">{{ info.content }}</view>
 			<view class="file_list">
 				<view class="file" v-for="(item,index) in info.fileList">
-					<image v-if="item.type == 0" :src="item.fileurlFull" mode="widthFix"></image>
+					<image v-if="item.type == 0" :src="item.fileurlFull" mode="aspectFill"></image>
 					<video v-if="item.type == 1" :src="item.fileurlFull" :controls="false"></video>
 				</view>
 			</view>
@@ -33,14 +33,14 @@
 				</view>
 				<view class="line" v-if="info.getDate">
 					<view class="la">涓婇棬鏃堕棿锛�</view>
-					<view class="val">{{ info.getDate }}</view>
+					<view class="val">{{ info.getDate.slice(0, 16) }}</view>
 				</view>
 			</view>
 			<view class="result_wrap" v-if="info.dealStatus == 2">
 				<div class="title">澶勭悊缁撴灉</div>
 				<view v-if="info.dealFileList && info.dealFileList.length > 0" class="file_list">
 					<view class="file" v-for="item in info.dealFileList">
-						<image v-if="item.type == 0" :src="item.fileurlFull" mode="widthFix"></image>
+						<image v-if="item.type == 0" :src="item.fileurlFull" mode="aspectFill"></image>
 						<video v-if="item.type == 1" :src="item.fileurlFull" :controls="false"></video>
 					</view>
 				</view>
@@ -49,7 +49,7 @@
 				</view>
 				<view class="line">
 					<view class="la">澶勭悊浜猴細</view>
-					<view class="val">{{ info.dealUserName }}</view>
+					<view class="val">{{ info.dealUserName }}{{info.dealUserCompany ? '-' + info.dealUserCompany : ''}}</view>
 				</view>
 				<view class="line">
 					<view class="la">澶勭悊鏃堕棿锛�</view>
@@ -100,7 +100,7 @@
 					</view>
 					<view class="adduser_list_item_ipt1_upload" v-for="(item, i) in dealFileList" :key="i">
 						<u-icon class="close" size="20" name="close-circle-fill" color="red"
-							@click="fileDel('dealBeforeFileList', i)"></u-icon>
+							@click="fileDel('dealFileList', 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>
 					</view>
@@ -316,7 +316,8 @@
 
 				image,
 				video {
-					width: 156rpx;
+					width: 156rpx;
+					height: 156rpx;
 				}
 			}
 		}

--
Gitblit v1.9.3