From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/staff/meetingDetail.vue | 45 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 37 insertions(+), 8 deletions(-)
diff --git a/h5/pages/staff/meetingDetail.vue b/h5/pages/staff/meetingDetail.vue
index fd97fcf..95017b4 100644
--- a/h5/pages/staff/meetingDetail.vue
+++ b/h5/pages/staff/meetingDetail.vue
@@ -15,6 +15,7 @@
<view class="value">
<!-- <text>涓昏璁ㄨ鏅鸿兘浼氳瀹ょ郴缁熼�夊瀷锛岃澶у涓�瀹氳鎸夋椂鏉ュ紑浼氾紝鏃堕棿瀹濊吹銆傛劅璋㈠ぇ瀹讹紒</text> -->
<u-textarea
+ autoHeight
border="none"
v-model="detail.meetingContent"
disabled
@@ -76,9 +77,10 @@
<view class="empty empty2"></view>
<view class="main_footer" v-if="detail.meetingStatus == '1'">
<view class="btn" @click="openCancel">鎾ゅ洖</view>
- <view class="btn agree" @click="handleEdit">淇敼</view>
+ <view class="btn edit" @click="handleEdit">淇敼</view>
+ <view class="btn agree" @click="handleStart">寮�濮嬩細璁�</view>
</view>
- <view class="main_footer" v-if="detail.meetingStatus == '2'">
+ <view class="main_footer" v-if="detail.meetingStatus == '2' && detail.isAdmin == 1">
<view class="btn agree" @click="openClose">缁撴潫</view>
</view>
<!-- 鎾ゅ洖 -->
@@ -131,7 +133,7 @@
</template>
<script>
-import { meetingDetail, cancelById, closeMeetignById } from '@/api'
+import { meetingDetail, cancelById, closeMeetignById,startMeetignById,startEarlyMeetignById } from '@/api'
export default {
data() {
return {
@@ -171,7 +173,7 @@
setTimeout(() => {
uni.showToast({
title: '鎻愪氦鎴愬姛',
- icon: 'success'
+ icon: 'none'
})
})
setTimeout(() => {
@@ -180,6 +182,23 @@
}
})
},
+ handleStart() {
+ const { id, detail } = this
+ let fn = new Date(detail.startTime).getTime() > new Date().getTime() ? startEarlyMeetignById : startMeetignById
+ fn({ id }).then(res => {
+ if (res.code === 200) {
+ setTimeout(() => {
+ uni.showToast({
+ title: '浼氳宸插紑濮�',
+ icon: 'none'
+ })
+ })
+ setTimeout(() => {
+ uni.navigateBack()
+ })
+ }
+ })
+ },
handleEdit() {
const { id } = this
uni.navigateTo({
@@ -237,8 +256,8 @@
}
.personnel {
display: flex;
+ flex-wrap: wrap;
width: 100%;
- overflow-x: auto;
.per_item {
flex-shrink: 0;
display: flex;
@@ -246,12 +265,18 @@
justify-content: center;
align-items: center;
justify-content: center;
- margin-right: 24rpx;
+ margin-right: 16rpx;
+ width: 85rpx;
+ margin-bottom: 22rpx;
+ &:nth-of-type(7n){
+ margin-right: 0;
+ }
.avatar {
width: 72rpx;
height: 72rpx;
margin: 0;
border-radius: 50%;
+ margin-bottom: 8rpx;
}
.name {
font-size: 26rpx;
@@ -273,7 +298,7 @@
background-color: #fff;
padding: 0 30rpx;
.btn {
- flex: 1;
+ flex: 3;
height: 88rpx;
line-height: 88rpx;
background: #ffffff;
@@ -283,8 +308,12 @@
text-align: center;
margin: 16rpx 8rpx;
}
-
+ .edit{
+ color: $uni-color-primary;
+ border: 1rpx solid $uni-color-primary;
+ }
.agree {
+ flex: 5;
background: $uni-color-primary;
color: #fff;
border: 1rpx solid $uni-color-primary;
--
Gitblit v1.9.3