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
4a88b919
Commit
4a88b919
authored
5 years ago
by
xiexiaoqin
Browse files
Options
Browse Files
Download
Plain Diff
delete code
parents
c7d7c147
bdefa7ba
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
162 additions
and
85 deletions
+162
-85
scheduleList.js
PageComponents/scheduleList/scheduleList.js
+16
-16
list.js
components/list/list.js
+0
-1
createMeeting.acss
pages/createMeeting/createMeeting.acss
+23
-9
createMeeting.axml
pages/createMeeting/createMeeting.axml
+6
-3
createMeeting.js
pages/createMeeting/createMeeting.js
+1
-2
index.axml
pages/index/index.axml
+1
-1
index.js
pages/index/index.js
+15
-0
meetingDetail.acss
pages/meetingDetail/meetingDetail.acss
+24
-9
meetingDetail.axml
pages/meetingDetail/meetingDetail.axml
+16
-8
meetingDetail.js
pages/meetingDetail/meetingDetail.js
+55
-30
outLookContact.acss
pages/outLookContact/outLookContact.acss
+5
-6
No files found.
PageComponents/scheduleList/scheduleList.js
View file @
4a88b919
...
...
@@ -45,9 +45,9 @@ create.Component({
this
.
changeLocation
();
}
},
didUnmount
()
{},
didUnmount
()
{
},
methods
:
{
getDate
:
throttle
(
function
(
e
)
{
getDate
:
throttle
(
function
(
e
)
{
let
data
=
{
startTime
:
"2020-01-01 00:00:00"
,
endTime
:
"2025-12-30 23:59:59"
...
...
@@ -77,7 +77,7 @@ create.Component({
);
});
},
1000
),
nextDetail
:
throttle
(
function
(
e
)
{
nextDetail
:
throttle
(
function
(
e
)
{
let
item
=
e
.
target
.
dataset
.
item
;
dd
.
navigateTo
({
url
:
`./../meetingDetail/meetingDetail?scheduleItem=
${
JSON
.
stringify
(
...
...
@@ -194,8 +194,8 @@ create.Component({
item
.
recurrenceModel
.
startTime
;
let
endTime
=
new
Date
(
getFormatDate
(
item2
,
"yyyyMMdd"
)
+
" "
+
item
.
recurrenceModel
.
startTime
" "
+
item
.
recurrenceModel
.
startTime
);
endTime
.
setMinutes
(
endTime
.
getMinutes
()
+
item
.
recurrenceModel
.
duration
...
...
@@ -234,7 +234,7 @@ create.Component({
);
}
});
scheduleMap
.
forEach
(
function
(
value
,
key
,
map
)
{
scheduleMap
.
forEach
(
function
(
value
,
key
,
map
)
{
scheduleList
.
push
(
value
);
});
return
scheduleList
;
...
...
@@ -316,9 +316,9 @@ create.Component({
thisDayEndTime
:
AllScheduleList
[
y
].
endTime
.
slice
(
11
,
16
),
isBeOverdue
:
new
Date
().
getTime
()
>
new
Date
(
AllScheduleList
[
y
].
endTime
.
replace
(
/-/g
,
"/"
)
).
getTime
()
new
Date
(
AllScheduleList
[
y
].
endTime
.
replace
(
/-/g
,
"/"
)
).
getTime
()
?
true
:
false
});
...
...
@@ -353,9 +353,9 @@ create.Component({
duration
:
count
+
1
,
isBeOverdue
:
new
Date
().
getTime
()
>
new
Date
(
AllScheduleList
[
y
].
endTime
.
replace
(
/-/g
,
"/"
)
).
getTime
()
new
Date
(
AllScheduleList
[
y
].
endTime
.
replace
(
/-/g
,
"/"
)
).
getTime
()
?
true
:
false
});
...
...
@@ -372,7 +372,7 @@ create.Component({
value
:
year
});
let
thisDay
=
new
Date
().
toLocaleDateString
();
DateMap
.
forEach
(
function
(
value
,
key
,
map
)
{
DateMap
.
forEach
(
function
(
value
,
key
,
map
)
{
const
keyDate
=
new
Date
(
key
);
if
(
keyDate
.
getDay
()
===
0
&&
...
...
@@ -399,7 +399,7 @@ create.Component({
type
:
"week"
,
value
:
`第
${
listWeek
}
周,
${
rangeMonth1
+
1
}
月
${
rangeDay1
}
日 -
${
rangeMonth2
==
rangeMonth1
?
""
:
rangeMonth2
+
1
+
"月"
}${
rangeDay2
}
日`
,
}${
rangeDay2
}
日`
,
dayStr
:
key
});
}
...
...
@@ -415,7 +415,7 @@ create.Component({
type
:
"week"
,
value
:
`第
${
listWeek
}
周,
${
rangeMonth1
+
1
}
月
${
rangeDay1
}
日 -
${
rangeMonth2
==
rangeMonth1
?
""
:
rangeMonth2
+
1
+
"月"
}${
rangeDay2
}
日`
,
}${
rangeDay2
}
日`
,
dayStr
:
key
});
}
...
...
@@ -434,7 +434,7 @@ create.Component({
type
:
"week"
,
value
:
`第
${
listWeek
}
周,
${
rangeMonth1
+
1
}
月
${
rangeDay1
}
日 -
${
rangeMonth2
==
rangeMonth1
?
""
:
rangeMonth2
+
1
+
"月"
}${
rangeDay2
}
日`
,
}${
rangeDay2
}
日`
,
dayStr
:
key
});
}
...
...
This diff is collapsed.
Click to expand it.
components/list/list.js
View file @
4a88b919
...
...
@@ -49,7 +49,6 @@ Component({
this
.
setData
({
comSelectList
:
[
-
1
]
})
this
.
props
.
onCompelete
([
-
1
])
}
else
if
(
!
this
.
props
.
multiple
)
{
this
.
setData
({
...
...
This diff is collapsed.
Click to expand it.
pages/createMeeting/createMeeting.acss
View file @
4a88b919
...
...
@@ -9,7 +9,8 @@ page {
.icon {
vertical-align: middle;
color: #0a0a0a;
font-size: 34rpx;
font-size: 40rpx;
line-height: 50rpx;
}
input {
...
...
@@ -18,7 +19,7 @@ input {
}
.createTitle {
padding: 28rpx 3
6
rpx 16rpx;
padding: 28rpx 3
2
rpx 16rpx;
}
.title {
...
...
@@ -60,22 +61,21 @@ input {
.place, .time, .participator, .meetingWay {
display: flex;
padding: 0 3
6
rpx;
padding: 0 3
2
rpx;
font-family: PingFangSC-Regular;
color: #191F25;
overflow: hidden;
margin-top:
54
rpx;
margin-top:
48
rpx;
}
.place>.icon, .time>.icon, .participator>.icon, .meetingWay>.icon {
margin-right: 2
6
rpx;
margin-right: 2
4
rpx;
}
.noPlace, .hasplace, .timeText, .participatorText, .noWay, .hasWay {
height: 38rpx;
font-size: 34rpx;
width: 100%;
line-height:
38rpx
;
line-height:
1.5
;
}
.hasplace, .timeText {
...
...
@@ -85,7 +85,7 @@ input {
}
.placeContaint, .timeContaint, .participatorContaint, .meetingWayContent {
width: 6
78
rpx;
width: 6
22
rpx;
display: flex;
justify-content: space-between;
}
...
...
@@ -128,7 +128,6 @@ input {
.participatorText {
display: flex;
align-items: center;
height: 38rpx;
}
.participatorListBottom {
...
...
@@ -233,4 +232,18 @@ input {
.footNavTop .devider {
margin: 0!important;
}
.meetingWayImageUrl {
flex-grow: 0;
width: 40rpx;
height: 40rpx;
margin-right: 24rpx;
}
.meetingWayImageUrl>image {
margin-top: 5rpx;
vertical-align: top;
width: 100%;
height: 100%;
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
pages/createMeeting/createMeeting.axml
View file @
4a88b919
...
...
@@ -2,8 +2,8 @@
<!-- title remark 标题 描述 -->
<view class="createTitle">
<view class="title">
<input placeholder-class="placeholder" placeholder="{{placeholder}}" class="text" onInput="onInput" data-type="title" value="{{title}}" focus="{{
tru
e}}"/>
<view class="icon iconfont iconicon_description1
{{remark ? '' : 'noValueIcon'}}" onTap="addRemark
">
<input placeholder-class="placeholder" placeholder="{{placeholder}}" class="text" onInput="onInput" data-type="title" value="{{title}}" focus="{{
fals
e}}"/>
<view class="icon iconfont iconicon_description1
" onTap="addRemark" a:if="{{!isShowRemark}}
">
</view>
</view>
<view class="remark" a:if="{{isShowRemark}}">
...
...
@@ -89,7 +89,10 @@
</view>
<!-- meetingWay 会议方式 -->
<view class="meetingWay">
<view class="iconicon_meet iconfont icon {{comListData.meetingWayModelId ? '' : 'noValueIcon'}}">
<view a:if="{{comListData.meetingWayModelId === null}}" class="iconicon_meet iconfont icon noValueIcon">
</view>
<view a:else class="meetingWayImageUrl">
<image mode="scaleToFill" src="{{comListData.meetingWayList[comListData.meetingWayModelId].imageUrl}}"/>
</view>
<view class="meetingWayContent">
<view class="noWay" a:if="{{comListData.meetingWayModelId == null}}" catchTap="showPopup" data-type='meetingWayModel'>
...
...
This diff is collapsed.
Click to expand it.
pages/createMeeting/createMeeting.js
View file @
4a88b919
...
...
@@ -80,9 +80,8 @@ create.Page({
},
// 添加描述
addRemark
()
{
let
isShowRemark
=
!
this
.
data
.
isShowRemark
this
.
setData
({
isShowRemark
:
isShowRemark
isShowRemark
:
true
})
this
.
update
()
...
...
This diff is collapsed.
Click to expand it.
pages/index/index.axml
View file @
4a88b919
<view style="position:absolute">
版本17
5
版本17
6
</view>
<view a:if="{{tabBarIndex === '0'}}">
<my-dynamic>
...
...
This diff is collapsed.
Click to expand it.
pages/index/index.js
View file @
4a88b919
...
...
@@ -12,6 +12,9 @@ create.Page({
this
.
setData
({
iconDay
:
iconDay
});
dd
.
setNavigationBar
({
title
:
'动态'
})
},
onShow
()
{
setTimeout
(
res
=>
{
...
...
@@ -24,6 +27,18 @@ create.Page({
this
.
setData
({
tabBarIndex
:
e
.
currentTarget
.
dataset
.
tabbar
});
let
title
=
'动态'
switch
(
e
.
currentTarget
.
dataset
.
tabbar
)
{
case
'0'
:
title
=
'动态'
;
break
;
case
'1'
:
title
=
'日程'
;
break
;
}
dd
.
setNavigationBar
({
title
:
title
})
if
(
nowtabBarIndex
===
e
.
currentTarget
.
dataset
.
tabbar
&&
e
.
currentTarget
.
dataset
.
tabbar
===
"1"
...
...
This diff is collapsed.
Click to expand it.
pages/meetingDetail/meetingDetail.acss
View file @
4a88b919
...
...
@@ -139,7 +139,9 @@ page {
.icon {
vertical-align: middle;
color: #0a0a0a;
font-size: 34rpx;
font-size: 40rpx;
line-height: 50rpx;
line-height: 50rpx;
}
input {
...
...
@@ -150,7 +152,7 @@ input {
}
.createTitle {
padding: 14rpx 3
6
rpx 16rpx;
padding: 14rpx 3
2
rpx 16rpx;
position: relative;
min-height: 90rpx;
overflow: hidden;
...
...
@@ -200,22 +202,21 @@ input {
.place, .time, .participator, .meetingWay {
display: flex;
padding: 0 3
6
rpx;
padding: 0 3
2
rpx;
font-family: PingFangSC-Regular;
color: #191F25;
overflow: hidden;
margin-top:
54
rpx;
margin-top:
48
rpx;
}
.place>.icon, .time>.icon, .participator>.icon, .meetingWay>.icon {
margin-right: 2
6
rpx;
margin-right: 2
4
rpx;
}
.noPlace, .hasplace, .timeText, .participatorText, .noWay, .hasWay {
height: 38rpx;
font-size: 34rpx;
width: 100%;
line-height:
38rpx
;
line-height:
1.5
;
}
.hasplace, .timeText {
...
...
@@ -225,7 +226,7 @@ input {
}
.placeContaint, .timeContaint, .participatorContaint, .meetingWayContent {
width: 6
78
rpx;
width: 6
22
rpx;
display: flex;
justify-content: space-between;
}
...
...
@@ -268,7 +269,6 @@ input {
.participatorText {
display: flex;
align-items: center;
height: 38rpx;
}
.participatorListBottom {
...
...
@@ -530,4 +530,18 @@ input {
.metingDetail {
overflow: hidden;
height: 100vh;
}
.meetingWayImageUrl {
flex-grow: 0;
width: 40rpx;
height: 40rpx;
margin-right: 24rpx;
}
.meetingWayImageUrl>image {
margin-top: 5rpx;
vertical-align: top;
width: 100%;
height: 100%;
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
pages/meetingDetail/meetingDetail.axml
View file @
4a88b919
...
...
@@ -21,12 +21,12 @@
<view class="permissionContant">
<view class="createTitle">
<view class="title">
<input placeholder-class="placeholder" placeholder="{{placeholder}}" class="text" onInput="onInput" data-type="title" data-selectType="common" value="{{title}}" onConfirm="onConfirm" focus="{{
true}}
"/>
<view class="icon iconfont iconicon_description1
{{remark ? '' : 'noValueIcon'
}}" onTap="addRemark">
<input placeholder-class="placeholder" placeholder="{{placeholder}}" class="text" onInput="onInput" data-type="title" data-selectType="common" value="{{title}}" onConfirm="onConfirm" focus="{{
false}}" onBlur="onBlur
"/>
<view class="icon iconfont iconicon_description1
" a:if="{{!isShowRemark
}}" onTap="addRemark">
</view>
</view>
<view class="remark" a:if="{{isShowRemark}}">
<input placeholder-class="placeholder" placeholder="请添加描述" class="text" onInput="onInput" data-type="remark" value="{{remark}}" onConfirm="onConfirm"/>
<input placeholder-class="placeholder" placeholder="请添加描述" class="text" onInput="onInput" data-type="remark" value="{{remark}}" onConfirm="onConfirm"
onBlur="onBlur" focus="{{false}}"
/>
</view>
</view>
<view class="permission" a:if="{{currentPeople != organizer}}">
...
...
@@ -120,7 +120,10 @@
<view class="permissionContant" a:if="{{comListData.meetingWayList[comListData.meetingWayModelId].text || currentPeople === organizer}}">
<!--<view class="iconicon_attender iconfont icon {{$data.participatorList.length>1 ? '' : 'noValueIcon'}}"></view> -->
<view class="meetingWay">
<view class="iconicon_meet iconfont icon {{comListData.meetingWayModelId ? '' : 'noValueIcon'}}">
<view a:if="{{comListData.meetingWayModelId === null}}" class="iconicon_meet iconfont icon noValueIcon">
</view>
<view a:else class="meetingWayImageUrl">
<image mode="scaleToFill" src="{{comListData.meetingWayList[comListData.meetingWayModelId].imageUrl}}"/>
</view>
<view class="meetingWayContent">
<view class="noWay" a:if="{{comListData.meetingWayModelId == null}}" catchTap="showPopup" data-type='meetingWayModel'>
...
...
@@ -142,7 +145,8 @@
<!-- 底部导航栏 -->
<view class="footNav">
<view class="footNavTop" a:if="{{!isExpand}}">
<view class="originStaus" a:if="{{confirmAttendance === null}}">
<!-- 待定状态 -->
<view class="originStaus" a:if="{{confirmAttendance === -9}}">
<view catchTap="participate">
<text class="iconfont iconicon_Agreed1"></text>
<text>参加</text></view>
...
...
@@ -152,6 +156,7 @@
<text>不参加</text>
</view>
</view>
<!--参加状态-->
<view class="participateStatus" a:if="{{confirmAttendance === 1}}">
<view class="remind" catchTap="showPopup" data-type="aheadTime">
<text class="iconfont iconicon_time1"></text>
...
...
@@ -164,10 +169,13 @@
<text class="iconfont iconicon_share"></text>
</view>
<text class="devider"></text>
<view class="participate" catchTap="
noParticip
ate">
<view class="participate" catchTap="
initialSt
ate">
<text class="iconfont iconicon_Agreed1"></text>
<text>参加</text></view></view>
<view class="noParticipateStatus" a:if="{{confirmAttendance === 0}}" catchTap="participate">
<text>参加</text>
</view>
</view>
<!--不参加状态 -->
<view class="noParticipateStatus" a:if="{{confirmAttendance === 0}}" catchTap="initialState">
<text class="iconfont iconicon_noAgreed1"></text>
<text>不参加</text>
</view>
...
...
This diff is collapsed.
Click to expand it.
pages/meetingDetail/meetingDetail.js
View file @
4a88b919
...
...
@@ -210,9 +210,8 @@ create.Page({
},
// 添加描述
addRemark
()
{
let
isShowRemark
=
!
this
.
data
.
isShowRemark
this
.
setData
({
isShowRemark
:
isShowRemark
isShowRemark
:
true
})
this
.
update
()
...
...
@@ -810,38 +809,42 @@ create.Page({
let
modifyContent
=
''
switch
(
value
)
{
case
'title'
:
let
dataTitle
=
{
title
:
this
.
data
.
title
,
modifyModel
:
modifyModel
,
modifyContent
:
'title'
}
this
.
modifySchedule
(
dataTitle
).
catch
(
err
=>
{
this
.
setData
({
title
:
this
.
$store
.
data
.
originalData
.
title
,
'conToastData.showToast'
:
true
,
'conToastData.title'
:
' 网络异常'
if
(
this
.
data
.
title
!==
this
.
$store
.
data
.
originalData
.
title
)
{
let
dataTitle
=
{
title
:
this
.
data
.
title
,
modifyModel
:
modifyModel
,
modifyContent
:
'title'
}
this
.
modifySchedule
(
dataTitle
).
catch
(
err
=>
{
this
.
setData
({
title
:
this
.
$store
.
data
.
originalData
.
title
,
'conToastData.showToast'
:
true
,
'conToastData.title'
:
' 网络异常'
})
}).
then
(
res
=>
{
this
.
$store
.
data
.
originalData
.
title
=
this
.
data
.
title
this
.
update
()
})
}).
then
(
res
=>
{
this
.
$store
.
data
.
originalData
.
title
=
this
.
data
.
title
this
.
update
()
})
}
break
case
'remark'
:
let
dataRemark
=
{
remark
:
this
.
data
.
remark
,
modifyModel
:
modifyModel
,
modifyContent
:
'remark'
}
this
.
modifySchedule
(
dataRemark
).
catch
(
err
=>
{
this
.
setData
({
remark
:
this
.
$store
.
data
.
originalData
.
remark
,
'conToastData.showToast'
:
true
,
'conToastData.title'
:
' 网络异常'
if
(
this
.
data
.
remark
!==
this
.
$store
.
data
.
originalData
.
remark
)
{
let
dataRemark
=
{
remark
:
this
.
data
.
remark
,
modifyModel
:
modifyModel
,
modifyContent
:
'remark'
}
this
.
modifySchedule
(
dataRemark
).
catch
(
err
=>
{
this
.
setData
({
remark
:
this
.
$store
.
data
.
originalData
.
remark
,
'conToastData.showToast'
:
true
,
'conToastData.title'
:
' 网络异常'
})
}).
then
(
res
=>
{
this
.
$store
.
data
.
originalData
.
remark
=
this
.
data
.
remark
this
.
update
()
})
}).
then
(
res
=>
{
this
.
$store
.
data
.
originalData
.
remark
=
this
.
data
.
remark
this
.
update
()
})
}
break
case
'meeting_way'
:
let
dataWay
=
{
...
...
@@ -1151,6 +1154,28 @@ create.Page({
})
}
},
initialState
()
{
let
data
=
{
templateId
:
this
.
data
.
scheduleItem
.
scheduleTemplateId
,
planDate
:
this
.
data
.
scheduleItem
.
planDate
,
scheduleId
:
this
.
data
.
scheduleItem
.
id
,
value
:
-
9
,
type
:
'only'
}
if
(
this
.
data
.
repeatable
===
1
)
{
data
.
type
=
'all'
}
else
{
data
.
type
=
'only'
}
isParticipate
(
data
).
then
(
res
=>
{
if
(
res
.
data
.
code
===
0
)
{
this
.
setData
({
confirmAttendance
:
-
9
})
}
})
},
// 页面卸载
onUnload
()
{
// 页面被关闭
...
...
This diff is collapsed.
Click to expand it.
pages/outLookContact/outLookContact.acss
View file @
4a88b919
...
...
@@ -75,23 +75,22 @@ input {
bottom: 0;
left: 0;
right: 0;
padding:
16rpx
32rpx;
padding: 32rpx;
background: #fff;
box-shadow: 0 -2px 4px 0 rgba(0, 0, 0, 0.04);
position: fixed;
bottom: 0;
}
.button {
font-family: PingFangSC-Regular;
width: 686rpx;
height:
96
rpx;
background: #
4D88FF
;
height:
72
rpx;
background: #
EA0C28
;
border-radius: 48rpx;
font-size: 3
4
rpx;
font-size: 3
2
rpx;
color: #FFFFFF;
text-align: center;
line-height:
96
rpx;
line-height:
72
rpx;
}
.conflict {
...
...
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