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
1b2b19c9
Commit
1b2b19c9
authored
5 years ago
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
会议时间
parent
ff4da87c
release_beta/1.0.0
…
dev
release/1.0.0
release/2.0.0
release/2.1.0
release/dev/2.0.0
release/dev/2.1.0
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
11 deletions
+25
-11
scheduleList.js
PageComponents/scheduleList/scheduleList.js
+20
-8
index.axml
pages/index/index.axml
+2
-2
index.js
pages/index/index.js
+3
-1
No files found.
PageComponents/scheduleList/scheduleList.js
View file @
1b2b19c9
...
@@ -39,9 +39,9 @@ create.Component({
...
@@ -39,9 +39,9 @@ create.Component({
}
}
},
},
didUnmount
()
{},
didUnmount
()
{
},
methods
:
{
methods
:
{
getDate
:
throttle
(
function
(
e
)
{
getDate
:
throttle
(
function
(
e
)
{
let
data
=
{
let
data
=
{
startTime
:
"2020-01-01 00:00:00"
,
startTime
:
"2020-01-01 00:00:00"
,
endTime
:
"2025-12-30 23:59:59"
endTime
:
"2025-12-30 23:59:59"
...
@@ -77,7 +77,7 @@ create.Component({
...
@@ -77,7 +77,7 @@ create.Component({
);
);
});
});
},
1000
),
},
1000
),
nextDetail
:
throttle
(
function
(
e
)
{
nextDetail
:
throttle
(
function
(
e
)
{
let
item
=
e
.
target
.
dataset
.
item
;
let
item
=
e
.
target
.
dataset
.
item
;
dd
.
navigateTo
({
dd
.
navigateTo
({
url
:
`./../meetingDetail/meetingDetail?scheduleItem=
${
JSON
.
stringify
(
url
:
`./../meetingDetail/meetingDetail?scheduleItem=
${
JSON
.
stringify
(
...
@@ -128,14 +128,26 @@ create.Component({
...
@@ -128,14 +128,26 @@ create.Component({
this
.
data
.
response
.
templateList
.
map
(
item
=>
{
this
.
data
.
response
.
templateList
.
map
(
item
=>
{
// TO DO 判断所获取的时间区间
// TO DO 判断所获取的时间区间
// 将会议的年,月,日拆分,时分拆分,生成rrules规则
// 将会议的年,月,日拆分,时分拆分,生成rrules规则
let
terminateTimeList
=
item
.
initialTime
.
split
(
"-"
);
//
let
initialTime
=
item
.
initialTime
.
split
(
"-"
);
//
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
startTimeList
=
item
.
startTime
.
split
(
":"
);
let
startTimeList
=
item
.
startTime
.
split
(
":"
);
let
DTSTART
=
`
${
terminateTimeList
[
0
]}${
terminateTimeList
[
1
]}${
terminateTimeList
[
2
]}
T
${
startTimeList
[
0
]}${
startTimeList
[
1
]}
00Z`
;
let
DTSTART
=
`
${
initialTimeDateyear
}${
initialTimeDatemonth
}${
initialTimeDateday
}
T
${
startTimeList
[
0
]}${
startTimeList
[
1
]}
00Z`
;
console
.
log
(
DTSTART
)
let
rule
=
RRule
.
fromString
(
let
rule
=
RRule
.
fromString
(
`
${
item
.
recurrenceModel
.
recurrenceRule
}
;DTSTART=
${
DTSTART
}
`
`
${
item
.
recurrenceModel
.
recurrenceRule
}
;DTSTART=
${
DTSTART
}
`
);
);
// rule.options.tzid = "Asia/Hong_Kong";
// 改变时区
// 改变时区
rule
.
options
.
tzid
=
"Asia/Hong_Kong"
;
// let rullAll = rule.all()
// rule.all().map(item => {
// console.log(item.toLocaleDateString())
// })
// 判断是否需要剔除某一天
// 判断是否需要剔除某一天
if
(
item
.
excludePlanDates
)
{
if
(
item
.
excludePlanDates
)
{
// 拿到剔除日期的list
// 拿到剔除日期的list
...
@@ -216,7 +228,7 @@ create.Component({
...
@@ -216,7 +228,7 @@ create.Component({
);
);
}
}
});
});
scheduleMap
.
forEach
(
function
(
value
,
key
,
map
)
{
scheduleMap
.
forEach
(
function
(
value
,
key
,
map
)
{
scheduleList
.
push
(
value
);
scheduleList
.
push
(
value
);
});
});
return
scheduleList
;
return
scheduleList
;
...
@@ -354,7 +366,7 @@ create.Component({
...
@@ -354,7 +366,7 @@ create.Component({
value
:
year
value
:
year
});
});
let
thisDay
=
new
Date
().
toLocaleDateString
();
let
thisDay
=
new
Date
().
toLocaleDateString
();
DateMap
.
forEach
(
function
(
value
,
key
,
map
)
{
DateMap
.
forEach
(
function
(
value
,
key
,
map
)
{
if
(
if
(
new
Date
(
key
).
getDay
()
===
0
&&
new
Date
(
key
).
getDay
()
===
0
&&
that
.
count
(
that
.
count
(
...
...
This diff is collapsed.
Click to expand it.
pages/index/index.axml
View file @
1b2b19c9
...
@@ -3,14 +3,14 @@
...
@@ -3,14 +3,14 @@
</my-dynamic>
</my-dynamic>
</view>
</view>
<view a:if="{{tabBarIndex === '1'}}">
<view a:if="{{tabBarIndex === '1'}}">
<my-schedule update="{{indexNeedUpdate}}">
<my-schedule update="{{
$data.
indexNeedUpdate}}">
</my-schedule>
</my-schedule>
</view>
</view>
<view class="tabBar">
<view class="tabBar">
<view onTap="changeTabBar" data-tabbar='0'>
<view onTap="changeTabBar" data-tabbar='0'>
<view class="tabBarView {{tabBarIndex === '0' ? 'ischooseTabBar' : ''}}">
<view class="tabBarView {{tabBarIndex === '0' ? 'ischooseTabBar' : ''}}">
<text class="iconfont iconicon_dynamic"></text>
<text class="iconfont iconicon_dynamic"></text>
<text>动态{{indexNeedUpdate}}
<text>动态{{
$data.
indexNeedUpdate}}
</text>
</text>
</view>
</view>
</view>
</view>
...
...
This diff is collapsed.
Click to expand it.
pages/index/index.js
View file @
1b2b19c9
...
@@ -5,9 +5,11 @@ create.Page({
...
@@ -5,9 +5,11 @@ create.Page({
tabBarIndex
:
"0"
,
tabBarIndex
:
"0"
,
$data
:
null
$data
:
null
},
},
onLoad
()
{},
onLoad
()
{
},
onShow
()
{
onShow
()
{
setTimeout
(
res
=>
{
this
.
update
();
this
.
update
();
},
100
)
},
},
// 修改tabBar
// 修改tabBar
changeTabBar
(
e
)
{
changeTabBar
(
e
)
{
...
...
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