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
b728ebbe
Commit
b728ebbe
authored
5 years ago
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into release_beta/1.0.0
parents
5fae4889
a87368f5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletions
+6
-1
app.json
app.json
+2
-1
meetingDetail.js
pages/meetingDetail/meetingDetail.js
+4
-0
No files found.
app.json
View file @
b728ebbe
...
@@ -17,4 +17,4 @@
...
@@ -17,4 +17,4 @@
"allowsBounceVertical"
:
"YES"
"allowsBounceVertical"
:
"YES"
},
},
"pullRefresh"
:
false
"pullRefresh"
:
false
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
pages/meetingDetail/meetingDetail.js
View file @
b728ebbe
...
@@ -767,6 +767,8 @@ create.Page({
...
@@ -767,6 +767,8 @@ create.Page({
this
.
$store
.
data
.
indexNeedUpdate
=
true
this
.
$store
.
data
.
indexNeedUpdate
=
true
this
.
update
()
this
.
update
()
this
.
setData
({
this
.
setData
({
aheadTimes
:
[
15
],
'comListData.aheadTimesListId'
:
[
15
],
confirmAttendance
:
1
confirmAttendance
:
1
})
})
this
.
conflictPeople
()
this
.
conflictPeople
()
...
@@ -1239,6 +1241,8 @@ create.Page({
...
@@ -1239,6 +1241,8 @@ create.Page({
this
.
$store
.
data
.
indexNeedUpdate
=
true
this
.
$store
.
data
.
indexNeedUpdate
=
true
this
.
update
()
this
.
update
()
this
.
setData
({
this
.
setData
({
aheadTimes
:
[
15
],
'comListData.aheadTimesListId'
:
[
15
],
confirmAttendance
:
1
confirmAttendance
:
1
})
})
this
.
conflictPeople
()
this
.
conflictPeople
()
...
...
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