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
89947c92
Commit
89947c92
authored
Apr 28, 2020
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' into release_beta/1.0.0
parents
82a64cfd
abbf15c6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
10 deletions
+14
-10
appDetails.js
pages/appDetails/appDetails.js
+1
-3
meetingDetail.js
pages/meetingDetail/meetingDetail.js
+12
-4
participantsDetail.js
pages/participantsDetail/participantsDetail.js
+1
-1
flatTree.js
utils/flatTree.js
+0
-2
No files found.
pages/appDetails/appDetails.js
View file @
89947c92
...
...
@@ -29,7 +29,7 @@ create.Page({
isBind
:
e
.
userName
?
true
:
false
});
},
onShow
()
{},
onShow
()
{
},
sendRequest
()
{
let
that
=
this
;
interval
=
setInterval
(()
=>
{
...
...
@@ -52,8 +52,6 @@ create.Page({
ddUserId
:
getApp
().
globalData
.
userid
};
getThirdUserPlatForm
(
data
).
then
(
res
=>
{
console
.
log
(
JSON
.
stringify
(
res
));
console
.
log
(
res
.
data
.
msg
===
"当前账号已被其他账号绑定!"
);
if
(
res
.
data
.
msg
===
"当前账号已被其他账号绑定!"
)
{
this
.
setData
({
isBind
:
false
,
...
...
pages/meetingDetail/meetingDetail.js
View file @
89947c92
...
...
@@ -129,7 +129,7 @@ create.Page({
if
(
this
.
$store
.
data
.
updateInfo
.
isUpate
)
{
switch
(
this
.
$store
.
data
.
updateInfo
.
updateType
)
{
case
'operate_user'
:
if
(
this
.
$store
.
data
.
participatorList
!==
this
.
$store
.
data
.
originUsers
)
{
if
(
JSON
.
stringify
(
this
.
$store
.
data
.
participatorList
)
!==
JSON
.
stringify
(
this
.
$store
.
data
.
originUsers
)
)
{
if
(
this
.
data
.
repeatable
===
1
)
{
this
.
setData
({
'conSelectPopupData.selectType'
:
'common'
,
...
...
@@ -216,10 +216,10 @@ create.Page({
let
repeatListMap
=
new
Map
()
for
(
let
value
of
res
.
data
.
data
.
userList
)
{
if
(
value
.
participator
)
{
participatorList
.
push
(
value
.
participator
)
participatorList
.
push
(
{
userId
:
value
.
participator
.
userId
,
username
:
value
.
participator
.
username
,
headUrl
:
value
.
participator
.
headUrl
,
platform
:
value
.
participator
.
platform
}
)
participatorUserId
.
push
(
value
.
participator
.
userId
)
originUsersId
.
push
(
value
.
participator
.
userId
)
originUsers
.
push
(
value
.
participator
)
originUsers
.
push
(
{
userId
:
value
.
participator
.
userId
,
username
:
value
.
participator
.
username
,
headUrl
:
value
.
participator
.
headUrl
,
platform
:
value
.
participator
.
platform
}
)
}
}
for
(
let
item
of
this
.
data
.
comListData
.
repeatList
)
{
...
...
@@ -871,9 +871,17 @@ create.Page({
break
case
'modify_location'
:
this
.
reSetLocation
()
this
.
$store
.
data
.
updateInfo
=
{
isUpate
:
false
,
updateType
:
''
}
break
case
'operate_user'
:
this
.
reSetUsers
()
this
.
$store
.
data
.
updateInfo
=
{
isUpate
:
false
,
updateType
:
''
}
break
case
'repeat'
:
this
.
reSetRepeat
()
...
...
@@ -984,7 +992,7 @@ create.Page({
})
break
case
'operate_user'
:
if
(
this
.
$store
.
data
.
originUsers
!=
this
.
$store
.
data
.
participatorList
)
{
if
(
JSON
.
stringify
(
this
.
$store
.
data
.
originUsers
)
!=
JSON
.
stringify
(
this
.
$store
.
data
.
participatorList
)
)
{
let
addUserList
=
this
.
arrayPoor
(
this
.
$store
.
data
.
originUsers
,
this
.
$store
.
data
.
participatorList
).
addUserList
let
deleteUserList
=
this
.
arrayPoor
(
this
.
$store
.
data
.
originUsers
,
this
.
$store
.
data
.
participatorList
).
deleteUserList
let
dataUser
=
{
...
...
pages/participantsDetail/participantsDetail.js
View file @
89947c92
...
...
@@ -174,7 +174,7 @@ create.Page({
},
// 编辑时候的保存
editSave
()
{
if
(
this
.
$store
.
data
.
originUsers
!=
this
.
store
.
data
.
contactPeople
)
{
if
(
JSON
.
stringify
(
this
.
$store
.
data
.
originUsers
)
!=
JSON
.
stringify
(
this
.
store
.
data
.
contactPeople
)
)
{
this
.
$store
.
data
.
updateInfo
.
isUpate
=
true
this
.
$store
.
data
.
updateInfo
.
updateType
=
'operate_user'
this
.
$store
.
data
.
participatorList
=
this
.
store
.
data
.
contactPeople
...
...
utils/flatTree.js
View file @
89947c92
...
...
@@ -8,6 +8,5 @@ export function getFlatTree(treeData) {
flatTreeMap
.
set
(
value
.
id
,
value
)
}
}
console
.
log
(
flatTreeMap
)
return
flatTreeMap
}
\ No newline at end of file
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