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
5847d9c8
Commit
5847d9c8
authored
5 years ago
by
liang ce
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
接入zoom,取消绑定二次确认
parent
20827664
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
24 additions
and
139 deletions
+24
-139
request.js
api/request.js
+17
-0
app.json
app.json
+2
-2
relatedApp.axml
components/relatedApp/relatedApp.axml
+2
-2
relatedApp.js
components/relatedApp/relatedApp.js
+3
-3
bindingOutlook.acss
pages/bindingOutlook/bindingOutlook.acss
+0
-0
bindingOutlook.axml
pages/bindingOutlook/bindingOutlook.axml
+0
-3
bindingOutlook.js
pages/bindingOutlook/bindingOutlook.js
+0
-44
bindingOutlook.json
pages/bindingOutlook/bindingOutlook.json
+0
-2
outlookDetails.acss
pages/outlookDetails/outlookDetails.acss
+0
-37
outlookDetails.axml
pages/outlookDetails/outlookDetails.axml
+0
-20
outlookDetails.js
pages/outlookDetails/outlookDetails.js
+0
-24
outlookDetails.json
pages/outlookDetails/outlookDetails.json
+0
-2
No files found.
api/request.js
View file @
5847d9c8
...
...
@@ -223,3 +223,20 @@ export function unbindingApp(data) {
url
:
`/admin/third/user/remove/
${
data
}
`
});
}
// 获取zoom授权页面
export
function
getZoomUrl
(
data
)
{
return
$binding
({
method
:
"get"
,
data
:
""
,
url
:
"https://third-authentication-beta.mingwork.com/zoom/auth"
});
}
//
export
function
sendZoomCode
(
data
)
{
return
$binding
({
method
:
"get"
,
data
:
data
,
url
:
"https://third-authentication-beta.mingwork.com/zoom/notice"
});
}
This diff is collapsed.
Click to expand it.
app.json
View file @
5847d9c8
...
...
@@ -2,7 +2,7 @@
"pages"
:
[
"pages/scheduleList/scheduleList"
,
"pages/meetingRoomList/meetingRoomList"
,
"pages/binding
Outlook/bindingOutlook
"
,
"pages/binding
App/bindingApp
"
,
"pages/meetingDetail/meetingDetail"
,
"pages/excutorList/excutorList"
,
"pages/createMeeting/createMeeting"
,
...
...
@@ -12,7 +12,7 @@
"pages/participantsDetail/participantsDetail"
,
"pages/applicationDetails/applicationDetails"
,
"pages/attendeeList/attendeeList"
,
"pages/
outlookDetails/outlookDetails
"
"pages/
unbindApp/unbindApp
"
],
"window"
:
{
"allowsBounceVertical"
:
"YES"
...
...
This diff is collapsed.
Click to expand it.
components/relatedApp/relatedApp.axml
View file @
5847d9c8
...
...
@@ -33,7 +33,7 @@
<view class="applicationList" a:if="{{relatedAppPlatformList.indexOf('outlook') === -1}}">
<view class="applicationLogo outlook">
</view>
<view class="applicationMsg" data-platform="outlook" catchTap="binding
Outlook
">
<view class="applicationMsg" data-platform="outlook" catchTap="binding
App
">
<view>
<view>
Outlook日历
...
...
@@ -50,7 +50,7 @@
<view class="applicationList" a:if="{{relatedAppPlatformList.indexOf('zoom') === -1}}">
<view class="applicationLogo zoom">
</view>
<view class="applicationMsg">
<view class="applicationMsg"
data-platform="zoom" catchTap="bindingApp"
>
<view>
<view>
Zoom
...
...
This diff is collapsed.
Click to expand it.
components/relatedApp/relatedApp.js
View file @
5847d9c8
...
...
@@ -56,14 +56,14 @@ create.Component({
preventSort
()
{
return
false
;
},
binding
Outlook
(
e
)
{
binding
App
(
e
)
{
dd
.
navigateTo
({
url
:
`./../binding
Outlook/bindingOutlook
?platform=
${
e
.
target
.
dataset
.
platform
}
`
url
:
`./../binding
App/bindingApp
?platform=
${
e
.
target
.
dataset
.
platform
}
`
});
},
toAppDetails
(
e
)
{
dd
.
navigateTo
({
url
:
`./../
outlookDetails/outlookDetails
?item=
${
JSON
.
stringify
(
url
:
`./../
unbindApp/unbindApp
?item=
${
JSON
.
stringify
(
e
.
target
.
dataset
.
item
)}
`
});
...
...
This diff is collapsed.
Click to expand it.
pages/bindingOutlook/bindingOutlook.acss
deleted
100644 → 0
View file @
20827664
This diff is collapsed.
Click to expand it.
pages/bindingOutlook/bindingOutlook.axml
deleted
100644 → 0
View file @
20827664
<web-view id="web-view-1" src="{{url}}" onMessage="test">
</web-view>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
pages/bindingOutlook/bindingOutlook.js
deleted
100644 → 0
View file @
20827664
import
{
getOutlookUrl
,
authorizationCodeReplacementToken
}
from
"../../api/request"
;
import
create
from
"dd-store"
;
create
.
Page
({
data
:
{
$data
:
null
,
url
:
""
,
platform
:
''
},
onLoad
(
e
)
{
this
.
setData
({
platform
:
e
.
platform
})
this
.
webViewContext
=
dd
.
createWebViewContext
(
"web-view-1"
);
let
data
=
`
${
getApp
().
globalData
.
userid
}
,
${
dd
.
corpId
}
`
;
getOutlookUrl
(
data
).
then
(
res
=>
{
this
.
setData
({
url
:
res
.
data
.
data
});
});
},
test
(
e
)
{
const
code
=
e
.
detail
.
code
;
console
.
log
(
code
);
const
data
=
{
code
:
code
,
state
:
`
${
getApp
().
globalData
.
userid
}
,
${
dd
.
corpId
}
`
};
authorizationCodeReplacementToken
(
data
).
then
(
res
=>
{
if
(
res
.
data
.
data
)
{
this
.
$store
.
data
.
relatedAppNeedUpdate
=
{
name
:
res
.
data
.
data
,
platform
:
this
.
data
.
platform
}
this
.
update
();
dd
.
navigateBack
({
delta
:
1
});
}
});
}
});
This diff is collapsed.
Click to expand it.
pages/bindingOutlook/bindingOutlook.json
deleted
100644 → 0
View file @
20827664
{}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
pages/outlookDetails/outlookDetails.acss
deleted
100644 → 0
View file @
20827664
.relatedAppPage {
height: 100vh;
background: #FFFFFF;
}
.platformMsg {
display: flex;
padding: 34rpx 32rpx;
align-items: center;
}
.platformImg {
width: 60rpx;
height: 60rpx;
margin-right: 24rpx;
}
.outlook {
background: url(../../assests/outlookLogo.png) center /100% 100%;
}
.zoom {
background: url(../../assests/zoomLogo.png) center /100% 100%;
}
.unBinding {
width: 686rpx;
height: 96rpx;
margin: 22rpx auto;
border-radius: 48rpx;
border: 2rpx solid rgba(222, 222, 222, 1);
text-align: center;
line-height: 0.96rem;
font-size: 34rpx;
color: rgba(242, 86, 67, 1);
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
pages/outlookDetails/outlookDetails.axml
deleted
100644 → 0
View file @
20827664
<view class="relatedAppPage">
<view class="platformMsg" a:if="{{item.platform === 'outlook'}}">
<view class="platformImg {{item.platform}}">
</view>
<view class="platformName">
{{item.thirdUserIdentify}}
</view>
</view>
<view class="platformMsg" a:if="{{item.platform === 'zoom'}}">
<view class="platformImg {{item.platform}}">
</view>
<view class="platformName">
{{item.thirdUserIdentify}}
</view>
</view>
<view class="unBinding" onTap="unbind">
取消关联
</view>
</view>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
pages/outlookDetails/outlookDetails.js
deleted
100644 → 0
View file @
20827664
import
{
unbindingApp
}
from
"../../api/request"
;
import
create
from
"dd-store"
;
create
.
Page
({
data
:
{
$data
:
null
,
item
:
""
},
onLoad
(
e
)
{
this
.
setData
({
item
:
JSON
.
parse
(
e
.
item
)
});
},
unbind
()
{
unbindingApp
(
this
.
data
.
item
.
platform
).
then
(
res
=>
{
if
(
res
.
data
.
data
)
{
this
.
$store
.
data
.
relatedAppNeedUpdate
=
"1"
;
this
.
update
();
dd
.
navigateBack
({
delta
:
1
});
}
});
}
});
This diff is collapsed.
Click to expand it.
pages/outlookDetails/outlookDetails.json
deleted
100644 → 0
View file @
20827664
{}
\ No newline at end of file
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