Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
schedule
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fengzhaoyu
schedule
Commits
8a0df966
Commit
8a0df966
authored
4 years ago
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release/2.0.0' of
http://gitlab.roboming.com/fengzhaoyu/schedule
into release/2.0.0
parents
da8305e9
1cb7a0a1
release/dev/2.1.0
…
release/1.0.0
release/2.0.0
release/2.1.0
release/dev/2.0.0
No related merge requests found
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
35 deletions
+31
-35
meetingDetail.axml
pages/meetingDetail/meetingDetail.axml
+28
-32
meetingDetail.js
pages/meetingDetail/meetingDetail.js
+3
-3
No files found.
pages/meetingDetail/meetingDetail.axml
View file @
8a0df966
...
...
@@ -198,39 +198,35 @@
</view>
<view class="affair-list {{isExpand? '' : 'affair-list-margin-top'}} {{!isExpand&&$data.participatorList.length>1 ? 'addPadding' : ''}}" onTap="hideFileOperate">
<view a:if="{{!isExpand}}" class="affair-list-title">会议动态</view>
<block a:if="{{!affairLoading}}">
<block a:if="{{affairList && affairList.length > 0}}" a:for="{{affairList}}" key="{{item.commentId}}">
<view class='compose-column'>
<template is="avater" data="{{item: item.creator }}"/>
<view class="title">
<block a:if="{{affairList && affairList.length > 0}}" a:for="{{affairList}}" key="{{item.commentId}}">
<view class='compose-column'>
<template is="avater" data="{{item: item.creator }}"/>
<view class="title">
{{item.creator.name}}
<text>{{item.updateTime}}</text>
</view>
<view a:if="{{item.remark}}" class="desc">
{{item.remark}}
</view>
<task-list a:if="{{item.meetingTaskSimpleViewModel}}" onChangeTaskStatusOnList="changeTaskStatus" taskView="{{item.meetingTaskSimpleViewModel}}" commentId="{{item.commentId}}" isCanEdit="{{false}}"/>
<file-list a:if="{{item.fileDetailList}}" fileInfos="{{item.fileDetailList}}"/>
<notes a:if="{{item.notes}}" meetingNotes="{{item.notes}}"/>
<view class="meeting-title" a:if="{{item.commentType === 'meeting'}}">创建了会议</view>
</view>
<view class="compose-column-operation">
<text a:if="{{item.fileDetailList}}" onTap="openRemarkModal" data-commentId="{{item.commentId}}" data-remark="{{item.remark}}">描述</text>
<text a:if="{{item.notes}}" onTap="editNotes" data-meetingNotes="{{item.notes}}" data-commentId="{{item.commentId}}">编辑</text>
<text data-commentId="{{item.commentId}}" onTap="openComentModal">评论</text>
<text onTap="handleDeleteMoment" data-commentId="{{item.commentId}}">删除</text>
<text>{{item.updateTime}}</text>
</view>
<view
class="compose-column
">
<comment a:if="{{item.replyCommentList}}" replyCommentList="{{item.replyCommentList}}" onDeleteComment="deleteComment" parentCommentId="{{item.commentId}}"/>
<view
a:if="{{item.remark}}" class="desc
">
{{item.remark}}
</view>
</block>
<view class="affair-placeholder" a:if="{{!affairList || affairList.length == 0}}">
<template is="affair-placeholder" data="{{title: '添加文件', tip: '我们不开无准备的会,快来上传会议文件吧。'}}"/>
<task-list a:if="{{item.meetingTaskSimpleViewModel}}" onChangeTaskStatusOnList="changeTaskStatus" taskView="{{item.meetingTaskSimpleViewModel}}" commentId="{{item.commentId}}" isCanEdit="{{false}}"/>
<file-list a:if="{{item.fileDetailList}}" fileInfos="{{item.fileDetailList}}"/>
<notes a:if="{{item.notes}}" meetingNotes="{{item.notes}}"/>
<view class="meeting-title" a:if="{{item.commentType === 'meeting'}}">创建了会议</view>
</view>
<view class="compose-column-operation">
<text a:if="{{item.fileDetailList}}" onTap="openRemarkModal" data-commentId="{{item.commentId}}" data-remark="{{item.remark}}">描述</text>
<text a:if="{{item.notes}}" onTap="editNotes" data-meetingNotes="{{item.notes}}" data-commentId="{{item.commentId}}">编辑</text>
<text data-commentId="{{item.commentId}}" onTap="openComentModal">评论</text>
<text onTap="handleDeleteMoment" data-commentId="{{item.commentId}}">删除</text>
</view>
<view class="compose-column">
<comment a:if="{{item.replyCommentList}}" replyCommentList="{{item.replyCommentList}}" onDeleteComment="deleteComment" parentCommentId="{{item.commentId}}"/>
</view>
<view class="loading-more" onTap="loadAffairMore" a:if="{{current < pages}}">点击加载更多动态...</view>
</block>
<template is="loading" a:else>
</template>
<view class="affair-placeholder" a:if="{{!affairList || affairList.length == 0}}">
<template is="affair-placeholder" data="{{title: '添加文件', tip: '我们不开无准备的会,快来上传会议文件吧。'}}"/>
</view>
<view class="loading-more" onTap="loadAffairMore" a:if="{{current < pages}}">点击加载更多动态...</view>
<popup title="{{popup.title}}" show="{{popup.show}}" mask="true" onClose="closePopup">
<remark a:if="{{popup.type == 'remarkModal'}}" onGetRemark="getRemark"/>
<comment a:if="{{popup.type == 'commentModal'}}" isEdit="{{true}}" onGetComment="getComment"/>
...
...
@@ -250,6 +246,6 @@
</view>
</view>
</block>
<view class="loading" a:if="{{!loading.details}}">
<view class="image"></view>
</view>
\ No newline at end of file
<!--<view class="loading" a:if="{{loading.details && loading.dynamic}}"><view class="image"></view></view> -->
<template is="loading" a:if="{{loading.details && loading.dynamic}}">
</template>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
pages/meetingDetail/meetingDetail.js
View file @
8a0df966
...
...
@@ -22,7 +22,7 @@ create.Page({
affairList
:
null
,
//store,页面用到的变量需要在这里声明
loading
:
{
details
:
fals
e
,
details
:
tru
e
,
dynamic
:
true
},
conToastData
:
{
...
...
@@ -171,7 +171,7 @@ create.Page({
iconType
:
'icon'
,
aheadTimesListId
:
!!
res
.
data
.
data
.
aheadTimes
?
res
.
data
.
data
.
aheadTimes
:
[
-
1
],
},
"loading.details"
:
tru
e
"loading.details"
:
fals
e
})
this
.
$store
.
data
.
originalData
=
res
.
data
.
data
;
...
...
@@ -947,7 +947,7 @@ create.Page({
this
.
store
.
data
.
affairList
=
newAffairList
;
this
.
update
();
this
.
setData
({
affairLoading
:
false
"loading.dynamic"
:
false
});
})
},
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment