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
1cd5d268
Commit
1cd5d268
authored
Apr 19, 2020
by
liang ce
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交会议室模块修改
parent
164c7af5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
21 deletions
+18
-21
binding.js
api/binding.js
+2
-2
request.js
api/request.js
+4
-4
app.js
app.js
+12
-15
meetingRoomList.js
pages/meetingRoomList/meetingRoomList.js
+0
-0
No files found.
api/binding.js
View file @
1cd5d268
...
@@ -7,7 +7,7 @@ export default function http(data) {
...
@@ -7,7 +7,7 @@ export default function http(data) {
"Content-Type"
:
"application/json;charset=UTF-8"
,
"Content-Type"
:
"application/json;charset=UTF-8"
,
Authorization
:
`Bearer
${
getApp
().
globalData
.
token
}
`
Authorization
:
`Bearer
${
getApp
().
globalData
.
token
}
`
},
},
url
:
`
${
data
.
url
}
`
,
url
:
`
${
getApp
().
globalData
.
globalUrl2
}${
data
.
url
}
`
,
method
:
data
.
method
,
method
:
data
.
method
,
dataType
:
"json"
,
dataType
:
"json"
,
data
:
data
.
data
,
data
:
data
.
data
,
...
@@ -49,7 +49,7 @@ export default function http(data) {
...
@@ -49,7 +49,7 @@ export default function http(data) {
"Content-Type"
:
"application/json"
,
"Content-Type"
:
"application/json"
,
Authorization
:
`Bearer
${
getApp
().
globalData
.
token
}
`
Authorization
:
`Bearer
${
getApp
().
globalData
.
token
}
`
},
},
url
:
`
${
data
.
url
}
`
,
url
:
`
${
getApp
().
globalData
.
globalUrl
}${
data
.
url
}
`
,
method
:
data
.
method
,
method
:
data
.
method
,
data
:
data
.
data
,
data
:
data
.
data
,
dataType
:
"json"
,
dataType
:
"json"
,
...
...
api/request.js
View file @
1cd5d268
...
@@ -202,7 +202,7 @@ export function getOutlookUrl(data) {
...
@@ -202,7 +202,7 @@ export function getOutlookUrl(data) {
return
$binding
({
return
$binding
({
method
:
"POST"
,
method
:
"POST"
,
data
:
""
,
data
:
""
,
url
:
`
https://third-authentication-beta.mingwork.com
/microsoft/getThirdLoginUrl?state=
${
data
}
`
url
:
`/microsoft/getThirdLoginUrl?state=
${
data
}
`
});
});
}
}
// 发送给后端outlook code
// 发送给后端outlook code
...
@@ -210,7 +210,7 @@ export function authorizationCodeReplacementToken(data) {
...
@@ -210,7 +210,7 @@ export function authorizationCodeReplacementToken(data) {
return
$binding
({
return
$binding
({
method
:
"get"
,
method
:
"get"
,
data
:
data
,
data
:
data
,
url
:
`
https://third-authentication-beta.mingwork.com
/microsoft/authorizationCodeReplacementToken`
url
:
`/microsoft/authorizationCodeReplacementToken`
});
});
}
}
// 发送给后端outlook code
// 发送给后端outlook code
...
@@ -235,7 +235,7 @@ export function getZoomUrl(data) {
...
@@ -235,7 +235,7 @@ export function getZoomUrl(data) {
return
$binding
({
return
$binding
({
method
:
"get"
,
method
:
"get"
,
data
:
""
,
data
:
""
,
url
:
"
https://third-authentication-beta.mingwork.com
/zoom/auth"
url
:
"/zoom/auth"
});
});
}
}
...
@@ -244,6 +244,6 @@ export function sendZoomCode(data) {
...
@@ -244,6 +244,6 @@ export function sendZoomCode(data) {
return
$binding
({
return
$binding
({
method
:
"get"
,
method
:
"get"
,
data
:
data
,
data
:
data
,
url
:
"
https://third-authentication-beta.mingwork.com
/zoom/notice"
url
:
"/zoom/notice"
});
});
}
}
app.js
View file @
1cd5d268
import
{
setGlobalStore
}
from
'dd-store'
;
import
{
setGlobalStore
}
from
"dd-store"
;
import
exampleStore
from
'./stores/exampleStore'
import
exampleStore
from
"./stores/exampleStore"
;
import
{
checkFullScren
}
from
"./utils/checkFullScren"
;
import
{
checkFullScren
}
from
"./utils/checkFullScren"
;
setGlobalStore
(
exampleStore
);
setGlobalStore
(
exampleStore
);
...
@@ -8,7 +8,7 @@ App({
...
@@ -8,7 +8,7 @@ App({
// 第一次打开
// 第一次打开
// options.query == {number:1}
// options.query == {number:1}
// console.info('App onLaunch');
// console.info('App onLaunch');
this
.
globalData
.
isFullScren
=
checkFullScren
this
.
globalData
.
isFullScren
=
checkFullScren
;
},
},
onShow
(
options
)
{
onShow
(
options
)
{
// 从后台被 scheme 重新打开
// 从后台被 scheme 重新打开
...
@@ -18,17 +18,14 @@ App({
...
@@ -18,17 +18,14 @@ App({
globalData
:
{
globalData
:
{
isFullScren
:
false
,
isFullScren
:
false
,
loading
:
false
,
loading
:
false
,
token
:
''
,
token
:
""
,
avatar
:
''
,
avatar
:
""
,
userid
:
''
,
userid
:
""
,
name
:
''
,
name
:
""
,
userInfo
:
''
,
userInfo
:
""
,
// globalUrl: 'https://gateway2.mingwork.com', // 线上地址
globalUrl
:
"https://gateway-beta.mingwork.com"
,
//beta地址
globalUrl
:
'https://gateway-beta.mingwork.com'
//beta地址
globalUrl2
:
"https://third-authentication-beta.mingwork.com"
// globalUrl: 'http://192.168.1.111' //beta地址
// globalUrl: "https://gateway2.mingwork.com", // 线上地址
// globalUrl:'http://139.196.213.18:9999' //beta地址
// globalUrl2: "https://third-authentication.mingwork.com" //beta地址
// globalUrl: 'http://192.168.1.101:9999', //beta地址
// globalUrl:'http://192.168.1.102:9999' //beta地址
// 106,112,102
}
}
});
});
pages/meetingRoomList/meetingRoomList.js
View file @
1cd5d268
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