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
b0648ce8
Commit
b0648ce8
authored
5 years ago
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into release_beta/1.0.0
parents
e8e05b21
516244e4
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
3 deletions
+14
-3
relatedApp.acss
components/relatedApp/relatedApp.acss
+5
-0
createMeeting.js
pages/createMeeting/createMeeting.js
+9
-3
No files found.
components/relatedApp/relatedApp.acss
View file @
b0648ce8
...
@@ -46,6 +46,7 @@
...
@@ -46,6 +46,7 @@
}
}
.applicationLogo {
.applicationLogo {
flex: 0 0 72rpx;
width: 72rpx;
width: 72rpx;
height: 72rpx;
height: 72rpx;
margin-right: 24rpx;
margin-right: 24rpx;
...
@@ -65,6 +66,10 @@
...
@@ -65,6 +66,10 @@
}
}
.applicationMsg>view:nth-of-type(1)>view:nth-of-type(1) {
.applicationMsg>view:nth-of-type(1)>view:nth-of-type(1) {
max-width: 448rpx;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
font-size: 28rpx;
font-size: 28rpx;
color: #191F25;
color: #191F25;
margin-bottom: 8rpx;
margin-bottom: 8rpx;
...
...
This diff is collapsed.
Click to expand it.
pages/createMeeting/createMeeting.js
View file @
b0648ce8
...
@@ -48,7 +48,7 @@ create.Page({
...
@@ -48,7 +48,7 @@ create.Page({
placeholder
:
''
,
placeholder
:
''
,
isIPX
:
false
isIPX
:
false
},
},
limitClick
:
false
,
showPop
(
event
)
{
showPop
(
event
)
{
this
.
setData
({
this
.
setData
({
show
:
true
show
:
true
...
@@ -337,6 +337,10 @@ create.Page({
...
@@ -337,6 +337,10 @@ create.Page({
},
},
addSchedule
:
throttle
(
async
function
()
{
addSchedule
:
throttle
(
async
function
()
{
if
(
this
.
limitClick
)
{
return
false
}
this
.
limitClick
=
true
let
data
=
{
let
data
=
{
title
:
this
.
data
.
title
||
`
${
getApp
().
globalData
.
name
}
创建的会议`
,
title
:
this
.
data
.
title
||
`
${
getApp
().
globalData
.
name
}
创建的会议`
,
location
:
{
location
:
{
...
@@ -355,8 +359,11 @@ create.Page({
...
@@ -355,8 +359,11 @@ create.Page({
meetingRoomId
:
this
.
$store
.
data
.
roomId
,
meetingRoomId
:
this
.
$store
.
data
.
roomId
,
meetingWayModel
:
this
.
data
.
meetingWayModel
meetingWayModel
:
this
.
data
.
meetingWayModel
}
}
const
res
=
await
addSchedule
(
data
);
const
res
=
await
addSchedule
(
data
).
catch
(
err
=>
{
this
.
limitClick
=
false
});
if
(
res
.
data
.
code
===
0
)
{
if
(
res
.
data
.
code
===
0
)
{
this
.
limitClick
=
false
this
.
$store
.
data
.
tabBarIndex
=
'1'
this
.
$store
.
data
.
tabBarIndex
=
'1'
if
(
this
.
data
.
repeatable
===
0
)
{
if
(
this
.
data
.
repeatable
===
0
)
{
if
(
this
.
$store
.
addOnceMeeting
)
{
if
(
this
.
$store
.
addOnceMeeting
)
{
...
@@ -368,7 +375,6 @@ create.Page({
...
@@ -368,7 +375,6 @@ create.Page({
id
:
res
.
data
.
data
.
id
id
:
res
.
data
.
data
.
id
})
})
}
}
}
else
{
}
else
{
if
(
this
.
$store
.
modifyErpeatMeeting
)
{
if
(
this
.
$store
.
modifyErpeatMeeting
)
{
await
this
.
$store
.
modifyErpeatMeeting
()
await
this
.
$store
.
modifyErpeatMeeting
()
...
...
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