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
00b183ac
Commit
00b183ac
authored
Feb 18, 2020
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Plain Diff
11
parents
a049b10f
a4a235c4
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
136 additions
and
84 deletions
+136
-84
createOrEditSchedule.acss
pages/createOrEditSchedule/createOrEditSchedule.acss
+2
-0
createOrEditSchedule.axml
pages/createOrEditSchedule/createOrEditSchedule.axml
+11
-4
createOrEditSchedule.js
pages/createOrEditSchedule/createOrEditSchedule.js
+44
-43
remind.js
pages/remind/remind.js
+1
-2
repeatMechanism.js
pages/repeatMechanism/repeatMechanism.js
+2
-1
repetitionTime.js
pages/repetitionTime/repetitionTime.js
+67
-27
scheduleDetail.acss
pages/scheduleDetail/scheduleDetail.acss
+2
-0
scheduleDetail.axml
pages/scheduleDetail/scheduleDetail.axml
+5
-6
exampleStore.js
stores/exampleStore.js
+2
-1
No files found.
pages/createOrEditSchedule/createOrEditSchedule.acss
View file @
00b183ac
...
...
@@ -356,7 +356,9 @@ page {
}
.blank {
width: 600rpx;
overflow-x: scroll;
white-space: nowrap;
}
.blank>text {
...
...
pages/createOrEditSchedule/createOrEditSchedule.axml
View file @
00b183ac
<view class="createOrEditSchedule">
<!-- 主题 -->
<view class="theme">
{{aheadText}}
<input placeholder="添加主题" type="text" onInput="getTitle" value="{{title}}"/>
</view>
<!-- 时间 -->
...
...
@@ -90,7 +89,15 @@
</view>
<view class="text" data-nextPage="remind" onTap="nextPage">
<text class="blank">
<text>{{aheadText}}</text>提醒
<text a:if="{{aheadTimes.includes(0)}}">立即提醒</text>
<text a:if="{{aheadTimes.includes(1)}}">5分钟前</text>
<text a:if="{{aheadTimes.includes(15)}}">15分钟前</text>
<text a:if="{{aheadTimes.includes(30)}}">30分钟前</text>
<text a:if="{{aheadTimes.includes(60)}}">1小时前</text>
<text a:if="{{aheadTimes.includes(1440)}}">1天前</text>
<text a:if="{{aheadTimes.includes(2880)}}">两天前</text>
<text a:if="{{aheadTimes.includes(10080)}}">1周前</text>
提醒
</text>
<text class="close iconshanchu iconfont" data-icon="iconhuiqiantixing" catchTap="closeEditList"></text>
</view>
...
...
@@ -106,8 +113,8 @@
</view>
</view>
<view class="terminationTime" onTap="selectTerminal">
<text a:if="{{
!recurrenceModel.terminateTime
}}">永不截止</text>
<text a:else>截止至{{recurrenceModel.terminateTime
.substring(0,10)
}}</text>
<text a:if="{{
isMeetingNeverStop
}}">永不截止</text>
<text a:else>截止至{{recurrenceModel.terminateTime}}</text>
</view>
</view>.
<!--<view class="repeatTime"><view class="iconfont iconchongfu "></view><view class="repeatText">
...
...
pages/createOrEditSchedule/createOrEditSchedule.js
View file @
00b183ac
...
...
@@ -24,14 +24,11 @@ create.Page({
addUserList
:
undefined
,
deleteUserList
:
undefined
,
originUserList
:
[],
aheadText
:
''
},
onLoad
(
event
)
{
let
index
=
new
Date
().
getDay
()
this
.
data
.
repeatWeek
=
this
.
data
.
repeatWeek
[
index
]
this
.
data
.
repeatWeek
=
this
.
data
.
repeatWeek
[
index
-
1
]
this
.
store
.
data
.
remark
=
''
this
.
store
.
data
.
aheadTimes
=
[]
this
.
store
.
data
.
requireUserList
=
[
getApp
().
globalData
.
userid
]
this
.
store
.
data
.
recurrenceModel
=
{
model
:
"no_repeat"
}
...
...
@@ -71,7 +68,9 @@ create.Page({
this
.
getScheduleInfo
()
this
.
update
()
}
else
{
this
.
store
.
data
.
aheadTimes
.
push
(
15
)
this
.
store
.
data
.
aheadTimes
=
[
15
]
this
.
store
.
data
.
requireUserList
=
[
getApp
().
globalData
.
userid
]
this
.
update
()
}
this
.
conflict
()
},
...
...
@@ -79,9 +78,7 @@ create.Page({
const
_that
=
this
setTimeout
(
function
()
{
_that
.
update
()
_that
.
remindTimeText
()
},
100
)
},
// 选择时间
selectTime
(
event
)
{
...
...
@@ -212,9 +209,23 @@ create.Page({
}
return
Object
.
values
(
containt
)
},
// 获取两年后的今天
getTwoYearToday
()
{
let
date
=
new
Date
()
date
.
setYear
(
date
.
getFullYear
()
+
2
)
let
year
=
date
.
getFullYear
();
let
month
=
date
.
getMonth
()
+
1
<
10
?
'0'
+
(
date
.
getMonth
()
+
1
)
:
date
.
getMonth
()
+
1
;
let
day
=
date
.
getDate
()
<
10
?
'0'
+
date
.
getDate
()
:
date
.
getDate
()
return
year
+
'-'
+
month
+
'-'
+
day
},
// 保存
saveCreate
()
{
if
(
!!
this
.
data
.
scheduleItem
)
{
if
(
this
.
store
.
data
.
isMeetingNeverStop
)
{
this
.
store
.
data
.
recurrenceModel
.
terminateTime
=
this
.
getTwoYearToday
();
this
.
store
.
data
.
recurrenceModel
.
forever
=
'1'
;
this
.
update
()
}
let
data
=
{
shcheduleType
:
'common'
,
deleteUserList
:
this
.
data
.
deleteUserList
,
...
...
@@ -331,7 +342,6 @@ create.Page({
this
.
store
.
data
.
locationName
=
res
.
data
.
data
.
location
.
locationName
this
.
store
.
data
.
repeatable
=
res
.
data
.
data
.
repeatable
this
.
store
.
data
.
aheadTimes
=
res
.
data
.
data
.
aheadTimes
console
.
log
(
this
.
store
.
data
.
aheadTimes
)
this
.
store
.
data
.
participatorUserId
=
participatorUserId
this
.
store
.
data
.
requireUserList
=
participatorUserId
this
.
store
.
data
.
participatorList
=
participatorList
...
...
@@ -344,8 +354,7 @@ create.Page({
time1
:
res
.
data
.
data
.
startTime
.
substring
(
0
,
16
),
time2
:
res
.
data
.
data
.
endTime
.
substring
(
0
,
16
),
week1
:
this
.
data
.
weekList
[
new
Date
(
res
.
data
.
data
.
startTime
).
getDay
()],
week2
:
this
.
data
.
weekList
[
new
Date
(
res
.
data
.
data
.
endTime
).
getDay
()],
aheadTimes
:
res
.
data
.
data
.
aheadTimes
,
week2
:
this
.
data
.
weekList
[
new
Date
(
res
.
data
.
data
.
endTime
).
getDay
()]
})
this
.
update
()
this
.
conflict
()
...
...
@@ -372,29 +381,38 @@ create.Page({
identify
:
'major'
,
deleteModel
:
'only'
}
deleteSchedule
(
data
).
then
(
res
=>
{
dd
.
navigateBack
({
delta
:
2
})
dd
.
confirm
({
content
:
'确认删除本次日程吗'
,
confirmButtonText
:
'确定'
,
cancelButtonText
:
'取消'
,
success
:
(
success
)
=>
{
deleteSchedule
(
data
).
then
(
res
=>
{
dd
.
navigateBack
({
delta
:
2
})
})
}
})
break
;
}
},
// 选择终止时间
selectTerminal
()
{
let
time2
=
this
.
data
.
time2
dd
.
datePicker
({
format
:
'yyyy-MM-dd'
,
currentDate
:
''
,
success
:
(
res
)
=>
{
this
.
store
.
data
.
recurrenceModel
.
terminateTime
=
`
${
res
.
date
}
`
this
.
update
()
},
error
:
(
err
)
=>
{
console
.
log
(
JSON
.
stringify
(
err
))
}
})
// let time2 = this.data.time2
// dd.datePicker({
// format: 'yyyy-MM-dd',
// currentDate: '',
// success: (res) => {
// this.store.data.recurrenceModel.terminateTime = `${res.date} `
// this.update()
// },
// error: (err) => {
// console.log(JSON.stringify(err))
// }
// })
dd
.
navigateTo
(({
url
:
`./../repetitionTime/repetitionTime`
}))
},
// 数组取差值 原先的数组与现在的比较 增加与减少
arrayPoor
(
origin
,
now
)
{
...
...
@@ -470,23 +488,6 @@ create.Page({
})
})
},
// 提前多少分钟处理
remindTimeText
()
{
let
index
=
[
0
,
15
,
30
,
60
,
1440
,
2880
,
10080
]
let
text
=
[
'开始时'
,
'5分钟前'
,
'30分钟前'
,
'一小时前'
,
'一天前'
,
'两天前'
,
'1周前'
]
let
aheadText
=
''
let
remindMap
=
new
Map
()
for
(
let
i
=
0
;
i
<
index
.
length
;
i
++
)
{
remindMap
.
set
(
i
,
text
[
i
])
}
for
(
let
m
=
0
;
m
<
this
.
store
.
data
.
aheadTimes
.
length
;
m
++
)
{
aheadText
+=
remindMap
.
get
(
m
)
+
'、'
}
aheadText
=
aheadText
.
substring
(
0
,
aheadText
.
length
-
1
)
this
.
setData
({
aheadText
:
aheadText
})
}
});
pages/remind/remind.js
View file @
00b183ac
...
...
@@ -33,10 +33,9 @@ create.Page({
this
.
store
.
data
.
aheadTimes
.
push
(
event
.
target
.
dataset
.
item
.
time
)
}
this
.
update
()
},
save
()
{
this
.
update
()
dd
.
navigateBack
({
delta
:
1
})
...
...
pages/repeatMechanism/repeatMechanism.js
View file @
00b183ac
...
...
@@ -19,7 +19,7 @@ create.Page({
})
let
week
=
new
Date
().
getDay
()
this
.
data
.
repeatList
[
2
].
weekDayList
=
[
this
.
data
.
week1
[
week
]]
this
.
data
.
repeatList
[
2
].
text
=
this
.
data
.
week2
[
week
]
this
.
data
.
repeatList
[
2
].
text
=
this
.
data
.
week2
[
week
-
1
]
this
.
setData
({
repeatList
:
this
.
data
.
repeatList
})
...
...
@@ -41,6 +41,7 @@ create.Page({
this
.
store
.
data
.
recurrenceModel
=
{
model
:
"day_in_week"
,
weekDayList
:
weekDayList
,
terminateTime
:
''
}
break
;
}
this
.
store
.
data
.
isMeetingNeverStop
=
true
this
.
update
()
dd
.
navigateBack
({
delta
:
1
...
...
pages/repetitionTime/repetitionTime.js
View file @
00b183ac
Page
({
import
create
from
'dd-store'
import
exampleStore
from
'/stores/exampleStore'
create
.
Page
({
store
:
exampleStore
,
useAll
:
true
,
data
:
{
timeYear
:
[],
timeMonth
:
[
'01'
,
'02'
,
'03'
,
'04'
,
'05'
,
'06'
,
'07'
,
'08'
,
'09'
,
'10'
,
'11'
,
'12'
],
...
...
@@ -12,31 +16,60 @@ Page({
isBeOverdue
:
false
,
},
onLoad
()
{
let
date
=
new
Date
();
let
year
=
date
.
getFullYear
();
let
timeYear
=
[
`
${
year
}
年`
,
`
${
year
+
1
}
年`
]
let
timeMonth
=
[]
let
timeDay
=
[]
let
thisDate
=
date
.
getDate
()
let
weekList
=
[
'周日'
,
'周一'
,
'周二'
,
'周三'
,
'周四'
,
'周五'
,
'周六'
]
for
(
let
i
=
1
;
i
<=
12
;
i
++
)
{
timeMonth
.
push
(
`
${
i
}
月`
)
}
let
day
=
this
.
getMonthLength
(
year
,
date
.
getMonth
(),
1
)
for
(
let
i
=
1
;
i
<=
day
;
i
++
)
{
let
thisweek
=
weekList
[
new
Date
(
year
,
date
.
getMonth
(),
i
).
getDay
()]
timeDay
.
push
(
`
${
i
}
日
${
thisweek
}
`
)
if
(
!
this
.
store
.
data
.
recurrenceModel
.
terminateTime
||
this
.
store
.
data
.
recurrenceModel
.
forever
==
'1'
)
{
let
date
=
new
Date
();
let
year
=
date
.
getFullYear
();
let
timeYear
=
[
`
${
year
}
年`
,
`
${
year
+
1
}
年`
]
let
timeMonth
=
[]
let
timeDay
=
[]
let
thisDate
=
date
.
getDate
()
let
weekList
=
[
'周日'
,
'周一'
,
'周二'
,
'周三'
,
'周四'
,
'周五'
,
'周六'
]
for
(
let
i
=
1
;
i
<=
12
;
i
++
)
{
timeMonth
.
push
(
`
${
i
}
月`
)
}
let
day
=
this
.
getMonthLength
(
year
,
date
.
getMonth
(),
1
)
for
(
let
i
=
1
;
i
<=
day
;
i
++
)
{
let
thisweek
=
weekList
[
new
Date
(
year
,
date
.
getMonth
(),
i
).
getDay
()]
timeDay
.
push
(
`
${
i
}
日
${
thisweek
}
`
)
}
this
.
setData
({
timeYear
:
timeYear
,
timeMonth
:
timeMonth
,
timeDay
:
timeDay
,
year
:
year
,
month
:
date
.
getMonth
()
+
1
,
day
:
thisDate
,
week
:
weekList
[
date
.
getDay
()],
pickerValue
:
[
timeYear
.
indexOf
(
`
${
date
.
getFullYear
()}
年`
),
timeMonth
.
indexOf
(
`
${
date
.
getMonth
()
+
1
}
月`
),
timeDay
.
indexOf
(
`
${
date
.
getDate
()}
日
${
weekList
[
date
.
getDay
()]}
`
)]
})
}
else
{
let
date
=
new
Date
();
let
date2
=
new
Date
(
this
.
store
.
data
.
recurrenceModel
.
terminateTime
.
replace
(
/-/g
,
'/'
))
let
year
=
date
.
getFullYear
();
let
timeYear
=
[
`
${
year
}
年`
,
`
${
year
+
1
}
年`
]
let
timeMonth
=
[]
let
timeDay
=
[]
let
thisDate
=
date2
.
getDate
()
let
weekList
=
[
'周日'
,
'周一'
,
'周二'
,
'周三'
,
'周四'
,
'周五'
,
'周六'
]
for
(
let
i
=
1
;
i
<=
12
;
i
++
)
{
timeMonth
.
push
(
`
${
i
}
月`
)
}
let
day
=
this
.
getMonthLength
(
year
,
date2
.
getMonth
(),
1
)
for
(
let
i
=
1
;
i
<=
day
;
i
++
)
{
let
thisweek
=
weekList
[
new
Date
(
year
,
date2
.
getMonth
(),
i
).
getDay
()]
timeDay
.
push
(
`
${
i
}
日
${
thisweek
}
`
)
}
this
.
setData
({
timeYear
:
timeYear
,
timeMonth
:
timeMonth
,
timeDay
:
timeDay
,
year
:
year
,
month
:
date2
.
getMonth
()
+
1
,
day
:
thisDate
,
week
:
weekList
[
date2
.
getDay
()],
pickerValue
:
[
timeYear
.
indexOf
(
`
${
date2
.
getFullYear
()}
年`
),
timeMonth
.
indexOf
(
`
${
date2
.
getMonth
()
+
1
}
月`
),
timeDay
.
indexOf
(
`
${
date2
.
getDate
()}
日
${
weekList
[
date2
.
getDay
()]}
`
)]
})
}
this
.
setData
({
timeYear
:
timeYear
,
timeMonth
:
timeMonth
,
timeDay
:
timeDay
,
year
:
year
,
month
:
date
.
getMonth
()
+
1
,
day
:
thisDate
,
week
:
weekList
[
date
.
getDay
()],
pickerValue
:
[
timeYear
.
indexOf
(
`
${
date
.
getFullYear
()}
年`
),
timeMonth
.
indexOf
(
`
${
date
.
getMonth
()
+
1
}
月`
),
timeDay
.
indexOf
(
`
${
date
.
getDate
()}
日
${
weekList
[
date
.
getDay
()]}
`
)]
})
},
getMonthLength
(
year
,
month
,
day
)
{
let
d
=
new
Date
(
year
,
month
,
day
)
...
...
@@ -57,10 +90,17 @@ Page({
return
false
;
}
else
{
if
(
this
.
data
.
isNeverStop
)
{
console
.
log
(
this
.
getTwoYearToday
())
let
data
=
this
.
getTwoYearToday
();
this
.
store
.
data
.
isMeetingNeverStop
=
true
;
this
.
store
.
data
.
recurrenceModel
.
terminateTime
=
data
}
else
{
this
.
store
.
data
.
isMeetingNeverStop
=
false
;
this
.
store
.
data
.
recurrenceModel
.
terminateTime
=
`
${
this
.
data
.
year
}
-
${
this
.
data
.
month
<
10
?
'0'
+
this
.
data
.
month
:
this
.
data
.
month
}
-
${
this
.
data
.
day
<
10
?
'0'
+
this
.
data
.
day
:
this
.
data
.
day
}
`
}
this
.
update
();
dd
.
navigateBack
({
delta
:
1
})
}
},
getTwoYearToday
(){
...
...
pages/scheduleDetail/scheduleDetail.acss
View file @
00b183ac
...
...
@@ -191,7 +191,9 @@ page {
background: #E60012;
}
.blank {
width: 650rpx;
overflow-x: scroll;
white-space: nowrap;
}
.blank>text {
margin-right: 10rpx;
...
...
pages/scheduleDetail/scheduleDetail.axml
View file @
00b183ac
...
...
@@ -54,17 +54,16 @@
<view class="icon iconshijian iconfont">
</view>
<view class="text blank">
提前
<text a:if="{{aheadTimes.includes(0)}}">立即提醒</text>
<text a:if="{{aheadTimes.includes(1)}}">5分钟</text>
<text a:if="{{aheadTimes.includes(15)}}">15分钟</text>
<text a:if="{{aheadTimes.includes(30)}}">30分钟</text>
<text a:if="{{aheadTimes.includes(60)}}">1小时</text>
<text a:if="{{aheadTimes.includes(1)}}">5分钟
前
</text>
<text a:if="{{aheadTimes.includes(15)}}">15分钟
前
</text>
<text a:if="{{aheadTimes.includes(30)}}">30分钟
前
</text>
<text a:if="{{aheadTimes.includes(60)}}">1小时
前
</text>
<text a:if="{{aheadTimes.includes(1440)}}">1天前</text>
<text a:if="{{aheadTimes.includes(2880)}}">两天前</text>
<text a:if="{{aheadTimes.includes(10080)}}">1周前</text>
提醒
</view>
</view>
Ï
</view>
<!-- 会议描述 -->
<view class="describe" a:if="{{!!remark}}">
...
...
stores/exampleStore.js
View file @
00b183ac
...
...
@@ -13,7 +13,8 @@ class Store {
editList
:
[{
icon
:
'icondingwei'
,
text
:
'地点'
},
{
icon
:
'iconhuiqiantixing'
,
text
:
'提醒'
},
{
icon
:
'iconchongfu'
,
text
:
'重复'
},
{
icon
:
'icondidianmiaoshu'
,
text
:
'描述'
},
{
icon
:
'iconshanchu'
,
text
:
'删除'
}],
remark
:
''
,
// 会议描述
aheadTimes
:
[],
requireUserList
:
[]
requireUserList
:
[],
isMeetingNeverStop
:
true
}
}
...
...
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