From 43942a545271345ce26e40d82bb97138c5ea7611 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 六月 2024 13:54:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/snapshot.vue | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/h5/pages/staff/snapshot.vue b/h5/pages/staff/snapshot.vue
index c0a30be..8ddde02 100644
--- a/h5/pages/staff/snapshot.vue
+++ b/h5/pages/staff/snapshot.vue
@@ -19,7 +19,7 @@
<view class="line">
<view class="label">
<text>*</text>
- <text>鎺ュ彈浜�</text>
+ <text>鎺ユ敹浜�</text>
</view>
<view class="value" @click="selMember">
<text
@@ -48,9 +48,13 @@
<view class="upload_line">
<view class="name">鐜板満鎯呭喌</view>
<view class="wrap">
- <view class="adduser_list_item_ipt1_upload" @click="showUpload = true"
- ><u-icon name="plus" color="rgb(153, 153, 153)" size="28"></u-icon
- ></view>
+ <view
+ class="adduser_list_item_ipt1_upload"
+ @click="showUpload = true"
+ >
+ <u-icon name="plus" color="rgb(153, 153, 153)" size="20"></u-icon>
+ <view class="mt6">鍥剧墖/瑙嗛</view>
+ </view>
<view
class="adduser_list_item_ipt1_upload"
v-for="(item, i) in submitFileList"
@@ -227,6 +231,14 @@
title: '璇烽�夋嫨闅愭偅绫诲瀷',
icon: 'none'
})
+ if (!param.content) return uni.showToast({
+ title: '璇疯緭鍏ユ儏鍐佃鏄�',
+ icon: 'none'
+ })
+ if (param.content.length < 10) return uni.showToast({
+ title: '鎯呭喌璇存槑涓嶅緱灏忎簬10涓瓧',
+ icon: 'none'
+ })
DangerCreate({
...param,
@@ -242,6 +254,15 @@
this.$set(this.param, 'areaId', item.id)
this.$set(this.param, 'areaName', item.name)
console.log(item)
+ if (item.memberIds && item.memberIds.indexOf(',') === -1) {
+ this.$set(this.param, 'checkUserId', item.memberIds)
+ this.$set(this.param, 'applyCheckUserId', item.memberIds)
+ this.$set(this.param, 'checkorName', item.memberNames)
+ }else{
+ this.$set(this.param, 'checkUserId', '')
+ this.$set(this.param, 'applyCheckUserId', '')
+ this.$set(this.param, 'checkorName', '')
+ }
this.isShowArea = false
},
seletedType(e) {
@@ -267,8 +288,12 @@
})
},
selMember() {
+ if (!this.param.areaId) return uni.showToast({
+ title: '璇峰厛閫夋嫨闅愭偅鍖哄煙',
+ icon: 'none'
+ })
uni.navigateTo({
- url: '/pages/staff/memberSel'
+ url: '/pages/staff/memberSel?areaId=' + this.param.areaId
})
},
fileDel(i) {
@@ -280,7 +305,6 @@
uni.chooseImage({
count: 4,
success: (chooseImageRes) => {
- console.log('chooseImageRes.tempFilePaths', chooseImageRes.tempFilePaths)
uni.showLoading({ title: '涓婁紶涓�', mask: true })
const tempFilePaths = chooseImageRes.tempFilePaths
let imgs = tempFilePaths.map((value, index) => {
@@ -418,6 +442,7 @@
color: #666666;
font-size: 22rpx;
display: flex;
+ flex-direction: column;
align-items: center;
justify-content: center;
position: relative;
@@ -425,6 +450,7 @@
position: absolute;
right: -20rpx;
top: -20rpx;
+ z-index: 9999;
}
image {
width: 100%;
@@ -432,7 +458,7 @@
}
video {
width: 100%;
- max-height: 160rpx;
+ max-height: 120rpx;
}
}
}
--
Gitblit v1.9.3