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
abde788a
Commit
abde788a
authored
5 years ago
by
liang ce
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
视觉高还原
parent
4c81ff4a
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
216 additions
and
60 deletions
+216
-60
app.json
app.json
+2
-2
mwSelectTimeModal.acss
components/mwSelectTimeModal/mwSelectTimeModal.acss
+1
-0
createOrEditSchedule.acss
pages/createOrEditSchedule/createOrEditSchedule.acss
+21
-15
createOrEditSchedule.axml
pages/createOrEditSchedule/createOrEditSchedule.axml
+10
-11
createOrEditSchedule.js
pages/createOrEditSchedule/createOrEditSchedule.js
+11
-5
index.acss
pages/index/index.acss
+46
-1
index.axml
pages/index/index.axml
+45
-4
index.js
pages/index/index.js
+29
-15
meetingRoomList.acss
pages/meetingRoomList/meetingRoomList.acss
+25
-0
meetingRoomList.axml
pages/meetingRoomList/meetingRoomList.axml
+10
-2
meetingRoomList.js
pages/meetingRoomList/meetingRoomList.js
+11
-3
place.axml
pages/place/place.axml
+5
-2
No files found.
app.json
View file @
abde788a
{
"pages"
:
[
"pages/createOrEditSchedule/createOrEditSchedule"
,
"pages/index/index"
,
"pages/
uploadFile/uploadFi
le"
,
"pages/
createOrEditSchedule/createOrEditSchedu
le"
,
"pages/meetingRoomList/meetingRoomList"
,
"pages/uploadFile/uploadFile"
,
"pages/repetitionTime/repetitionTime"
,
"pages/repeatMechanism/repeatMechanism"
,
"pages/attendingSituation/attendingSituation"
,
...
...
This diff is collapsed.
Click to expand it.
components/mwSelectTimeModal/mwSelectTimeModal.acss
View file @
abde788a
...
...
@@ -12,6 +12,7 @@
display: flex;
background: rgba(0, 0, 0, 0.15);
flex-direction: column-reverse;
z-index: 99;
}
.mwModalBox{
background: #fff;
...
...
This diff is collapsed.
Click to expand it.
pages/createOrEditSchedule/createOrEditSchedule.acss
View file @
abde788a
...
...
@@ -5,6 +5,7 @@ page {
font-size: 34rpx;
color: #191F25;
padding-bottom: 180rpx;
box-sizing: border-box;
}
.iconfont {
font-size: 32rpx;
...
...
@@ -31,6 +32,7 @@ page {
width: 100%;
padding-left: 0;
height: 52rpx;
font-size: 40rpx;
line-height: 52rpx;
}
...
...
@@ -43,18 +45,24 @@ page {
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
}
.selectTime {
background: #3296FA;
color: white;
}
.time {
height: 132rpx;
display: flex;
padding: 0;
/* overflow-y: hidden; */
}
.AllTimeUnAction {
background: url('../../assests/AllTimeUnAction.png');
background-size: cover;
}
.startTimeAction {
background: url('../../assests/startTimeAction.png');
background-size: cover;
}
.endTimeAction {
background: url('../../assests/endTimeAction.png');
background-size: cover;
}
.timeContainer {
font-family: DINAlternate-Bold;
display: flex;
...
...
@@ -78,19 +86,12 @@ page {
.startTime, .endTime {
width: 50%;
height: 1
00%
;
height: 1
32rpx
;
}
.startTime {
width: 355rpx;
text-indent: 32rpx;
/* position: relative; */
/* border-right: 1rpx solid rgba(25, 31, 37, 0.12); */
}
.selectTime {
background: #3296FA;
color: white;
}
.line {
...
...
@@ -113,7 +114,12 @@ page {
.endTime {
text-indent: 75rpx;
}
.endTime::before {
}
.endTime::after {
}
.icon, .text {
width: 100%;
height: 100%;
...
...
This diff is collapsed.
Click to expand it.
pages/createOrEditSchedule/createOrEditSchedule.axml
View file @
abde788a
...
...
@@ -12,32 +12,31 @@
<view class="container {{!!scheduleItem?(organizer==permissions?'':'noPermissions'):''}}">
<view class="permissions" a:if="{{!!scheduleItem?(organizer==permissions?false:true):false}}">
</view>
<view class="time">
<view class="startTime
{{timeStaus === '0' ? 'selectTime' : ''}}
" data-timeStaus="0" onTap="selectTime">
<view class="time
{{timeStaus == '0' ? 'startTimeAction' : timeStaus == '1' ? 'endTimeAction' : 'AllTimeUnAction'}}
">
<view class="startTime" data-timeStaus="0" onTap="selectTime">
<view class="timeContainer">
<view class="yearTime">
{{time1.slice(5,7)}}月{{time1.slice(8,10)}}日
{{time1.slice(5,7)}}月{{time1.slice(8,10)}}日
</view>
<view class="dayTime">
{{time1.slice(11,16)}}
{{time1.slice(11,16)}}
</view>
</view>
<view class="weekTime">
{{week1}}
{{week1}}
</view>
<!--<view class="line {{!!timeStaus ? 'selectLine' : ''}}"> -->
</view>
<view class="endTime
{{timeStaus === '1' ? 'selectTime' : ''}}
" data-timeStaus="1" onTap="selectTime">
<view class="endTime" data-timeStaus="1" onTap="selectTime">
<view class="timeContainer">
<view class="yearTime">
{{time2.slice(5,7)}}月{{time2.slice(8,10)}}日
{{time2.slice(5,7)}}月{{time2.slice(8,10)}}日
</view>
<view class="dayTime">
{{time2.slice(11,16)}}
{{time2.slice(11,16)}}
</view>
</view>
<view class="weekTime">
{{week2}}
{{week2}}
</view>
</view>
</view>
...
...
@@ -214,7 +213,7 @@
</picker>
<!-- 保存 -->
<view class="save" a:else>
<view onTap="
saveCreate
">
<view onTap="
{{!isClicked? 'saveCreate' : ''}}
">
{{buttonText}}
</view>
</view>
...
...
This diff is collapsed.
Click to expand it.
pages/createOrEditSchedule/createOrEditSchedule.js
View file @
abde788a
...
...
@@ -2,6 +2,7 @@ import create from 'dd-store'
import
exampleStore
from
'/stores/exampleStore'
import
{
deleteSchedule
,
modifySchedule
,
addSchedule
,
getUserScheduleInTime
,
getHomeUserSchedule
,
getScheduleDetail
}
from
'../../api/request.js'
import
{
stringify
}
from
'querystring'
;
import
{
isClicked
}
from
'./../../utils/utils.js'
create
.
Page
({
store
:
exampleStore
,
useAll
:
true
,
...
...
@@ -29,7 +30,8 @@ create.Page({
organizer
:
''
,
isRepeat
:
''
,
permissions
:
''
,
showPage
:
false
showPage
:
false
,
isClicked
:
false
},
onLoad
(
event
)
{
let
index
=
new
Date
().
getDay
()
...
...
@@ -139,7 +141,8 @@ create.Page({
time2
:
`
${
y
}
/
${
m
}
/
${
d
}
${
h
<
10
?
"0"
+
date
.
getHours
()
:
date
.
getHours
()}
:
${
min
<
10
?
"0"
+
min
:
min
}
:00`
,
isShowModal
:
false
,
week1
:
w1
,
week2
:
w2
week2
:
w2
,
timeStaus
:
''
},()
=>
{
that
.
conflict
()
})
...
...
@@ -147,7 +150,8 @@ create.Page({
this
.
setData
({
time1
:
`
${
e
.
time
}
:00`
,
isShowModal
:
false
,
week1
:
w1
week1
:
w1
,
timeStaus
:
''
},()
=>
{
that
.
conflict
()
})
...
...
@@ -165,7 +169,8 @@ create.Page({
this
.
setData
({
time2
:
`
${
e
.
time
}
:00`
,
isShowModal
:
false
,
week2
:
w1
week2
:
w1
,
timeStaus
:
''
},()
=>
{
that
.
conflict
()
})
...
...
@@ -173,7 +178,8 @@ create.Page({
}
}
else
{
this
.
setData
({
isShowModal
:
false
isShowModal
:
false
,
timeStaus
:
''
})
}
},
...
...
This diff is collapsed.
Click to expand it.
pages/index/index.acss
View file @
abde788a
...
...
@@ -67,11 +67,56 @@ page {
background: #CFECFF;
margin-bottom: 16rpx;
}
.NoSchedule{
width: 604rpx;
border-radius: 8rpx;
font-size: 26rpx;
height: 90rpx;
padding-left: 16rpx;
box-sizing: border-box;
margin-bottom: 16rpx;
line-height: 0.9rem;
}
.NoSchedule > view:nth-of-type(1) text:nth-of-type(1) {
color: rgba(25,31,37,0.56);
}
.NoSchedule > view:nth-of-type(1) text:nth-of-type(2) {
color: #3296FA;
}
.dataSchedule .overdue {
background: #F6F6F6;
color: rgba(25, 31, 37, 0.56);
}
.thisDay > view{
color: rgb(50, 150, 250);
}
.thisDay > text{
color: rgb(50, 150, 250);
}
.thisDayLine {
position: relative;
height: 2rpx;
background: #F25643;
width: 100%;
overflow: visible;
}
.dataSchedule .thisDayHavaMeeting {
height: 2rpx !important;
background: #F25643 !important;
overflow: visible !important;
}
.thisDayLine::after {
content: '';
position: absolute;
left: -2rpx;
bottom: -2rpx;
width: 8rpx;
height: 8rpx;
border-radius: 50%;
background: #F25643;
z-index: 99;
box-sizing: border-box;
}
.dataSchedule .cancel {
width: 602rpx;
...
...
This diff is collapsed.
Click to expand it.
pages/index/index.axml
View file @
abde788a
...
...
@@ -4,7 +4,7 @@
<block a:for="{{scheduleList}}" a:for-item="scheduleYearList">
<block a:for="{{scheduleYearList}}">
<block a:if="{{item.type == 'year'}}">
<view class="month"
onTap="changMd"
>
<view class="month">
{{item.value}}年
</view>
</block>
...
...
@@ -22,14 +22,38 @@
</block>
<block a:elif="{{item.type == 'day'}}">
<view class="date">
<view class="dateTime">
<view class="dateTime
{{item.isThisDay}}
">
<view>
{{item.value.week}}
</view>
<text>{{item.value.day}}</text>
</view>
<view class="dataSchedule">
<view a:for="{{item.value.value}}" a:for-item="item2" data-item="{{item2}}" class="{{ item2.isBeOverdue ? 'overdue' : item2.confirmAttendance === 0 ? 'cancel' : '' }}" onTap="nextDetail">
<view a:for="{{item.value.value}}" a:for-item="item2" data-item="{{item2}}" class="{{ item2.isBeOverdue ? 'overdue' : item2.confirmAttendance === 0 ? 'cancel' : '' }}" onTap="{{!isClicked?'nextDetail':''}}">
<view class="dataScheduleName">
<text>{{item2.title}}{{item2.isfirstDayOrEndDay ? `(第${item2.isFewDays}天,共${item2.duration}天)` : '' }}</text>
</view>
<view class="dataScheduleTime">
<text a:if="{{item2.isfirstDayOrEndDay && item2.isfirstDayOrEndDay === '0'}}">{{item2.thisDayStartTime}}</text>
<text a:elif="{{item2.isfirstDayOrEndDay && item2.isfirstDayOrEndDay === '1'}}">全天</text>
<text a:elif="{{item2.isfirstDayOrEndDay && item2.isfirstDayOrEndDay === '2'}}">直到{{item2.thisDayEndTime}}</text>
<text a:else>{{item2.thisDayStartTime}} - {{item2.thisDayEndTime}}</text>
</view>
</view>
</view>
</view>
</block>
<block a:elif="{{item.type == 'today'}}">
<view class="date">
<view class="dateTime {{item.isThisDay}}">
<view style="color">
{{item.value.week}}
</view>
<text style="color">{{item.value.day}}</text>
</view>
<view class="dataSchedule">
<view class="thisDayLine thisDayHavaMeeting" style="margin-bottom: 7.5rpx"></view>
<view a:for="{{item.value.value}}" a:for-item="item2" data-item="{{item2}}" class="{{ item2.isBeOverdue ? 'overdue' : item2.confirmAttendance === 0 ? 'cancel' : '' }}" onTap="{{!isClicked?'nextDetail':''}}">
<view class="dataScheduleName">
<text>{{item2.title}}{{item2.isfirstDayOrEndDay ? `(第${item2.isFewDays}天,共${item2.duration}天)` : '' }}</text>
</view>
...
...
@@ -43,8 +67,25 @@
</view>
</view>
</block>
<block a:elif="{{item.type == 'thisDay'}}">
<view class="date">
<view class="dateTime thisDay">
<view>
{{item.value.week}}
</view>
<text>{{item.value.day}}</text>
</view>
<view class="NoSchedule">
<view>
<text>暂无日程安排,</text>
<text onTap="{{!isClicked?'nextPage':''}}">创建日程</text>
</view>
<view class="thisDayLine"></view>
</view>
</view>
</block>
</block>
</block>
</scroll-view>
<view class="createSchedule iconfont iconjiahao " onTap="
nextPage
">
<view class="createSchedule iconfont iconjiahao " onTap="
{{!isClicked?'nextPage':''}}
">
</view>
This diff is collapsed.
Click to expand it.
pages/index/index.js
View file @
abde788a
import
{
getHomeUserSchedule
}
from
'../../api/request.js'
import
{
isClicked
}
from
'./../../utils/utils.js'
Page
({
data
:
{
AllScheduleList
:
[],
...
...
@@ -7,7 +8,7 @@ Page({
thisYear
:
''
,
maxYear
:
''
,
minYear
:
''
,
canClick
:
tru
e
isClicked
:
fals
e
},
onLoad
(
query
)
{
// 页面加载
...
...
@@ -130,6 +131,7 @@ Page({
type
:
'year'
,
value
:
year
})
let
thisDay
=
new
Date
().
toLocaleDateString
()
DateMap
.
forEach
(
function
(
value
,
key
,
map
)
{
if
(
new
Date
(
key
).
getDay
()
===
0
&&
that
.
count
(
key
,
new
Date
(
year
,
0
,
isLeapYear
?
366
:
365
).
toLocaleDateString
())
>
7
)
{
listWeek
=
listWeek
+
1
...
...
@@ -177,9 +179,29 @@ Page({
dayStr
:
key
})
}
if
(
value
.
scheduleList
.
length
!==
0
)
{
if
(
value
.
scheduleList
.
length
!==
0
&&
key
!==
thisDay
)
{
DateList
.
push
({
type
:
'day'
,
isThisDay
:
true
,
value
:
{
value
:
value
.
scheduleList
,
day
:
new
Date
(
key
).
getDate
()
<
10
?
'0'
+
new
Date
(
key
).
getDate
()
:
new
Date
(
key
).
getDate
(),
week
:
weekList
[
new
Date
(
key
).
getDay
()]
},
})
}
else
if
(
value
.
scheduleList
.
length
!==
0
&&
key
===
thisDay
)
{
DateList
.
push
({
type
:
'today'
,
value
:
{
value
:
value
.
scheduleList
,
day
:
new
Date
(
key
).
getDate
()
<
10
?
'0'
+
new
Date
(
key
).
getDate
()
:
new
Date
(
key
).
getDate
(),
week
:
weekList
[
new
Date
(
key
).
getDay
()]
},
})
}
if
(
value
.
scheduleList
.
length
===
0
&&
key
===
thisDay
)
{
DateList
.
push
({
type
:
'thisDay'
,
value
:
{
value
:
value
.
scheduleList
,
day
:
new
Date
(
key
).
getDate
()
<
10
?
'0'
+
new
Date
(
key
).
getDate
()
:
new
Date
(
key
).
getDate
(),
...
...
@@ -220,21 +242,13 @@ Page({
};
},
nextPage
()
{
if
(
this
.
data
.
canClick
)
{
this
.
setData
({
canClick
:
false
})
dd
.
navigateTo
({
url
:
'./../createOrEditSchedule/createOrEditSchedule'
})
}
isClicked
(
this
)
dd
.
navigateTo
({
url
:
'./../createOrEditSchedule/createOrEditSchedule'
})
},
nextDetail
(
e
)
{
if
(
this
.
data
.
canClick
)
{
this
.
setData
({
canClick
:
false
})
let
item
=
e
.
target
.
dataset
.
item
dd
.
navigateTo
({
url
:
`./../scheduleDetail/scheduleDetail?scheduleItem=
${
JSON
.
stringify
(
item
)}
`
})
}
isClicked
(
this
)
let
item
=
e
.
target
.
dataset
.
item
dd
.
navigateTo
({
url
:
`./../scheduleDetail/scheduleDetail?scheduleItem=
${
JSON
.
stringify
(
item
)}
`
})
},
lower
()
{
let
year
=
this
.
data
.
maxYear
+
1
...
...
This diff is collapsed.
Click to expand it.
pages/meetingRoomList/meetingRoomList.acss
View file @
abde788a
...
...
@@ -331,8 +331,32 @@
height: 100vh;
padding-top: 192rpx;
box-sizing: border-box;
position: relative;
}
.reserveRoomMsg .iconfont{
font-size: 24rpx;
margin-right: 8rpx;
}
/* 无会议室 */
.noRoom{
position: absolute;
left: 0;
top: 0;
display: flex;
align-items: center;
justify-content: center;
width:100%;
height:100%;
}
.noRoom>view{
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.noRoomTip{
margin-top: 32rpx;
font-size: 30rpx;
color: rgba(25,31,37,0.56);
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
pages/meetingRoomList/meetingRoomList.axml
View file @
abde788a
...
...
@@ -71,6 +71,14 @@
</view>
</view>
</view>
<view class="noRoom" a:if={{noRoom}}>
<view>
<view>
<image style="width: 280rpx; height: 156rpx;" mode="{{item.mode}}" src="./../../assests/noRoom.png" />
</view>
<view class="noRoomTip">当前暂无会议室</view>
</view>
</view>
</scroll-view>
<view a:if="{{isShowModal}}" class="modal">
<view class="modalContent">
...
...
@@ -133,5 +141,4 @@
isShow="{{isShowLableModal}}"
onPropsCS="onPropsCS"
>
</lable-tree>
</lable-tree>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
pages/meetingRoomList/meetingRoomList.js
View file @
abde788a
...
...
@@ -19,6 +19,7 @@ create.Page({
time
:
''
},
dataNum
:
'0'
,
noRoom
:
false
,
location
:{
id
:
''
,
name
:
''
...
...
@@ -92,7 +93,12 @@ create.Page({
}
})
that
.
setData
({
reserveRoomList
:
reserveRoomList
reserveRoomList
:
reserveRoomList
,
noRoom
:
false
})
}
else
{
that
.
setData
({
noRoom
:
true
})
}
})
...
...
@@ -553,11 +559,13 @@ create.Page({
}
})
that
.
setData
({
reserveRoomList
:
reserveRoomList
reserveRoomList
:
reserveRoomList
,
noRoom
:
false
})
}
else
{
that
.
setData
({
reserveRoomList
:
[]
reserveRoomList
:
[],
noRoom
:
true
})
}
})
...
...
This diff is collapsed.
Click to expand it.
pages/place/place.axml
View file @
abde788a
...
...
@@ -5,16 +5,19 @@
<input placeholder="搜索地点" onInput="inputPlace"/>
</view>
<view class="availableList" a:if="{{!place}}">
<view class="title">
<view
a:if="{{availableMeetingRoom.length !==0 }}"
class="title">
可用会议室
</view>
<view a:if="{{availableMeetingRoom.length ===0 }}" style="text-align:center" class="title">
暂无可用会议室
</view>
<block a:for="{{availableMeetingRoom}}">
<view class="mettingRoom" data-locationName="{{item.name}}" data-locationid="{{item.meetingRoomId}}" onTap="selectMeetingRoom">
<view class="icon iconfont iconhuiyishi">
</view>
<view class="mettingRoomRight">
<view class="name">
{{item.
n
ame}}
{{item.
meetingRoomFullN
ame}}
</view>
<view class="mettingRoomDetail">
<view class="num">
...
...
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