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
ebf9e6f8
Commit
ebf9e6f8
authored
Feb 27, 2020
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
暂存
parent
6b03a3b5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
64 additions
and
7 deletions
+64
-7
app.json
app.json
+1
-1
createOrEditSchedule.acss
pages/createOrEditSchedule/createOrEditSchedule.acss
+38
-2
createOrEditSchedule.axml
pages/createOrEditSchedule/createOrEditSchedule.axml
+19
-0
createOrEditSchedule.js
pages/createOrEditSchedule/createOrEditSchedule.js
+2
-1
scheduleDetail.axml
pages/scheduleDetail/scheduleDetail.axml
+4
-3
No files found.
app.json
View file @
ebf9e6f8
{
"pages"
:
[
"pages/index/index"
,
"pages/createOrEditSchedule/createOrEditSchedule"
,
"pages/uploadFile/uploadFile"
,
"pages/meetingRoomList/meetingRoomList"
,
"pages/repetitionTime/repetitionTime"
,
"pages/createOrEditSchedule/createOrEditSchedule"
,
"pages/repeatMechanism/repeatMechanism"
,
"pages/attendingSituation/attendingSituation"
,
"pages/addRemark/addRemark"
,
...
...
pages/createOrEditSchedule/createOrEditSchedule.acss
View file @
ebf9e6f8
...
...
@@ -6,9 +6,11 @@ page {
color: #191F25;
padding-bottom: 180rpx;
}
.iconfont {
font-size: 32rpx;
}
::-webkit-scrollbar {
display: none
}
...
...
@@ -290,6 +292,7 @@ page {
.editList>view {
margin: 24rpx 0;
}
.listIcon {
line-height: 30rpx;
text-align: center;
...
...
@@ -369,23 +372,55 @@ page {
.blank>text {
margin-right: 10rpx;
}
.container {
position: relative;
}
.permissions {
width: 100%;
background:rgba(0, 0, 0, 0);
background:
rgba(0, 0, 0, 0);
position: absolute;
height: 100%;
top: 0;
z-index: 10;
}
.noPermissions {
opacity: 0.6;
}
.iconshanchu3 {
color: #f25643;
}
.iconshanchu3+.listText {
color: #f25643;
color: #f25643;
}
.popupWindow {
height: 100%;
width: 100%;
position: fixed;
top: 0;
background: rgba(0, 0, 0, 0.12)
}
.popupWindowCenter {
width: 587rpx;
left: 50%;
margin-left: -293rpx;
height: auto;
position: absolute;
border-radius: 10rpx;
top: 450rpx;
background: #fff;
}
.list {
height: 96rpx;
text-align: center;
line-height: 96rpx;
text-align: center;
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
}
\ No newline at end of file
pages/createOrEditSchedule/createOrEditSchedule.axml
View file @
ebf9e6f8
...
...
@@ -221,4 +221,22 @@
</view>
<mw-modal isShowModal="{{isShowModal}}" time="{{propsTime}}" onChange="changeSelectTime">
</mw-modal>
<view class="popupWindow">
<view class="popupWindowCenter">
<view class="list">
向参会人发送通知?
</view>
<view class="list">
发送
</view>
<view class="list">
不发送
</view>
<view class="list">
继续编辑
</view>
</view>
</view>
</block>
\ No newline at end of file
pages/createOrEditSchedule/createOrEditSchedule.js
View file @
ebf9e6f8
...
...
@@ -29,7 +29,8 @@ create.Page({
organizer
:
''
,
isRepeat
:
''
,
permissions
:
''
,
showPage
:
false
showPage
:
false
,
popupWindowList
:
[{
id
:
0
}]
},
onLoad
(
event
)
{
let
index
=
new
Date
().
getDay
()
...
...
pages/scheduleDetail/scheduleDetail.axml
View file @
ebf9e6f8
...
...
@@ -28,7 +28,8 @@
${time2.substring(5, 7)}月${time2.substring(8, 10)}日 ${time2.substring(11, 16)}
`}}
<view class="repeatTip" a:if="{{!!isRepeatable}}">
每周三重复,截止到2020年3月29
{{recModel.model=='day_in_week'?(recModel.weekDayList.length==5?'每周的工作日重复':'每'+week+'重复'):'每天重复'}},
{{recModel.forever=='1'? '永不截止':'截止到'+recModel.terminateTime}}
</view>
</view>
</view>
...
...
@@ -104,7 +105,7 @@
{{item2.fileName}}
</view>
</view>
<view class="modFile" a:if="{{organizer == pemissions?(item.meetingLogId == meetingLogId):(item.meetingLogId == meetingLogId&&item.scheduleAccessory.uploaderInfo.userId==pemissions)}}"
>
<view class="modFile" a:if="{{organizer == pemissions?(item.meetingLogId == meetingLogId):(item.meetingLogId == meetingLogId&&item.scheduleAccessory.uploaderInfo.userId==pemissions)}}">
<view class="ediFile" data-nextPage="editFile" catchTap="nextPage" data-file="{{item.scheduleAccessory}}">
编辑
</view>
...
...
@@ -140,7 +141,7 @@
</view>
</picker>
<view class="buttonGroup" data-value=0 onTap="confirmAtten" a:if="{{!(organizer == pemissions)&&isRepeatable == 0}}">
<text class="iconbucanjia2 iconfont" a:if="{{currentParStaus == 0}}"
></text>
<text class="iconbucanjia2 iconfont" a:if="{{currentParStaus == 0}}"></text>
<text class="iconbucanjia3 iconfont" a:else></text>
<text class="{{currentParStaus == 0?'red': ''}}">不参加</text>
</view>
...
...
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