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
c0b5a6ce
Commit
c0b5a6ce
authored
Apr 15, 2020
by
xiexiaoqin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化创建单词会议不刷新日程列表
parent
0c7673ff
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
15 deletions
+26
-15
taskList.acss
components/taskList/taskList.acss
+0
-4
scheduleList.js
pages/scheduleList/scheduleList.js
+26
-11
No files found.
components/taskList/taskList.acss
View file @
c0b5a6ce
...
...
@@ -11,11 +11,7 @@
.task-list>.task-box {
background: rgba(255, 255, 255, 1);
border-radius: 8rpx;
<<<<<<< HEAD
box-shadow: 0 0 8rpx 0rpx rgba(0, 0, 0, 0.06);
=======
box-shadow: 0 0 8rpx 0rpx rgba(0, 0, 0, 0.08);
>>>>>>> 6ecd809354bff4a43d9602986b3da837f23eaa2f
padding: 0 16rpx;
height: 80rpx;
color: rgba(27, 38, 61, 1);
...
...
pages/scheduleList/scheduleList.js
View file @
c0b5a6ce
...
...
@@ -46,10 +46,14 @@ create.Page({
timer
:
null
,
isFirstLoad
:
true
,
onShow
()
{
//如果是重复会议重新算
if
(
this
.
$store
.
data
.
indexNeedUpdate
)
{
//优化:如果是重复会议重新算,单次会议往DateMap中添加
DateMap
=
getDateMap
(
minYear
,
maxYear
);
this
.
onLoad
()
this
.
onLoad
();
}
//单次会议往DateMap中添加
if
(
this
.
$store
.
data
.
onceMeetingContent
)
{
this
.
getScheduleList
(
this
.
$store
.
data
.
onceMeetingContent
,
'once'
);
}
},
onLoad
()
{
...
...
@@ -228,13 +232,13 @@ create.Page({
startTime
:
"2020-01-01 00:00:00"
,
endTime
:
"2025-12-30 23:59:59"
}).
then
(
res
=>
{
this
.
scheduleList
=
this
.
getScheduleList
(
res
.
data
.
data
);
this
.
getPagination
(
this
.
scheduleList
);
this
.
getScheduleList
(
res
.
data
.
data
);
//
this.getPagination(this.scheduleList);
// 第一次加载
this
.
setData
({
scheduleList
:
this
.
scheduleList
.
slice
(
this
.
firstPage
*
this
.
pageSize
,
this
.
currentPage
*
this
.
pageSize
),
loading
:
false
});
//
this.setData({
//
scheduleList: this.scheduleList.slice(this.firstPage * this.pageSize, this.currentPage * this.pageSize),
//
loading: false
//
});
});
},
//生成DateMap值
...
...
@@ -350,8 +354,12 @@ create.Page({
}
},
//日程数据
getScheduleList
(
response
)
{
this
.
setDateMapByResponse
(
response
);
getScheduleList
(
response
,
type
)
{
if
(
type
==
'once'
)
{
this
.
setDateMapValue
(
response
.
startTime
,
response
.
endTime
,
response
);
}
else
{
this
.
setDateMapByResponse
(
response
);
}
// 取出DateMap的value值平铺到DateList
const
DateList
=
[];
DateMap
.
forEach
(
function
(
value
,
key
)
{
...
...
@@ -419,7 +427,14 @@ create.Page({
});
}
});
return
DateList
;
this
.
scheduleList
=
DateList
;
this
.
getPagination
(
this
.
scheduleList
);
// 第一次加载
this
.
setData
({
scheduleList
:
this
.
scheduleList
.
slice
(
this
.
firstPage
*
this
.
pageSize
,
this
.
currentPage
*
this
.
pageSize
),
loading
:
false
});
},
//日程上拉加载
lower
()
{
...
...
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