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
cc5b26c7
Commit
cc5b26c7
authored
5 years ago
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
钉盘
parent
98c23655
master
…
dev
release/1.0.0
release/2.0.0
release/2.1.0
release/dev/2.0.0
release/dev/2.1.0
release_beta/1.0.0
No related merge requests found
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
75 additions
and
10 deletions
+75
-10
request.js
api/request.js
+8
-0
app.json
app.json
+1
-1
scheduleDetail.acss
pages/scheduleDetail/scheduleDetail.acss
+11
-0
scheduleDetail.axml
pages/scheduleDetail/scheduleDetail.axml
+19
-5
scheduleDetail.js
pages/scheduleDetail/scheduleDetail.js
+36
-4
No files found.
api/request.js
View file @
cc5b26c7
...
...
@@ -177,4 +177,11 @@ export function getScheduleDetail (data) {
data
:
JSON
.
stringify
(
data
),
url
:
`/meet/schedule/getScheduleDetail`
})
}
// 文件上传
export
function
uploadPermissions
()
{
return
$http
({
method
:
'get'
,
url
:
`/admin/ddOpenApi/getCustomSpaceAndGrantCustomSpace?type=add&ddUserId=
${
getApp
().
globalData
.
userid
}
`
})
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
app.json
View file @
cc5b26c7
{
"pages"
:
[
"pages/index/index"
,
"pages/scheduleDetail/scheduleDetail"
,
"pages/index/index"
,
"pages/attendingSituation/attendingSituation"
,
"pages/createOrEditSchedule/createOrEditSchedule"
,
"pages/place/place"
,
...
...
This diff is collapsed.
Click to expand it.
pages/scheduleDetail/scheduleDetail.acss
View file @
cc5b26c7
...
...
@@ -154,4 +154,14 @@ page {
}
.buttonGroup text {
vertical-align: top;
}
.describe {
padding: 0 32rpx;
display: flex;
background: #fff;
margin-top: 16rpx;
}
.describe .text {
padding: 27rpx 0;
line-height: 44rpx;
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
pages/scheduleDetail/scheduleDetail.axml
View file @
cc5b26c7
<view class="scheduleDetail">
<view class="scheduleInfo">
<!-- 标题 -->
<view class="title">
<view class="icon icondidianmiaoshu iconfont">
</view>
...
...
@@ -7,6 +8,7 @@
{{title}}
</view>
</view>
<!-- 地址 -->
<view class="place" a:if="{{!!location.locationName}}">
<view class="icon icondingwei iconfont">
</view>
...
...
@@ -14,6 +16,7 @@
{{location.locationName}}
</view>
</view>
<!-- 时间 -->
<view class="time">
<view class="icon iconshijian iconfont">
</view>
...
...
@@ -28,10 +31,11 @@
</view>
</view>
</view>
<!-- 参会人 -->
<view class="participants">
<view class="icon iconcanhuiren1 iconfont">
</view>
<view class="scroll">
<view class="scroll"
v-if="{{!!userList.length}}"
>
<text class="imageGroup" a:for="{{userList}}" a:for-item="item">
<text>
<image a:if="{{!!item.participator.headUrl}}" mode="scaleToFill" src="{{item.participator.headUrl}}"/>
...
...
@@ -40,24 +44,34 @@
</text>
</view>
<view class="right">
<text class="number">
3
人参与</text>
<text class="number">
{{userList.length}}
人参与</text>
<text class="iconyoujinru iconfont"></text>
</view>
</view>
<view class="remind">
<!-- 重复 -->
<view class="remind" a:if="{{aheadTimes.length}}">
<view class="icon iconshijian iconfont">
</view>
<view class="text">
提前
15分
钟提醒
提前
<text a:for="{{aheadTimes}}" a:for-item="item">{{item}}分</text>
钟提醒
</view>
</view>
<!-- 会议描述 -->
<view class="describe" a:if="describe">
<view class="icon iconhuiyimiaoshu iconfont">
</view>
<view class="text">
本次会议重要议程是确定交互最终方案。
</view>
</view>
<!-- 会议动态 -->
<view class="dynamic">
<view class="icon iconhuiyimiaoshu iconfont">
</view>
<view class="text">
会议动态
</view>
<view class="upload">
<view class="upload"
onTap="upload"
>
<text>文件上传</text>
<text class="icontianjia iconfont"></text>
</view>
...
...
This diff is collapsed.
Click to expand it.
pages/scheduleDetail/scheduleDetail.js
View file @
cc5b26c7
import
{
getScheduleDetail
}
from
'../../api/request.js'
import
{
getScheduleDetail
,
uploadPermissions
}
from
'../../api/request.js'
Page
({
data
:
{
title
:
''
,
...
...
@@ -8,7 +8,10 @@ Page({
weeks
:
[
'周一'
,
'周二'
,
'周三'
,
'周四'
,
'周五'
,
'周六'
,
'周日'
],
week
:
''
,
userList
:
[],
isAcrossDay
:
true
aheadTimes
:
[],
isAcrossDay
:
true
,
describe
:
''
,
spaceId
:
''
},
onLoad
()
{
...
...
@@ -25,9 +28,16 @@ Page({
startTime
:
res
.
data
.
data
.
startTime
,
endTime
:
res
.
data
.
data
.
endTime
,
userList
:
res
.
data
.
data
.
userList
,
week
:
this
.
data
.
weeks
[
new
Date
(
res
.
data
.
data
.
startTime
).
getDay
()
-
1
]
aheadTimes
:
res
.
data
.
data
.
aheadTimes
,
describe
:
res
.
data
.
data
.
describe
,
week
:
this
.
data
.
weeks
[
new
Date
(
res
.
data
.
data
.
startTime
).
getDay
()
-
1
]
})
this
.
acrossDay
(
res
.
data
.
data
.
startTime
,
res
.
data
.
data
.
endTime
)
return
uploadPermissions
()
}).
then
(
res
=>
{
this
.
setData
({
spaceId
:
res
.
data
.
data
})
})
},
// 是否跨天
...
...
@@ -46,7 +56,7 @@ Page({
},
// 处理时间
dealTime
(
time
)
{
let
time1
=
time
.
replace
(
/-/g
,
"/"
)
let
time1
=
time
.
replace
(
/-/g
,
"/"
)
let
date
=
new
Date
(
time1
)
let
day
=
date
.
getDate
()
let
year
=
date
.
getFullYear
()
...
...
@@ -56,6 +66,28 @@ Page({
month
:
month
,
day
:
day
}
},
upload
()
{
dd
.
uploadAttachmentToDingTalk
({
image
:
{
multiple
:
true
,
compress
:
false
,
max
:
9
,
spaceId
:
this
.
data
.
spaceId
},
space
:
{
spaceId
:
this
.
data
.
spaceId
,
max
:
9
},
file
:
{
spaceId
:
this
.
data
.
spaceId
,
max
:
1
},
types
:
[
"photo"
,
"camera"
,
"file"
,
"space"
],
//PC端仅支持["photo","file","space"]
success
:
(
res
)
=>
{
console
.
log
(
JSON
.
stringify
(
res
),
1111
)
dd
.
alert
({
content
:
'上传成功'
})
},
fail
:
(
err
)
=>
{
console
.
log
(
JSON
.
stringify
(
err
),
1111
)
dd
.
alert
({
content
:
'上传失败'
})
console
.
log
(
err
)
}
})
}
});
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