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
4c81ff4a
Commit
4c81ff4a
authored
Feb 27, 2020
by
liang ce
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改日期bug
parent
6b03a3b5
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
20 deletions
+32
-20
app.json
app.json
+1
-1
createOrEditSchedule.js
pages/createOrEditSchedule/createOrEditSchedule.js
+7
-12
index.acss
pages/index/index.acss
+7
-2
index.js
pages/index/index.js
+17
-5
No files found.
app.json
View file @
4c81ff4a
{
"pages"
:
[
"pages/createOrEditSchedule/createOrEditSchedule"
,
"pages/index/index"
,
"pages/uploadFile/uploadFile"
,
"pages/meetingRoomList/meetingRoomList"
,
"pages/repetitionTime/repetitionTime"
,
"pages/createOrEditSchedule/createOrEditSchedule"
,
"pages/repeatMechanism/repeatMechanism"
,
"pages/attendingSituation/attendingSituation"
,
"pages/addRemark/addRemark"
,
...
...
pages/createOrEditSchedule/createOrEditSchedule.js
View file @
4c81ff4a
...
...
@@ -81,8 +81,6 @@ create.Page({
})
this
.
store
.
data
.
startTime
=
this
.
data
.
time1
this
.
store
.
data
.
endTime
=
this
.
data
.
time2
this
.
store
.
data
.
week1
=
this
.
data
.
week1
this
.
store
.
data
.
week2
=
this
.
data
.
week2
this
.
store
.
data
.
aheadTimes
=
[
15
]
this
.
update
()
setTimeout
(()
=>
{
...
...
@@ -121,6 +119,7 @@ create.Page({
},
// 选择时间组件回调
changeSelectTime
(
e
)
{
let
that
=
this
if
(
e
.
status
===
1
)
{
var
date1
=
new
Date
(
e
.
time
);
var
weekList
=
[
'周日'
,
'周一'
,
'周二'
,
'周三'
,
'周四'
,
'周五'
,
'周六'
]
...
...
@@ -141,20 +140,17 @@ create.Page({
isShowModal
:
false
,
week1
:
w1
,
week2
:
w2
},()
=>
{
that
.
conflict
()
})
this
.
conflict
()
this
.
store
.
data
.
startTime
=
`
${
e
.
time
}
:00`
this
.
store
.
data
.
endTime
=
`
${
y
}
/
${
m
}
/
${
d
}
${
h
<
10
?
"0"
+
date
.
getHours
()
:
date
.
getHours
()}
:
${
min
<
10
?
"0"
+
min
:
min
}
:00`
this
.
update
()
}
else
{
this
.
setData
({
time1
:
`
${
e
.
time
}
:00`
,
isShowModal
:
false
,
week1
:
w1
},()
=>
{
that
.
conflict
()
})
this
.
store
.
data
.
startTime
=
`
${
e
.
time
}
:00`
this
.
update
()
this
.
conflict
()
}
}
else
{
if
(
new
Date
(
e
.
time
).
getTime
()
<=
new
Date
(
this
.
data
.
time1
).
getTime
())
{
...
...
@@ -170,10 +166,9 @@ create.Page({
time2
:
`
${
e
.
time
}
:00`
,
isShowModal
:
false
,
week2
:
w1
},()
=>
{
that
.
conflict
()
})
this
.
store
.
data
.
endTime
=
`
${
e
.
time
}
:00`
this
.
update
()
this
.
conflict
()
}
}
}
else
{
...
...
pages/index/index.acss
View file @
4c81ff4a
...
...
@@ -22,7 +22,7 @@ page {
font-size: 26rpx;
color: rgba(25, 31, 37, 0.56);
height: 37rpx;
padding-left: 1
46
rpx;
padding-left: 1
20
rpx;
line-height: 37rpx;
margin: 48rpx 0;
}
...
...
@@ -35,11 +35,16 @@ page {
.dateTime {
margin-right: 34rpx;
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
.dateTime>view {
font-size: 22rpx;
line-height: 24rpx;
font-weight: bolder;
color: #191F25;
/* margin-bottom: 8rpx; */
}
...
...
@@ -77,7 +82,7 @@ page {
}
.dataSchedule>view>view {
margin-left:
32
rpx;
margin-left:
16
rpx;
}
.dataScheduleName {
...
...
pages/index/index.js
View file @
4c81ff4a
...
...
@@ -6,7 +6,8 @@ Page({
todayStr
:
''
,
thisYear
:
''
,
maxYear
:
''
,
minYear
:
''
minYear
:
''
,
canClick
:
true
},
onLoad
(
query
)
{
// 页面加载
...
...
@@ -43,7 +44,8 @@ Page({
scheduleList
:
scheduleList
,
todayStr
:
finalDate
.
toLocaleDateString
(),
thisYear
:
year
,
maxYear
:
year
maxYear
:
year
,
canClick
:
true
})
})
})
...
...
@@ -218,11 +220,21 @@ Page({
};
},
nextPage
()
{
dd
.
navigateTo
({
url
:
'./../createOrEditSchedule/createOrEditSchedule'
})
if
(
this
.
data
.
canClick
)
{
this
.
setData
({
canClick
:
false
})
dd
.
navigateTo
({
url
:
'./../createOrEditSchedule/createOrEditSchedule'
})
}
},
nextDetail
(
e
)
{
let
item
=
e
.
target
.
dataset
.
item
dd
.
navigateTo
({
url
:
`./../scheduleDetail/scheduleDetail?scheduleItem=
${
JSON
.
stringify
(
item
)}
`
})
if
(
this
.
data
.
canClick
)
{
this
.
setData
({
canClick
:
false
})
let
item
=
e
.
target
.
dataset
.
item
dd
.
navigateTo
({
url
:
`./../scheduleDetail/scheduleDetail?scheduleItem=
${
JSON
.
stringify
(
item
)}
`
})
}
},
lower
()
{
let
year
=
this
.
data
.
maxYear
+
1
...
...
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