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
d264ef4e
Commit
d264ef4e
authored
5 years ago
by
xiexiaoqin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into release/1.0.0
parents
7c396c95
622a90b4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
75 additions
and
4 deletions
+75
-4
meetingDetail.acss
pages/meetingDetail/meetingDetail.acss
+29
-3
meetingDetail.axml
pages/meetingDetail/meetingDetail.axml
+19
-0
meetingDetail.js
pages/meetingDetail/meetingDetail.js
+27
-1
No files found.
pages/meetingDetail/meetingDetail.acss
View file @
d264ef4e
...
@@ -206,7 +206,7 @@ input {
...
@@ -206,7 +206,7 @@ input {
position: relative;
position: relative;
}
}
.place, .time, .participator, .meetingWay {
.place, .time, .participator, .meetingWay
, .meetingWayShowTop
{
display: flex;
display: flex;
padding: 0 32rpx;
padding: 0 32rpx;
font-family: PingFangSC-Regular;
font-family: PingFangSC-Regular;
...
@@ -215,11 +215,11 @@ input {
...
@@ -215,11 +215,11 @@ input {
margin-top: 48rpx;
margin-top: 48rpx;
}
}
.place>.icon, .time>.icon, .participator>.icon, .meetingWay>.icon {
.place>.icon, .time>.icon, .participator>.icon, .meetingWay>.icon
, .meetingWayShowTop>.icon
{
margin-right: 24rpx;
margin-right: 24rpx;
}
}
.noPlace, .hasplace, .timeText, .participatorText, .noWay, .hasWay {
.noPlace, .hasplace, .timeText, .participatorText, .noWay, .hasWay
, .meetingWayText
{
font-size: 34rpx;
font-size: 34rpx;
width: 100%;
width: 100%;
line-height: 1.5;
line-height: 1.5;
...
@@ -625,4 +625,29 @@ input {
...
@@ -625,4 +625,29 @@ input {
border-top: 1px solid rgba(239, 242, 245, 1);
border-top: 1px solid rgba(239, 242, 245, 1);
padding-top: 32rpx;
padding-top: 32rpx;
margin: 0 auto 50rpx;
margin: 0 auto 50rpx;
}
.meetingWayText {
color: rgba(48, 112, 242, 1);
}
.mettingWayText {
margin-top: 22rpx;
font-size: 28rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(25, 31, 37, 0.55);
}
.mettingWayText .icon {
color: rgba(10, 10, 10, 0.14);
margin-left: 26rpx;
}
.passWord {
margin-top: 0rpx;
}
.meetingWayShowTop>.icon {
color: rgb(216, 216, 216) !important
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
pages/meetingDetail/meetingDetail.axml
View file @
d264ef4e
...
@@ -139,6 +139,25 @@
...
@@ -139,6 +139,25 @@
<view class="permission" a:if="{{currentPeople != organizer}}">
<view class="permission" a:if="{{currentPeople != organizer}}">
</view>
</view>
</view>
</view>
<view class="meetingWayShow" a:if="{{comListData.meetingWayModelId == 0}}">
<view class="meetingWayShowTop">
<view class=" icon iconfont iconicon_camera1">
</view>
<view class="meetingWayText">
<view onTap="setCopy" data-item="https://zoom.com.cn/j/93255954558?pwd=YmNZQkY1SGxtUFNPYjZlcUpJT0xtQT09" data-type="url">
Zoom
</view>
<view class="mettingWayText" onTap="setCopy" data-item="513410069">
<text>ID:513410069</text>
<text class="icon iconfont iconicon_task1"></text>
</view>
<view class="mettingWayText passWord" onTap="setCopy" data-item="4ez3am">
<text >密码:4ez3am</text>
<text class="icon iconfont iconicon_task1"></text>
</view>
</view>
</view>
</view>
<!-- 删除该会议 -->
<!-- 删除该会议 -->
<template is="deleteBtn" onhandleDelete="" data="{{title: '删除该会议' }}"/>
<template is="deleteBtn" onhandleDelete="" data="{{title: '删除该会议' }}"/>
</view>
</view>
...
...
This diff is collapsed.
Click to expand it.
pages/meetingDetail/meetingDetail.js
View file @
d264ef4e
...
@@ -1384,7 +1384,9 @@ create.Page({
...
@@ -1384,7 +1384,9 @@ create.Page({
if
(
itemData
.
fileInfos
)
{
if
(
itemData
.
fileInfos
)
{
item
.
fileView
=
{
item
.
fileView
=
{
fileInfos
:
JSON
.
parse
(
itemData
.
fileInfos
),
fileInfos
:
JSON
.
parse
(
itemData
.
fileInfos
),
creatorInfo
:
itemData
.
creatorInfo
creatorInfo
:
itemData
.
creatorInfo
,
id
:
itemData
.
id
,
description
:
itemData
.
description
};
};
}
}
if
(
itemData
.
taskInfos
)
{
if
(
itemData
.
taskInfos
)
{
...
@@ -1717,5 +1719,29 @@ create.Page({
...
@@ -1717,5 +1719,29 @@ create.Page({
path
:
'pages/index/index'
path
:
'pages/index/index'
};
};
},
},
setCopy
(
event
)
{
if
(
event
.
currentTarget
.
dataset
.
type
)
{
dd
.
setClipboard
({
text
:
event
.
currentTarget
.
dataset
.
item
,
success
:
res
=>
{
dd
.
alert
({
buttonText
:
'确定'
,
content
:
'复制成功,请在外部浏览器打开'
})
}
})
}
else
{
dd
.
setClipboard
({
text
:
event
.
currentTarget
.
dataset
.
item
,
success
:
res
=>
{
this
.
setData
({
'conToastData.showToast'
:
true
,
'conToastData.title'
:
'复制成功'
,
});
}
})
}
}
});
});
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