Commit 3e11cbd5 by xiexiaoqin

Merge branch 'release/dev/2.0.0' into release/2.0.0

parents 73bf1636 25f312e4
...@@ -216,7 +216,7 @@ ...@@ -216,7 +216,7 @@
<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" catchTap="blank" a:if="{{item.commentType !== 'meeting'}}"> <view class="compose-column-operation" 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}}">
......
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