Commit 9df00aff by liang ce

修改动态

parent b3ae83ca
...@@ -90,40 +90,42 @@ ...@@ -90,40 +90,42 @@
<text class="iconshangchuanwenjian1 iconfont"></text></view></view> <text class="iconshangchuanwenjian1 iconfont"></text></view></view>
<!-- 动态详情展示 --> <!-- 动态详情展示 -->
<view class="dynamicContent" a:if="{{allFileInfo.length}}"> <view class="dynamicContent" a:if="{{allFileInfo.length}}">
<view class="dynamicDetail" a:for="{{allFileInfo}}" catchTouchStart="touchStart" catchTouchEnd="touchEnd" catchLongTap="longPress" data-id="{{item.meetingLogId}}"> <view a:for="{{allFileInfo}}" catchTap="blank" data-scheduleid="{{item.meetingLogId}}">
<view class="dynamicList" a:if="{{!!item.scheduleAccessory}}"> <view class="dynamicDetail" catchTouchStart="touchStart" catchTouchEnd="touchEnd" catchLongTap="longPress" data-id="{{item.meetingLogId}}">
<view class="dynamicleft"> <view class="dynamicList" a:if="{{!!item.scheduleAccessory}}">
<image a:if="{{!!item.scheduleAccessory.uploaderInfo.headUrl}}" mode="scaleToFill" src="{{item.scheduleAccessory.uploaderInfo.headUrl}}"/> <view class="dynamicleft">
<text a:else>{{item.scheduleAccessory.uploaderInfo.username.substring(0,1)}}</text></view> <image a:if="{{!!item.scheduleAccessory.uploaderInfo.headUrl}}" mode="scaleToFill" src="{{item.scheduleAccessory.uploaderInfo.headUrl}}"/>
<view class="dynamicright"> <text a:else>{{item.scheduleAccessory.uploaderInfo.username.substring(0,1)}}</text></view>
<view class="dynamicMinutes"> <view class="dynamicright">
<text>{{item.scheduleAccessory.uploaderInfo.username}}</text> <view class="dynamicMinutes">
<text>{{item.scheduleAccessory.time}}</text></view> <text>{{item.scheduleAccessory.uploaderInfo.username}}</text>
<view class="describe"> <text>{{item.scheduleAccessory.time}}</text></view>
{{item.scheduleAccessory.descript}} <view class="describe">
</view> {{item.scheduleAccessory.descript}}
<view class="file" data-file="{{item2}}" onTap="preview" a:for="{{item.scheduleAccessory.fileInfos}}" a:for-item="item2">
<view class="fileImage {{item2.fileType==('png' || 'jpg' || 'svg' || 'jpeg') ?'image': item2.fileType}}"></view>
<view class="fileName">
{{item2.fileName}}
</view> </view>
</view> <view class="file" data-file="{{item2}}" onTap="preview" a:for="{{item.scheduleAccessory.fileInfos}}" a:for-item="item2">
<view class="modFile" a:if="{{organizer == pemissions?(item.meetingLogId == meetingLogId):(item.meetingLogId == meetingLogId&&item.scheduleAccessory.uploaderInfo.userId==pemissions)}}"> <view class="fileImage {{item2.fileType==('png' || 'jpg' || 'svg' || 'jpeg') ?'image': item2.fileType}}"></view>
<view class="ediFile" data-nextPage="editFile" catchTap="nextPage" data-file="{{item.scheduleAccessory}}"> <view class="fileName">
编辑 {{item2.fileName}}
</view>
</view> </view>
<view class="delFile" catchTap="delFile" data-file="{{item.scheduleAccessory}}"> <view class="modFile" a:if="{{organizer == pemissions?(item.meetingLogId == meetingLogId):(item.meetingLogId == meetingLogId&&item.scheduleAccessory.uploaderInfo.userId==pemissions)}}">
删除 <view class="ediFile" data-nextPage="editFile" catchTap="nextPage" data-file="{{item.scheduleAccessory}}">
编辑
</view>
<view class="delFile" catchTap="delFile" data-file="{{item.scheduleAccessory}}">
删除
</view>
<view class="triangle"></view>
</view>
<view class="selectDynamicright" a:if="{{organizer == pemissions?(item.meetingLogId == meetingLogId):(item.meetingLogId == meetingLogId&&item.scheduleAccessory.uploaderInfo.userId==pemissions)}}">
</view> </view>
<view class="triangle"></view>
</view>
<view class="selectDynamicright" a:if="{{organizer == pemissions?(item.meetingLogId == meetingLogId):(item.meetingLogId == meetingLogId&&item.scheduleAccessory.uploaderInfo.userId==pemissions)}}">
</view> </view>
</view> </view>
</view> <view class="otherTip" a:if="{{!!item.content}}">
<view class="otherTip" a:if="{{!!item.content}}"> {{item.content}}
{{item.content}} {{item.time}}
{{item.time}} </view>
</view> </view>
</view> </view>
</view> </view>
......
...@@ -373,9 +373,11 @@ create.Page({ ...@@ -373,9 +373,11 @@ create.Page({
}) })
}, },
// 空方法 阻止冒泡 // 空方法 阻止冒泡
blank() { blank(e) {
this.setData({ if(e.currentTarget.dataset.scheduleid !== this.data.meetingLogId) {
meetingLogId: '' this.setData({
}) meetingLogId: ''
})
}
} }
}) })
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