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
38672136
Commit
38672136
authored
Apr 03, 2020
by
liang ce
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
首页重复日程替换bug修改
parent
f4bf6607
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
17 deletions
+9
-17
scheduleList.acss
PageComponents/scheduleList/scheduleList.acss
+1
-0
scheduleList.js
PageComponents/scheduleList/scheduleList.js
+7
-16
index.acss
pages/index/index.acss
+1
-1
No files found.
PageComponents/scheduleList/scheduleList.acss
View file @
38672136
...
...
@@ -161,6 +161,7 @@
.month {
padding: 0 32rpx;
height: 48rpx;
font-size: 48rpx;
line-height: 48rpx;
margin-bottom: 50rpx;
font-weight: bold;
...
...
PageComponents/scheduleList/scheduleList.js
View file @
38672136
...
...
@@ -28,11 +28,6 @@ create.Component({
props
:
{},
didMount
()
{
this
.
getDate
();
let
userMsg
=
{
headUrl
:
getApp
().
globalData
.
avatar
||
""
,
userName
:
getApp
().
globalData
.
name
};
console
.
log
(
userMsg
);
this
.
setData
({
userMsg
:
{
headUrl
:
getApp
().
globalData
.
avatar
||
""
,
...
...
@@ -130,15 +125,7 @@ create.Component({
this
.
data
.
response
.
templateList
.
map
(
item
=>
{
// TO DO 判断所获取的时间区间
// 将会议的年,月,日拆分,时分拆分,生成rrules规则
let
initialTime
=
item
.
initialTime
.
split
(
"-"
);
//
// <<<<<<< HEAD
// let initialTimeDate = new Date(parseInt(initialTime[0]), parseInt(initialTime[1]) - 1, parseInt(initialTime[2]));
// initialTimeDate.setDate(initialTimeDate.getDate() - 1)
// console.log(initialTimeDate.toLocaleDateString())
// let initialTimeDateyear = initialTimeDate.getFullYear()
// let initialTimeDatemonth = initialTimeDate.getMonth() + 1 < 10 ? '0' + (initialTimeDate.getMonth() + 1) : initialTimeDate.getMonth() + 1
// let initialTimeDateday = initialTimeDate.getDate() < 10 ? '0' + initialTimeDate.getDate() : initialTimeDate.getDate()
// =======
let
initialTime
=
item
.
initialTime
.
split
(
"-"
);
let
initialTimeDate
=
new
Date
(
parseInt
(
initialTime
[
0
]),
parseInt
(
initialTime
[
1
])
-
1
,
...
...
@@ -231,11 +218,15 @@ create.Component({
}
else
if
(
item
.
scheduleTemplateId
&&
scheduleMap
.
get
(
`
${
item
.
planDate
.
replace
(
/-/g
,
"/"
)}
/
${
item
.
scheduleTemplateId
}
`
`
${
new
Date
(
item
.
planDate
.
replace
(
/-/g
,
"/"
)
).
toLocaleDateString
()}
/
${
item
.
scheduleTemplateId
}
`
)
)
{
scheduleMap
.
set
(
`
${
item
.
planDate
.
replace
(
/-/g
,
"/"
)}
/
${
item
.
scheduleTemplateId
}
`
,
`
${
new
Date
(
item
.
planDate
.
replace
(
/-/g
,
"/"
)
).
toLocaleDateString
()}
/
${
item
.
scheduleTemplateId
}
`
,
item
);
}
...
...
pages/index/index.acss
View file @
38672136
...
...
@@ -84,7 +84,7 @@
.iconicon_days {
position: absolute;
left: 5rpx;
top:
5
rpx;
top:
6
rpx;
font-size: 30rpx;
}
...
...
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