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
a57070e5
Commit
a57070e5
authored
Feb 14, 2020
by
liang ce
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
首页兼容IOS时间格式
parent
cc5b26c7
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
44 deletions
+11
-44
app.json
app.json
+1
-1
index.acss
pages/index/index.acss
+1
-1
index.js
pages/index/index.js
+5
-6
scheduleDetail.js
pages/scheduleDetail/scheduleDetail.js
+4
-36
No files found.
app.json
View file @
a57070e5
{
"pages"
:
[
"pages/scheduleDetail/scheduleDetail"
,
"pages/index/index"
,
"pages/scheduleDetail/scheduleDetail"
,
"pages/attendingSituation/attendingSituation"
,
"pages/createOrEditSchedule/createOrEditSchedule"
,
"pages/place/place"
,
...
...
pages/index/index.acss
View file @
a57070e5
...
...
@@ -38,7 +38,7 @@ page {
}
.dateTime>view {
font-size: 2
4
rpx;
font-size: 2
2
rpx;
line-height: 24rpx;
color: #191F25;
/* margin-bottom: 8rpx; */
...
...
pages/index/index.js
View file @
a57070e5
...
...
@@ -76,11 +76,11 @@ Page({
}
}
for
(
let
y
=
0
;
y
<
this
.
data
.
AllScheduleList
.
length
;
y
++
)
{
let
date1
=
this
.
data
.
AllScheduleList
[
y
].
startTime
.
slice
(
0
,
10
)
let
date2
=
this
.
data
.
AllScheduleList
[
y
].
endTime
.
slice
(
0
,
10
)
let
date1
=
this
.
data
.
AllScheduleList
[
y
].
startTime
.
slice
(
0
,
10
)
.
replace
(
/-/g
,
'/'
)
let
date2
=
this
.
data
.
AllScheduleList
[
y
].
endTime
.
slice
(
0
,
10
)
.
replace
(
/-/g
,
'/'
)
let
count
=
this
.
count
(
date1
,
date2
)
if
(
count
==
0
)
{
DateMap
.
get
(
`
${
new
Date
(
this
.
data
.
AllScheduleList
[
y
].
startTime
).
toLocaleDateString
()}
`
).
scheduleList
.
push
(
this
.
data
.
AllScheduleList
[
y
])
DateMap
.
get
(
`
${
new
Date
(
this
.
data
.
AllScheduleList
[
y
].
startTime
.
replace
(
/-/g
,
'/'
)
).
toLocaleDateString
()}
`
).
scheduleList
.
push
(
this
.
data
.
AllScheduleList
[
y
])
}
else
{
for
(
let
j
=
0
;
j
<=
count
;
j
++
)
{
let
time
=
new
Date
();
...
...
@@ -185,11 +185,10 @@ Page({
},
nextPage
()
{
dd
.
navigateTo
({
url
:
'./../createOrEditSchedule/createOrEditSchedule'
})
},
nextDetail
()
{
dd
.
navigateTo
({
url
:
'./../scheduleDetail/scheduleDetail'
})
nextDetail
(
e
)
{
dd
.
navigateTo
({
url
:
'./../scheduleDetail/scheduleDetail'
})
}
});
pages/scheduleDetail/scheduleDetail.js
View file @
a57070e5
import
{
getScheduleDetail
,
uploadPermissions
}
from
'../../api/request.js'
import
{
getScheduleDetail
}
from
'../../api/request.js'
Page
({
data
:
{
title
:
''
,
...
...
@@ -8,10 +8,7 @@ Page({
weeks
:
[
'周一'
,
'周二'
,
'周三'
,
'周四'
,
'周五'
,
'周六'
,
'周日'
],
week
:
''
,
userList
:
[],
aheadTimes
:
[],
isAcrossDay
:
true
,
describe
:
''
,
spaceId
:
''
isAcrossDay
:
true
},
onLoad
()
{
...
...
@@ -28,16 +25,9 @@ Page({
startTime
:
res
.
data
.
data
.
startTime
,
endTime
:
res
.
data
.
data
.
endTime
,
userList
:
res
.
data
.
data
.
userList
,
aheadTimes
:
res
.
data
.
data
.
aheadTimes
,
describe
:
res
.
data
.
data
.
describe
,
week
:
this
.
data
.
weeks
[
new
Date
(
res
.
data
.
data
.
startTime
).
getDay
()
-
1
]
week
:
this
.
data
.
weeks
[
new
Date
(
res
.
data
.
data
.
startTime
).
getDay
()
-
1
]
})
this
.
acrossDay
(
res
.
data
.
data
.
startTime
,
res
.
data
.
data
.
endTime
)
return
uploadPermissions
()
}).
then
(
res
=>
{
this
.
setData
({
spaceId
:
res
.
data
.
data
})
})
},
// 是否跨天
...
...
@@ -56,7 +46,7 @@ Page({
},
// 处理时间
dealTime
(
time
)
{
let
time1
=
time
.
replace
(
/-/g
,
"/"
)
let
time1
=
time
.
replace
(
/-/g
,
"/"
)
let
date
=
new
Date
(
time1
)
let
day
=
date
.
getDate
()
let
year
=
date
.
getFullYear
()
...
...
@@ -66,28 +56,6 @@ Page({
month
:
month
,
day
:
day
}
},
upload
()
{
dd
.
uploadAttachmentToDingTalk
({
image
:
{
multiple
:
true
,
compress
:
false
,
max
:
9
,
spaceId
:
this
.
data
.
spaceId
},
space
:
{
spaceId
:
this
.
data
.
spaceId
,
max
:
9
},
file
:
{
spaceId
:
this
.
data
.
spaceId
,
max
:
1
},
types
:
[
"photo"
,
"camera"
,
"file"
,
"space"
],
//PC端仅支持["photo","file","space"]
success
:
(
res
)
=>
{
console
.
log
(
JSON
.
stringify
(
res
),
1111
)
dd
.
alert
({
content
:
'上传成功'
})
},
fail
:
(
err
)
=>
{
console
.
log
(
JSON
.
stringify
(
err
),
1111
)
dd
.
alert
({
content
:
'上传失败'
})
console
.
log
(
err
)
}
})
}
});
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