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
9c558144
Commit
9c558144
authored
5 years ago
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Plain Diff
合并冲突
parents
9c5c3013
8548e2b2
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
138 additions
and
64 deletions
+138
-64
myDynamic.js
PageComponents/myDynamic/myDynamic.js
+1
-2
scheduleList.acss
PageComponents/scheduleList/scheduleList.acss
+33
-1
scheduleList.axml
PageComponents/scheduleList/scheduleList.axml
+14
-25
scheduleList.js
PageComponents/scheduleList/scheduleList.js
+56
-17
request.js
api/request.js
+0
-7
taskList.js
components/taskList/taskList.js
+1
-3
index.acss
pages/index/index.acss
+20
-4
index.axml
pages/index/index.axml
+9
-5
index.js
pages/index/index.js
+4
-0
No files found.
PageComponents/myDynamic/myDynamic.js
View file @
9c558144
...
...
@@ -49,7 +49,7 @@ Component({
}
let
itemData
=
item
.
meetingLogDataList
[
i
].
meetingLogResource
;
if
(
itemData
)
{
if
(
itemData
.
taskInfos
||
itemData
.
task
Infos
)
{
if
(
itemData
.
taskInfos
||
itemData
.
file
Infos
)
{
if
(
itemData
.
creatorInfo
)
{
itemData
.
creatorInfo
=
JSON
.
parse
(
itemData
.
creatorInfo
);
}
...
...
@@ -92,7 +92,6 @@ Component({
noData
:
dynamicList
.
length
===
that
.
data
.
size
?
true
:
false
});
}
console
.
log
(
this
.
data
.
dynamicList
);
}
});
},
...
...
This diff is collapsed.
Click to expand it.
PageComponents/scheduleList/scheduleList.acss
View file @
9c558144
...
...
@@ -36,6 +36,26 @@
z-index: 99;
}
.headerIcon {
position: relative;
}
.headerIcon>view {
position: absolute;
left: 28rpx;
top: 52rpx;
width: 12rpx;
height: 12rpx;
border: 2rpx solid #FFFFFF;
border-radius: 50%;
background: #EA0C28;
}
.headerIcon .iconicon_app1 {
font-size: 44rpx;
color: rgba(27, 38, 61, 0.4);
}
.siderbarShow {
transform: translateX(750rpx);
transition: all 400ms linear 0s;
...
...
@@ -65,8 +85,15 @@
margin-right: 34rpx;
width: 64rpx;
height: 64rpx;
background: yellow;
border-radius: 50%;
background: #3070F2;
color: white;
overflow: hidden;
}
.sidebarLogo view:nth-of-type(1) image {
width: 64rpx;
height: 64rpx;
}
.hasAssociated, .unAssociated {
...
...
@@ -122,6 +149,11 @@
height: 32rpx;
}
.operateIcon .iconright {
font-size: 22rpx;
color: rgba(27, 38, 61, .5)
}
.scheduleList {
margin-bottom: 48rpx;
}
...
...
This diff is collapsed.
Click to expand it.
PageComponents/scheduleList/scheduleList.axml
View file @
9c558144
<view class="scheduleHeader">
<view>2020年3月</view>
<view onTap="changesidebar">icon</view>
<view onTap="changesidebar" class="headerIcon">
<text class="iconfont iconicon_app1">
</text>
<view>
</view>
</view>
</view>
<scroll-view class="indexScrollView" scroll-y="{{true}}" style="background: #FFFFFF" lower-threshold="1000" onScrollToLower="lower" scroll-into-view="{{todayStr}}">
<block a:for="{{scheduleList}}" a:for-item="scheduleYearList">
...
...
@@ -93,10 +98,11 @@
<view class="sidebarContent" catchTap="preventSort">
<view class="sidebarLogo">
<view>
logo
<image a:if="{{userMsg.headUrl}}" mode="scaleToFill" src="{{userMsg.headUrl}}" />
<text a:else>{{ userMsg.username.slice(-1) }}</text>
</view>
<view>
出的鹏
{{ userMsg.username }}
</view>
</view>
<view class="hasAssociated">
...
...
@@ -116,7 +122,7 @@
</view>
</view>
<view class="operateIcon">
ic
<text class="iconfont iconright"></text>
</view>
</view>
</view>
...
...
@@ -138,7 +144,7 @@
</view>
</view>
<view class="operateIcon">
ic
<text class="iconfont iconright"></text>
</view>
</view>
</view>
...
...
@@ -155,7 +161,7 @@
</view>
</view>
<view class="operateIcon">
ic
<text class="iconfont iconright"></text>
</view>
</view>
</view>
...
...
@@ -172,27 +178,10 @@
</view>
</view>
<view class="operateIcon">
ic
<text class="iconfont iconright"></text>
</view>
</view>
</view>
</view>
</view>
</popup>
\ No newline at end of file
<!--<view class="sidebar {{isShowSidebar === '' ? '' : isShowSidebar === false ? 'siderbarHidden' : 'siderbarShow'}}" catchTap="changesidebar"><view class="sidebarContent" catchTap="preventSort"><view class="sidebarLogo"><view>
logo</view><view>
出的鹏</view></view><view class="hasAssociated"><view class="associated">
已关联应用</view><view class="applicationList"><view class="applicationLogo"></view><view class="applicationMsg"><view><view>
Outlook日历</view><view>
支持会议日程双向同步,实时同步日程信息等</view></view><view class="operateIcon">
ic</view></view></view></view><view class="unAssociated"><view class="associated">
可关联应用</view><view class="applicationList"><view class="applicationLogo"></view><view class="applicationMsg"><view><view>
Outlook日历</view><view>
支持会议日程双向同步,实时同步日程信息等</view></view><view class="operateIcon">
ic</view></view></view><view class="applicationList"><view class="applicationLogo"></view><view class="applicationMsg"><view><view>
Outlook日历</view><view>
支持会议日程双向同步,实时同步日程信息等</view></view><view class="operateIcon">
ic</view></view></view><view class="applicationList"><view class="applicationLogo"></view><view class="applicationMsg"><view><view>
Outlook日历</view><view>
支持会议日程双向同步,实时同步日程信息等</view></view><view class="operateIcon">
ic</view></view></view></view></view></view> -->
\ No newline at end of file
This diff is collapsed.
Click to expand it.
PageComponents/scheduleList/scheduleList.js
View file @
9c558144
...
...
@@ -10,6 +10,7 @@ import create from "dd-store";
create
.
Component
({
mixins
:
[],
data
:
{
userMsg
:
""
,
$data
:
null
,
response
:
""
,
scheduleList
:
[],
...
...
@@ -17,19 +18,22 @@ create.Component({
thisYear
:
""
,
maxYear
:
""
,
minYear
:
""
,
startPageOnLoad
:
false
,
startPageOnShow
:
false
,
isFirstLoad
:
true
,
isShowSidebar
:
""
,
pageStartTime
:
""
,
pageEndTime
:
""
,
show
:
false
,
scrollHeight
:
""
,
timeStamp
:
""
timeStamp
:
""
,
userMsg
:
{}
},
props
:
{},
didMount
()
{
this
.
getDate
();
this
.
setData
({
userMsg
:
{
headUrl
:
getApp
().
globalData
.
avatar
||
""
,
userName
:
getApp
().
globalData
.
name
}
});
},
didUpdate
()
{
if
(
this
.
props
.
update
)
{
...
...
@@ -54,6 +58,7 @@ create.Component({
},
()
=>
{
let
now
=
new
Date
();
console
.
log
(
now
.
getTime
());
let
year
=
now
.
getFullYear
();
let
scheduleList
=
[];
for
(
let
i
=
0
;
i
<=
year
-
2019
;
i
++
)
{
...
...
@@ -64,15 +69,29 @@ create.Component({
// finalDate 是用来定位到今天的
const
finalDate
=
new
Date
(
today
);
// finalDate.setDate(today.getDate() - today.getDay())
that
.
setData
({
// <<<<<<< HEAD
// that.setData({
// scheduleList: scheduleList,
// todayStr: finalDate.toLocaleDateString(),
// thisYear: year,
// maxYear: year,
// canClick: true,
// startPageOnShow: true,
// isFirstLoad: false
// });
// =======
that
.
setData
(
{
scheduleList
:
scheduleList
,
todayStr
:
finalDate
.
toLocaleDateString
(),
thisYear
:
year
,
maxYear
:
year
,
canClick
:
true
,
startPageOnShow
:
true
,
isFirstLoad
:
false
});
maxYear
:
year
},
()
=>
{
console
.
log
(
new
Date
().
getTime
());
}
);
// >>>>>>> 8548e2b26ad549008cdd8c9e5e2bf83d67124e7d
}
);
});
...
...
@@ -129,12 +148,29 @@ create.Component({
// TO DO 判断所获取的时间区间
// 将会议的年,月,日拆分,时分拆分,生成rrules规则
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
()
// <<<<<<< 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
initialTimeDate
=
new
Date
(
parseInt
(
initialTime
[
0
]),
parseInt
(
initialTime
[
1
])
-
1
,
parseInt
(
initialTime
[
2
])
);
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
();
// >>>>>>> 8548e2b26ad549008cdd8c9e5e2bf83d67124e7d
let
startTimeList
=
item
.
startTime
.
split
(
":"
);
let
DTSTART
=
`
${
initialTimeDateyear
}${
initialTimeDatemonth
}${
initialTimeDateday
}
T
${
startTimeList
[
0
]}${
startTimeList
[
1
]}
00Z`
;
let
rule
=
RRule
.
fromString
(
...
...
@@ -142,11 +178,14 @@ create.Component({
);
// rule.options.tzid = "Asia/Hong_Kong";
// 改变时区
// <<<<<<< HEAD
// let rullAll = rule.all()
// rule.all().map(item => {
// console.log(item.toLocaleDateString())
// })
// =======
// >>>>>>> 8548e2b26ad549008cdd8c9e5e2bf83d67124e7d
// 判断是否需要剔除某一天
if
(
item
.
excludePlanDates
)
{
// 拿到剔除日期的list
...
...
This diff is collapsed.
Click to expand it.
api/request.js
View file @
9c558144
...
...
@@ -8,13 +8,6 @@ export function getMeetingRoom(data) {
url
:
'/meet/meeting-room/page'
,
})
}
export
function
getMeetingGlobalSetting
(
data
)
{
return
$http
({
method
:
'get'
,
data
:
data
,
url
:
'/meet/meeting-global-setting/get'
,
})
}
// 获取会议室分类
// 办公区域
...
...
This diff is collapsed.
Click to expand it.
components/taskList/taskList.js
View file @
9c558144
...
...
@@ -6,9 +6,7 @@ Component({
props
:
{
isCanEdit
:
true
},
didMount
()
{
console
.
log
(
this
.
props
);
},
didMount
()
{},
didUpdate
()
{
if
(
this
.
props
.
taskList
.
id
===
108
)
{
console
.
log
(
this
.
props
);
...
...
This diff is collapsed.
Click to expand it.
pages/index/index.acss
View file @
9c558144
...
...
@@ -56,23 +56,38 @@
height: 116rpx;
}
.tabBarView
text
{
.tabBarView
>view
{
display: block;
color: rgba(10, 10, 10, .4)
}
.tabBarView
text
:nth-of-type(1) {
.tabBarView
>view
:nth-of-type(1) {
width: 42rpx;
height: 42rpx;
font-size: 42rpx;
margin-bottom: 11rpx;
}
.tabBarView
text
:nth-of-type(2) {
.tabBarView
>view
:nth-of-type(2) {
height: 10rpx;
font-size: 20rpx;
}
.ischooseTabBar
text
{
.ischooseTabBar
>view
{
color: rgba(10, 10, 10, 1) !important;
}
.iconicon_Calendarbox1 {
position: relative;
}
.iconicon_days {
position: absolute;
left: 5rpx;
top: 5rpx;
font-size: 30rpx;
}
.tabBarView .iconicon_days {
color: #FFFFFF !important;
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
pages/index/index.axml
View file @
9c558144
...
...
@@ -10,17 +10,20 @@
<view class="tabBar">
<view onTap="changeTabBar" data-tabbar='0'>
<view class="tabBarView {{tabBarIndex === '0' ? 'ischooseTabBar' : ''}}">
<
text class="iconfont iconicon_dynamic"></text
>
<
text>动态</text
>
<
view class="iconfont iconicon_dynamic"></view
>
<
view>动态</view
>
</view>
</view>
<view onTap="changeTabBar" data-tabbar='1'>
<view class="tabBarView {{tabBarIndex === '1' ? 'ischooseTabBar' : ''}}">
<text class="iconfont iconicon_Calendarbox1"></text>
<text>日程</text>
<view class="iconfont iconicon_Calendarbox1">
<text class="iconfont iconicon_days iconicon_days{{iconDay}}">
</text>
</view>
<view>日程</view>
</view>
</view>
<view class="createMeeting" onTap="createMeeting">
<
text class="iconfont iconicon_add1"></text
>
<
view class="iconfont iconicon_add1"></view
>
</view>
</view>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
pages/index/index.js
View file @
9c558144
...
...
@@ -6,6 +6,10 @@ create.Page({
$data
:
null
,
},
onLoad
()
{
let
iconDay
=
new
Date
().
getDate
()
this
.
setData
({
iconDay
:
iconDay
})
},
onShow
()
{
setTimeout
(
res
=>
{
...
...
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