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
6d9e46fd
Commit
6d9e46fd
authored
5 years ago
by
xiexiaoqin
Browse files
Options
Browse Files
Download
Plain Diff
conflit
parents
5091d12e
dcb9c063
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
11 deletions
+19
-11
scheduleList.js
PageComponents/scheduleList/scheduleList.js
+9
-6
createMeeting.js
pages/createMeeting/createMeeting.js
+2
-0
editMeeting.js
pages/editMeeting/editMeeting.js
+8
-5
No files found.
PageComponents/scheduleList/scheduleList.js
View file @
6d9e46fd
...
@@ -6,8 +6,12 @@ import {
...
@@ -6,8 +6,12 @@ import {
getCurrentMonthLast
,
getCurrentMonthLast
,
throttle
throttle
}
from
"../../utils/utils"
;
}
from
"../../utils/utils"
;
Component
({
import
create
from
'dd-store'
import
exampleStore
from
'/stores/exampleStore'
create
.
Component
({
mixins
:
[],
mixins
:
[],
store
:
exampleStore
,
useAll
:
true
,
data
:
{
data
:
{
response
:
""
,
response
:
""
,
scheduleList
:
[],
scheduleList
:
[],
...
@@ -31,13 +35,14 @@ Component({
...
@@ -31,13 +35,14 @@ Component({
},
},
didUpdate
()
{
didUpdate
()
{
if
(
this
.
props
.
update
)
{
if
(
this
.
props
.
update
)
{
this
.
store
.
data
.
indexNeedUpdate
=
false
;
this
.
update
();
this
.
getDate
();
this
.
getDate
();
}
}
},
},
didUnmount
()
{
},
didUnmount
()
{
},
methods
:
{
methods
:
{
getDate
()
{
getDate
:
throttle
(
function
(
e
)
{
// 页面显示
let
data
=
{
let
data
=
{
startTime
:
"2020-01-01 00:00:00"
,
startTime
:
"2020-01-01 00:00:00"
,
endTime
:
"2025-12-30 23:59:59"
endTime
:
"2025-12-30 23:59:59"
...
@@ -56,7 +61,6 @@ Component({
...
@@ -56,7 +61,6 @@ Component({
scheduleList
.
push
(
that
.
returnScheduleList
(
2019
+
i
));
scheduleList
.
push
(
that
.
returnScheduleList
(
2019
+
i
));
}
}
// 第一次加载
// 第一次加载
if
(
this
.
data
.
isFirstLoad
)
{
const
today
=
new
Date
();
const
today
=
new
Date
();
// finalDate 是用来定位到今天的
// finalDate 是用来定位到今天的
const
finalDate
=
new
Date
(
today
);
const
finalDate
=
new
Date
(
today
);
...
@@ -71,10 +75,9 @@ Component({
...
@@ -71,10 +75,9 @@ Component({
isFirstLoad
:
false
isFirstLoad
:
false
});
});
}
}
}
);
);
});
});
},
},
1000
),
nextDetail
:
throttle
(
function
(
e
)
{
nextDetail
:
throttle
(
function
(
e
)
{
let
item
=
e
.
target
.
dataset
.
item
;
let
item
=
e
.
target
.
dataset
.
item
;
dd
.
navigateTo
({
dd
.
navigateTo
({
...
...
This diff is collapsed.
Click to expand it.
pages/createMeeting/createMeeting.js
View file @
6d9e46fd
...
@@ -340,6 +340,8 @@ create.Page({
...
@@ -340,6 +340,8 @@ create.Page({
addSchedule
(
data
).
then
(
res
=>
{
addSchedule
(
data
).
then
(
res
=>
{
console
.
log
(
res
)
console
.
log
(
res
)
if
(
res
.
data
.
code
===
0
)
{
if
(
res
.
data
.
code
===
0
)
{
this
.
store
.
data
.
indexNeedUpdate
=
true
this
.
update
()
dd
.
navigateBack
({
dd
.
navigateBack
({
delta
:
1
delta
:
1
})
})
...
...
This diff is collapsed.
Click to expand it.
pages/editMeeting/editMeeting.js
View file @
6d9e46fd
...
@@ -140,7 +140,7 @@ create.Page({
...
@@ -140,7 +140,7 @@ create.Page({
let
data
=
{
let
data
=
{
id
:
this
.
data
.
scheduleItem
.
id
,
id
:
this
.
data
.
scheduleItem
.
id
,
scheduleTemplateId
:
this
.
data
.
scheduleItem
.
scheduleTemplateId
,
scheduleTemplateId
:
this
.
data
.
scheduleItem
.
scheduleTemplateId
,
planDate
:
this
.
data
.
scheduleItem
.
planDate
.
replace
(
/
\/
/g
,
'-'
)
planDate
:
this
.
data
.
scheduleItem
.
planDate
}
}
getScheduleDetail
(
data
).
then
(
res
=>
{
getScheduleDetail
(
data
).
then
(
res
=>
{
if
(
res
.
data
.
code
===
0
)
{
if
(
res
.
data
.
code
===
0
)
{
...
@@ -153,10 +153,9 @@ create.Page({
...
@@ -153,10 +153,9 @@ create.Page({
participatorUserId
.
push
(
value
.
participator
.
userId
)
participatorUserId
.
push
(
value
.
participator
.
userId
)
originUsers
.
push
(
value
.
participator
)
originUsers
.
push
(
value
.
participator
)
if
(
value
.
participator
.
userId
===
getApp
().
globalData
.
userid
)
{
if
(
value
.
participator
.
userId
===
getApp
().
globalData
.
userid
)
{
// this.setData({
this
.
setData
({
// aheadTimes: value.
aheadTimes
:
value
.
aheadList
// })
})
}
}
}
}
for
(
let
item
of
this
.
data
.
comListData
.
repeatList
)
{
for
(
let
item
of
this
.
data
.
comListData
.
repeatList
)
{
...
@@ -557,6 +556,8 @@ create.Page({
...
@@ -557,6 +556,8 @@ create.Page({
'conToastData.showToast'
:
true
,
'conToastData.showToast'
:
true
,
'conToastData.title'
:
'保存成功'
'conToastData.title'
:
'保存成功'
})
})
this
.
store
.
data
.
indexNeedUpdate
=
true
this
.
update
()
if
(
this
.
store
.
data
.
originalData
.
repeatable
===
1
)
{
if
(
this
.
store
.
data
.
originalData
.
repeatable
===
1
)
{
observer
.
notice
(
res
.
data
.
data
)
observer
.
notice
(
res
.
data
.
data
)
}
}
...
@@ -710,6 +711,8 @@ create.Page({
...
@@ -710,6 +711,8 @@ create.Page({
planDate
:
this
.
data
.
scheduleItem
.
planDate
planDate
:
this
.
data
.
scheduleItem
.
planDate
}
}
deleteSchedule
(
data
).
then
(
res
=>
{
deleteSchedule
(
data
).
then
(
res
=>
{
this
.
store
.
data
.
indexNeedUpdate
=
true
this
.
update
()
dd
.
navigateBack
({
dd
.
navigateBack
({
delta
:
1
delta
:
1
})
})
...
...
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