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
10dee20f
Commit
10dee20f
authored
Feb 27, 2020
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
隐藏编辑删除
parent
c0b0cdab
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
20 additions
and
15 deletions
+20
-15
app.json
app.json
+1
-1
index.axml
pages/index/index.axml
+1
-1
participantsDetail.axml
pages/participantsDetail/participantsDetail.axml
+1
-1
scheduleDetail.acss
pages/scheduleDetail/scheduleDetail.acss
+4
-1
scheduleDetail.axml
pages/scheduleDetail/scheduleDetail.axml
+3
-3
scheduleDetail.js
pages/scheduleDetail/scheduleDetail.js
+0
-4
uploadFile.acss
pages/uploadFile/uploadFile.acss
+8
-2
uploadFile.axml
pages/uploadFile/uploadFile.axml
+2
-2
No files found.
app.json
View file @
10dee20f
{
"pages"
:
[
"pages/index/index"
,
"pages/meetingRoomList/meetingRoomList"
,
"pages/uploadFile/uploadFile"
,
"pages/meetingRoomList/meetingRoomList"
,
"pages/repetitionTime/repetitionTime"
,
"pages/createOrEditSchedule/createOrEditSchedule"
,
"pages/repeatMechanism/repeatMechanism"
,
...
...
pages/index/index.axml
View file @
10dee20f
<!-- <mw-select></mw-select> -->
版本号:11
2
版
版本号:11
5
版
<scroll-view a:if="{{todayStr !== ''}}" scroll-y="{{true}}" upper-threshold="50" lower-threshold="50" onScrollToLower="lower" onScroll="onScroll" style="height: 100vh;" scroll-into-view="{{todayStr}}">
<block a:for="{{scheduleList}}" a:for-item="scheduleYearList">
<block a:for="{{scheduleYearList}}">
...
...
pages/participantsDetail/participantsDetail.axml
View file @
10dee20f
...
...
@@ -7,7 +7,7 @@
</view>
<view class="info">
<text class="name">{{item.username}}</text>
<text class="close iconshanchu iconfont" a:if="{{!!scheduleItem?(organizer == permissions?(permissions!=item.userId):(permissions!=item.userId&&!requireUsers.includes(item.userId))):(permissions!=item.userId)}}" data-userId="{{item.userId}}" onTap="delParticipants"></text>
<text class="close iconshanchu
-1
iconfont" a:if="{{!!scheduleItem?(organizer == permissions?(permissions!=item.userId):(permissions!=item.userId&&!requireUsers.includes(item.userId))):(permissions!=item.userId)}}" data-userId="{{item.userId}}" onTap="delParticipants"></text>
</view>
</view>
<view class="button">
...
...
pages/scheduleDetail/scheduleDetail.acss
View file @
10dee20f
...
...
@@ -8,6 +8,7 @@ page {
}
.iconfont {
font-size: 32rpx;
vertical-align: top;
}
::-webkit-scrollbar {
display: none
...
...
@@ -34,6 +35,7 @@ page {
}
.title .text, .place .text, .time .text, .remind .text {
vertical-align: top;
line-height: 112rpx;
width: 100%;
border-bottom: 1rpx solid rgba(25, 31, 37, 0.12);
...
...
@@ -261,7 +263,8 @@ page {
.describe .text {
padding: 27rpx 0;
line-height: 44rpx;
margin-top: 10rpx;
}
.modFile {
...
...
pages/scheduleDetail/scheduleDetail.axml
View file @
10dee20f
...
...
@@ -11,7 +11,7 @@
</view>
<!-- 地址 -->
<view class="place" a:if="{{!!location.locationName}}">
<view class="icon icon
dingwei
iconfont">
<view class="icon icon
huiyishi2
iconfont">
</view>
<view class="text">
{{location.locationName}}
...
...
@@ -71,7 +71,7 @@
</view></view>
<!-- 会议描述 -->
<view class="describe" a:if="{{!!remark}}">
<view class="icon icon
huiyi
miaoshu iconfont"></view>
<view class="icon iconmiaoshu iconfont"></view>
<view class="text">
{{remark}}
</view></view>
...
...
@@ -104,7 +104,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>
...
...
pages/scheduleDetail/scheduleDetail.js
View file @
10dee20f
...
...
@@ -153,9 +153,6 @@ create.Page({
meetingLogId
:
''
})
let
data
=
event
.
target
.
dataset
.
file
.
id
console
.
log
(
111111
)
console
.
log
(
event
.
target
.
dataset
.
file
.
id
)
console
.
log
(
22222222
)
dd
.
confirm
({
title
:
'温馨提示'
,
content
:
'确认删除本次上传文件吗'
,
...
...
@@ -165,7 +162,6 @@ create.Page({
if
(
!!
success
.
confirm
)
{
if
(
!!
this
.
data
.
scheduleItem
.
id
)
{
delFile
(
data
).
then
(
res
=>
{
console
.
log
(
JSON
.
stringify
(
res
))
_that
.
showFile
(
this
.
data
.
scheduleItem
.
id
)
})
}
else
{
...
...
pages/uploadFile/uploadFile.acss
View file @
10dee20f
...
...
@@ -51,15 +51,18 @@ page {
margin-top: 40rpx;
}
.icontianjia {
.icontianjia1 {
vertical-align: top;
line-height: 33rpx;
color: #3296fa;
margin-right: 16rpx;
}
.addText {
margin-top: 10rpx;
line-height: 33rpx;
vertical-align: top;
font-size: 2
4
rpx;
font-size: 2
8
rpx;
color: #3296FA;
}
...
...
@@ -83,6 +86,7 @@ page {
.pdf {
background: url(../../assests/pdf.png) center /100% 100%;
}
.image {
background: url(../../assests/image.png) center /100% 100%;
}
...
...
@@ -94,6 +98,7 @@ page {
.mov {
background: url(../../assests/mp4.png) center /100% 100%;
}
.mp4 {
background: url(../../assests/mp4.png) center /100% 100%;
}
...
...
@@ -101,6 +106,7 @@ page {
.ppt {
background: url(../../assests/ppt.png) center /100% 100%;
}
.pptx {
background: url(../../assests/ppt.png) center /100% 100%;
}
...
...
pages/uploadFile/uploadFile.axml
View file @
10dee20f
...
...
@@ -10,11 +10,11 @@
{{item.fileName}}
</view>
</view>
<view class="close iconshanchu iconfont" data-item="{{item}}" onTap="close">
<view class="close iconshanchu
2
iconfont" data-item="{{item}}" onTap="close">
</view>
</view>
<view class="add" onTap="add">
<text class="icontianjia iconfont"></text>
<text class="icontianjia
1
iconfont"></text>
<text class="addText">继续添加</text>
</view>
<view class="save">
...
...
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