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
fdc5386e
Commit
fdc5386e
authored
5 years ago
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Plain Diff
11
parents
6bda4710
8cb18ee4
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
17 deletions
+14
-17
createOrEditSchedule.axml
pages/createOrEditSchedule/createOrEditSchedule.axml
+3
-3
createOrEditSchedule.js
pages/createOrEditSchedule/createOrEditSchedule.js
+6
-6
repeatMechanism.js
pages/repeatMechanism/repeatMechanism.js
+1
-1
repetitionTime.axml
pages/repetitionTime/repetitionTime.axml
+1
-1
repetitionTime.js
pages/repetitionTime/repetitionTime.js
+3
-6
No files found.
pages/createOrEditSchedule/createOrEditSchedule.axml
View file @
fdc5386e
...
...
@@ -95,7 +95,7 @@
<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(2880)}}">
2
天前</text>
<text a:if="{{aheadTimes.includes(10080)}}">1周前</text>
提醒
</text>
...
...
@@ -112,8 +112,8 @@
<view class="iconfont iconshanchu" data-icon="iconchongfu" catchTap="closeEditList">
</view>
</view>
<view class="terminationTime" onTap="selectTerminal">
<text a:if="{{
isMeetingNeverStop
}}">永不截止</text>
<view class="terminationTime" onTap="selectTerminal"
a:if="{{ recurrenceModel.model !== 'no_repeat' }}"
>
<text a:if="{{
recurrenceModel.forever == '1'
}}">永不截止</text>
<text a:else>截止至{{recurrenceModel.terminateTime}}</text>
</view>
</view>.
...
...
This diff is collapsed.
Click to expand it.
pages/createOrEditSchedule/createOrEditSchedule.js
View file @
fdc5386e
...
...
@@ -49,8 +49,8 @@ create.Page({
var
h
=
date
.
getHours
()
var
min
=
date
.
getMinutes
();
this
.
setData
({
time1
:
`
${
y
}
/
${
m
}
/
${
d
}
${
h
<
10
?
"0"
+
date
.
getHours
()
:
date
.
getHours
()}
:
${
min
<
30
?
'00'
:
'30'
}
`
,
time2
:
`
${
y
}
/
${
m
}
/
${
d
}
${
min
<
30
?
h
<
10
?
"0"
+
date
.
getHours
()
:
date
.
getHours
()
:
(
h
+
1
)
<
10
?
"0"
+
(
date
.
getHours
()
+
1
)
:
date
.
getHours
()
+
1
}
:
${
min
<
30
?
'30'
:
'00'
}
`
,
time1
:
`
${
y
}
/
${
m
}
/
${
d
}
${
h
<
10
?
"0"
+
date
.
getHours
()
:
date
.
getHours
()}
:
${
min
<
30
?
'00'
:
'30'
}
:00
`
,
time2
:
`
${
y
}
/
${
m
}
/
${
d
}
${
min
<
30
?
h
<
10
?
"0"
+
date
.
getHours
()
:
date
.
getHours
()
:
(
h
+
1
)
<
10
?
"0"
+
(
date
.
getHours
()
+
1
)
:
date
.
getHours
()
+
1
}
:
${
min
<
30
?
'30'
:
'00'
}
:00
`
,
week1
:
w
,
week2
:
w
,
type
:
event
.
type
,
...
...
@@ -105,8 +105,8 @@ create.Page({
var
h
=
date
.
getHours
()
var
min
=
date
.
getMinutes
();
this
.
setData
({
time1
:
e
.
time
,
time2
:
`
${
y
}
/
${
m
}
/
${
d
}
${
h
<
10
?
"0"
+
date
.
getHours
()
:
date
.
getHours
()}
:
${
min
<
10
?
"0"
+
min
:
min
}
`
,
time1
:
`
${
e
.
time
}
:00`
,
time2
:
`
${
y
}
/
${
m
}
/
${
d
}
${
h
<
10
?
"0"
+
date
.
getHours
()
:
date
.
getHours
()}
:
${
min
<
10
?
"0"
+
min
:
min
}
:00
`
,
isShowModal
:
false
,
week1
:
w1
,
week2
:
w2
...
...
@@ -115,7 +115,7 @@ create.Page({
}
else
{
this
.
setData
({
time1
:
e
.
time
,
time1
:
`
${
e
.
time
}
:00`
,
isShowModal
:
false
,
week1
:
w1
})
...
...
@@ -132,7 +132,7 @@ create.Page({
});
}
else
{
this
.
setData
({
time2
:
e
.
time
,
time2
:
`
${
e
.
time
}
:00`
,
isShowModal
:
false
,
week2
:
w1
})
...
...
This diff is collapsed.
Click to expand it.
pages/repeatMechanism/repeatMechanism.js
View file @
fdc5386e
...
...
@@ -41,7 +41,7 @@ create.Page({
this
.
store
.
data
.
recurrenceModel
=
{
model
:
"day_in_week"
,
weekDayList
:
weekDayList
,
terminateTime
:
''
}
break
;
}
this
.
store
.
data
.
isMeetingNeverStop
=
true
this
.
store
.
data
.
recurrenceModel
.
forever
=
'1'
this
.
update
()
dd
.
navigateBack
({
delta
:
1
...
...
This diff is collapsed.
Click to expand it.
pages/repetitionTime/repetitionTime.axml
View file @
fdc5386e
...
...
@@ -11,7 +11,7 @@
</view>
<view class="timeView">
<view>
<text>永不截止</text><switch checked="{{
isNeverStop
}}" onChange="switchChange"/>
<text>永不截止</text><switch checked="{{
recurrenceModel.forever == '1'
}}" onChange="switchChange"/>
</view>
<view>
<picker-view value="{{pickerValue}}" class="parent" onChange="onChange">
...
...
This diff is collapsed.
Click to expand it.
pages/repetitionTime/repetitionTime.js
View file @
fdc5386e
...
...
@@ -81,20 +81,17 @@ create.Page({
return
d
.
getDate
()
},
switchChange
(
e
)
{
this
.
setData
({
isNeverStop
:
e
.
detail
.
value
})
this
.
store
.
data
.
recurrenceModel
.
forever
=
e
.
detail
.
value
?
'1'
:
'0'
this
.
update
()
},
save
(){
if
(
this
.
data
.
isBeOverdue
)
{
return
false
;
}
else
{
if
(
this
.
data
.
isNeverStop
)
{
if
(
this
.
store
.
data
.
recurrenceModel
.
forever
!=
'1'
)
{
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
();
...
...
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