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
75d6be2e
Commit
75d6be2e
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
34957fde
bd181f3c
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
46 additions
and
6 deletions
+46
-6
createTask.js
pages/createTask/createTask.js
+2
-0
index.axml
pages/index/index.axml
+1
-1
index.js
pages/index/index.js
+9
-0
meetingDetail.js
pages/meetingDetail/meetingDetail.js
+33
-4
store.js
pages/meetingDetail/store.js
+1
-0
uploadFile.js
pages/uploadFile/uploadFile.js
+0
-1
No files found.
pages/createTask/createTask.js
View file @
75d6be2e
...
...
@@ -75,6 +75,8 @@ create.Page({
addData
.
updateTime
=
getCreateShowTime
(
addData
.
updateTime
);
this
.
store
.
data
.
affairList
.
unshift
(
addData
);
this
.
store
.
data
.
tasks
.
unshift
(
addData
);
this
.
store
.
data
.
isNeedReloadIndexList
=
true
;
this
.
update
();
dd
.
navigateBack
();
}
}
...
...
This diff is collapsed.
Click to expand it.
pages/index/index.axml
View file @
75d6be2e
...
...
@@ -23,7 +23,7 @@
<view class="userDynamic">
<view class="dynamicTime" data-groupId="{{item.meetingId}}" catchTap="nextDetail" data-item="{{item}}">
<text>{{dynamicItem.creator && dynamicItem.creator.name}}</text>
<text>{{
dynamicItem.actionLog
}}</text>
<text>{{
actionLog[dynamicItem.commentCategory]
}}</text>
<text>{{dynamicItem.createTime}}</text>
</view>
<view class="desc" a:if="{{dynamicItem.remark}}">{{dynamicItem.remark}}</view>
...
...
This diff is collapsed.
Click to expand it.
pages/index/index.js
View file @
75d6be2e
...
...
@@ -32,6 +32,15 @@ let maxClickCount = 5;
create
.
Page
({
store
:
pageStore
,
data
:
{
actionLog
:
{
"comment_reply"
:
"添加了评论"
,
"file_create"
:
"上传了文件"
,
"notes_create"
:
"添加了笔记"
,
"notes_modify"
:
"更新了笔记"
,
"task_create"
:
"添加了任务"
,
"task_modify_success"
:
"更新了任务"
,
"meeting_create"
:
"添加了会议"
,
},
relatedAppPlatform
:
null
,
sign
:
""
,
refresh
:
false
,
...
...
This diff is collapsed.
Click to expand it.
pages/meetingDetail/meetingDetail.js
View file @
75d6be2e
...
...
@@ -80,6 +80,13 @@ create.Page({
this
.
update
();
}
// 告诉首页要刷新数据
if
(
this
.
store
.
data
.
isNeedReloadIndexList
)
{
this
.
store
.
data
.
isNeedReloadIndexList
=
false
this
.
$store
.
data
.
isIndexAffairListNeedUpdate
=
true
;
this
.
update
();
}
if
(
this
.
$store
.
data
.
updateInfo
.
isUpate
)
{
if
(
this
.
$store
.
data
.
updateInfo
.
updateType
===
"modify_location"
)
{
this
.
setData
({
...
...
@@ -1026,7 +1033,9 @@ create.Page({
dd
.
pageScrollTo
({
scrollTop
:
0
})
})
});
this
.
$store
.
data
.
isIndexAffairListNeedUpdate
=
true
;
this
.
update
();
},
// 创建任务
goCreateTask
(
e
)
{
...
...
@@ -1099,8 +1108,19 @@ create.Page({
}
}).
then
(
res
=>
{
if
(
res
.
data
.
code
==
0
)
{
this
.
getAffairList
(
this
.
store
.
data
.
scheduleId
);
//修改列表数据
if
(
res
.
data
.
data
)
{
const
addData
=
res
.
data
.
data
[
0
].
commentListDataModelList
[
0
];
addData
.
updateTime
=
getCreateShowTime
(
addData
.
updateTime
);
this
.
store
.
data
.
affairList
.
unshift
(
addData
);
}
this
.
closePopup
();
// 通知更新
this
.
$store
.
data
.
isIndexAffairListNeedUpdate
=
true
;
this
.
update
();
}
})
},
...
...
@@ -1123,6 +1143,10 @@ create.Page({
// clear
this
.
store
.
data
.
notes
=
null
;
this
.
update
();
// 通知更新
this
.
$store
.
data
.
isIndexAffairListNeedUpdate
=
true
;
this
.
update
();
}
})
},
...
...
@@ -1193,11 +1217,12 @@ create.Page({
const
deleteData
=
this
.
store
.
data
.
affairList
.
splice
(
index
,
1
);
this
.
update
();
// 如果删除的动态包含文件和任务,需要修改
console
.
log
(
deleteData
)
if
(
deleteData
[
0
].
fileDetailList
||
deleteData
[
0
].
meetingTaskSimpleViewModel
)
{
this
.
getTaskAndFiles
(
this
.
store
.
data
.
affairList
);
}
// 通知更新
this
.
$store
.
data
.
isIndexAffairListNeedUpdate
=
true
;
this
.
update
();
}
}
}
...
...
@@ -1263,6 +1288,10 @@ create.Page({
// clear
this
.
store
.
data
.
remark
=
null
;
this
.
update
();
// 通知更新
this
.
$store
.
data
.
isIndexAffairListNeedUpdate
=
true
;
this
.
update
();
}
})
},
...
...
This diff is collapsed.
Click to expand it.
pages/meetingDetail/store.js
View file @
75d6be2e
...
...
@@ -16,6 +16,7 @@ class Store {
scheduleId
:
''
,
groupId
:
''
,
isNeedReloadList
:
false
,
isNeedReloadIndexList
:
false
,
logId
:
''
,
relatedAppPlatform
:
null
}
...
...
This diff is collapsed.
Click to expand it.
pages/uploadFile/uploadFile.js
View file @
75d6be2e
...
...
@@ -86,7 +86,6 @@ create.Page({
fileList
:
fileInfos
}
}
console
.
log
(
data
)
updateMeetingTask
(
data
).
then
(
res
=>
{
this
.
store
.
data
.
isNeedReloadList
=
true
;
...
...
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