Commit 995f311d by fengzhaoyu

fix:修改

parent 51b14f64
...@@ -121,8 +121,8 @@ create.Page({ ...@@ -121,8 +121,8 @@ create.Page({
dd.confirm({ dd.confirm({
title: '通知', title: '通知',
content: '是否更新动态列表通知其他成员?', content: '是否更新动态列表通知其他成员?',
confirmButtonText: '更新', confirmButtonText: '通知',
cancelButtonText: '不更新', cancelButtonText: '不通知',
success: (ret) => { success: (ret) => {
if (ret.confirm) { if (ret.confirm) {
if (res.data.data) { if (res.data.data) {
......
...@@ -692,7 +692,7 @@ input { ...@@ -692,7 +692,7 @@ input {
.operation-containt { .operation-containt {
border-radius: 8rpx; border-radius: 8rpx;
padding: 16rpx; padding: 0 16rpx;
position: absolute; position: absolute;
right: 56rpx; right: 56rpx;
top: 50%; top: 50%;
...@@ -703,11 +703,26 @@ input { ...@@ -703,11 +703,26 @@ input {
} }
.operation-containt>text { .operation-containt>text {
/* background: red; */
/* background: red; */
display: flex;
justify-content: space-between;
align-items: center;
padding: 16rpx 0;
/* line-height: 28px; */
/* padding: 16px 0; */
/* background: red; */
padding-right: 16rpx; padding-right: 16rpx;
margin-right: 16rpx; /* margin-right: 16rpx; */
font-size: 24rpx; font-size: 24rpx;
color: #fff; color: #fff;
border-right: 1px solid rgba(255, 255, 255, 0.55); /* border-right: 1px solid rgba(255, 255, 255, 0.55); */
}
.line {
margin-left: 16rpx;
margin-top: -2rpx;
/* margin-right: 16rpx; */
} }
.operation-containt>text:last-child { .operation-containt>text:last-child {
...@@ -719,4 +734,11 @@ input { ...@@ -719,4 +734,11 @@ input {
.text { .text {
white-space: nowrap; white-space: nowrap;
padding-left: 8rpx; padding-left: 8rpx;
padding-right: 16rpx;
border-right: 1px solid rgba(255, 255, 255, 0.55);
}
.text:last-child {
padding-right: 0;
border-right: none;
} }
\ No newline at end of file
<!--<block a:if="{{getData}}"> --> <!--<block a:if="{{getData}}"> -->
<import src="../../template/loading/loading.axml"/> <import src="../../template/loading/loading.axml"/>
<block> <block>
<view catchTap="handleCloseOperation" class=" {{(popup.show || selectPopup.show || centerPopup.show )? 'metingDetail' : ''}}"> <view onTap="handleCloseOperation" class="{{(popup.show || selectPopup.show || centerPopup.show )? 'metingDetail' : ''}}">
<import src="../../template/deleteBtn/index.axml"/> <import src="../../template/deleteBtn/index.axml"/>
<view class="hideDetail" a:if="{{isExpand}}"> <view class="hideDetail" a:if="{{isExpand}}">
<view class="hideTitle"> <view class="hideTitle">
...@@ -206,20 +206,24 @@ ...@@ -206,20 +206,24 @@
<notes a:if="{{item.notes}}" meetingNotes="{{item.notes}}"/> <notes a:if="{{item.notes}}" meetingNotes="{{item.notes}}"/>
<view class="meeting-title" a:if="{{item.commentType === 'meeting'}}">创建了会议</view> <view class="meeting-title" a:if="{{item.commentType === 'meeting'}}">创建了会议</view>
</view> </view>
<view class="compose-column-operation" a:if="{{item.commentType !== 'meeting'}}"> <view class="compose-column-operation" catchTap="blank" a:if="{{item.commentType !== 'meeting'}}">
<view class="operation-more iconmore iconfont color4" catchTap="handleOpenOperation" data-commentId="{{item.commentId}}"> <view class="operation-more iconmore iconfont color4" catchTap="handleOpenOperation" data-commentId="{{item.commentId}}">
<view class="operation-containt" a:if="{{modifyDynamicId === item.commentId}}"> <view class="operation-containt" a:if="{{modifyDynamicId === item.commentId}}">
<text class="icondescribe11 iconfont color4" a:if="{{item.fileDetailList&&item.creator.ddUserId === currentPeople}}" catchTap="openRemarkModal" data-commentId="{{item.commentId}}" data-remark="{{item.remark}}"> <text class="icondescribe11 iconfont color4" a:if="{{item.fileDetailList&&item.creator.ddUserId === currentPeople}}" catchTap="openRemarkModal" data-commentId="{{item.commentId}}" data-remark="{{item.remark}}">
<text class="text">编辑</text> <text class="text">编辑</text>
<!--<text class="line">|</text> -->
</text> </text>
<text class="icondescribe11 iconfont color4" a:if="{{item.notes&&item.creator.ddUserId === currentPeople }}" catchTap="editNotes" data-meetingNotes="{{item.notes}}" data-commentId="{{item.commentId}}"> <text class="icondescribe11 iconfont color4" a:if="{{item.notes&&item.creator.ddUserId === currentPeople }}" catchTap="editNotes" data-meetingNotes="{{item.notes}}" data-commentId="{{item.commentId}}">
<text class="text">编辑</text> <text class="text">编辑</text>
<!--<text class="line">|</text> -->
</text> </text>
<text class="icondescribe11 iconfont color4" a:if="{{item.commentType === 'task' &&item.creator.ddUserId === currentPeople }}" catchTap="editTask" data-task="{{item.meetingTaskSimpleViewModel}}" data-commentId="{{item.commentId}}"> <text class="icondescribe11 iconfont color4" a:if="{{item.commentType === 'task' &&item.creator.ddUserId === currentPeople }}" catchTap="editTask" data-task="{{item.meetingTaskSimpleViewModel}}" data-commentId="{{item.commentId}}">
<text class="text">编辑</text> <text class="text">编辑</text>
<!--<text class="line">|</text> -->
</text> </text>
<text class="iconcomments1 iconfont color4" data-commentId="{{item.commentId}}" catchTap="openComentModal"> <text class="iconcomments1 iconfont color4" data-commentId="{{item.commentId}}" catchTap="openComentModal">
<text class="text">评论</text> <text class="text">评论</text>
<!--<text class="line">|</text> -->
</text> </text>
<text class="icondelete2 iconfont color4" a:if="{{item.creator.ddUserId === currentPeople}}" catchTap="handleDeleteMoment" data-commentId="{{item.commentId}}"> <text class="icondelete2 iconfont color4" a:if="{{item.creator.ddUserId === currentPeople}}" catchTap="handleDeleteMoment" data-commentId="{{item.commentId}}">
<text class="text">删除</text> <text class="text">删除</text>
......
...@@ -1089,7 +1089,7 @@ create.Page({ ...@@ -1089,7 +1089,7 @@ create.Page({
type: 'notesModal' type: 'notesModal'
} }
}) })
this.handleCloseOperation()
}, },
getNotes: throttle(function (notes) { getNotes: throttle(function (notes) {
//编辑 //编辑
...@@ -1180,6 +1180,7 @@ create.Page({ ...@@ -1180,6 +1180,7 @@ create.Page({
}, },
//添加评论 //添加评论
openComentModal(e) { openComentModal(e) {
this.handleCloseOperation()
this.store.data.parentCommentId = e.currentTarget.dataset.commentId; this.store.data.parentCommentId = e.currentTarget.dataset.commentId;
this.update(); this.update();
this.setData({ this.setData({
...@@ -1221,6 +1222,7 @@ create.Page({ ...@@ -1221,6 +1222,7 @@ create.Page({
}, },
// 删除动态 // 删除动态
handleDeleteMoment(e) { handleDeleteMoment(e) {
this.handleCloseOperation() this.handleCloseOperation()
this.deleteComment('', e.currentTarget.dataset.commentId) this.deleteComment('', e.currentTarget.dataset.commentId)
}, },
...@@ -1365,7 +1367,9 @@ create.Page({ ...@@ -1365,7 +1367,9 @@ create.Page({
this.store.data.modifyDynamicId = '' this.store.data.modifyDynamicId = ''
this.update() this.update()
}, },
blank() { blank() {
debugger
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment