From ccf28d1fed1aa2e5437dbe64b5133ba1cbde6ec7 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 03 一月 2025 15:30:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/workOrder/edit.vue | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/h5/pages/workOrder/edit.vue b/h5/pages/workOrder/edit.vue
index f51e237..ff72df9 100644
--- a/h5/pages/workOrder/edit.vue
+++ b/h5/pages/workOrder/edit.vue
@@ -26,7 +26,7 @@
<u-icon name="arrow-right" color="#999999" size="15"></u-icon>
</view>
</view>
- <view class="item">
+ <view class="item" v-if="param.areaType == 0">
<view class="la">涓婇棬鏃堕棿</view>
<view class="line sel_wrap" @click="showTime = true">
<view class="left" :class="param.getDate ? '' : 'placeholder9'">{{ param.getDate ? param.getDate : '璇烽�夋嫨' }}
@@ -51,7 +51,7 @@
<u-icon class="close" size="20" name="close-circle-fill" color="red"
@click="fileDel('fileList', 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" :show-center-play-btn="false" :src="item.fileurlFull" :controls="false"></video>
</view>
</view>
</view>
@@ -116,7 +116,7 @@
showCate2: false,
areaType: [
[{
- name: '瀹ゅ唴瑁呬慨',
+ name: '瀹ゅ唴缁翠慨',
id: 0
},
{
@@ -142,7 +142,11 @@
const {
param,
fileList
- } = this
+ } = this
+ if (!param.projectId) return this.showToast('璇烽�夋嫨瀹屾暣鐨勫尯鍩�')
+ if (!param.buildingId) return this.showToast('璇烽�夋嫨瀹屾暣鐨勫尯鍩�')
+ if (!param.floorName && !param.roomNum) return this.showToast('璇烽�夋嫨瀹屾暣鐨勫尯鍩�')
+ if (!param.cateName) return this.showToast('璇烽�夋嫨宸ュ崟鍒嗙被')
ywWorkorderCreate({
...param,
// roomId: '',
@@ -427,7 +431,10 @@
position: absolute;
right: -20rpx;
top: -20rpx;
- z-index: 9999;
+ z-index: 9999;
+ background-color: #fff;
+ border-radius: 50%;
+ overflow: hidden;
}
image {
@@ -445,11 +452,12 @@
}
.sub_btn {
- position: fixed;
- bottom: 68rpx;
- left: 40rpx;
+ // position: fixed;
+ // bottom: 68rpx;
+ // left: 40rpx;
width: 670rpx;
- height: 88rpx;
+ height: 88rpx;
+ margin-top: 80rpx;
background: $primaryColor;
box-shadow: 0rpx 8rpx 20rpx 0rpx rgba(0, 104, 255, 0.3);
border-radius: 44rpx;
--
Gitblit v1.9.3