Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
7
7-Eleven
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
高淑倩
7-Eleven
Commits
1815875d
Commit
1815875d
authored
Oct 24, 2019
by
高淑倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
登陆
parent
fd1b7614
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
14 deletions
+24
-14
util.js
src/utils/util.js
+2
-1
wxService.js
src/utils/wxService.js
+22
-13
No files found.
src/utils/util.js
View file @
1815875d
...
...
@@ -292,7 +292,8 @@ function getUserInfoByBtn(userInfo) {
mask
:
true
})
const
currentEnv
=
wx
.
getStorageSync
(
'_qyWeChat'
)
let
currentLoginUrl
=
currentEnv
?
`/member/qiyeweixin/minaLogin`
:
`/member/minaLogin`
// let currentLoginUrl = currentEnv ? `/member/qiyeweixin/minaLogin` : `/member/minaLogin`
let
currentLoginUrl
=
`/member/minaLogin`
console
.
log
(
'登陆'
,
currentLoginUrl
)
return
wxService
.
post
(
`
${
currentLoginUrl
}
`
,
{
...
...
src/utils/wxService.js
View file @
1815875d
...
...
@@ -163,18 +163,6 @@ class WXService extends Http {
const
currentEnv
=
wx
.
getStorageSync
(
'_qyWeChat'
)
console
.
log
(
'全局'
,
currentEnv
)
return
new
Promise
((
resolve
,
reject
)
=>
{
// 企业 wx.qy.login
if
(
currentEnv
)
{
wx
.
qy
.
login
({
success
:
(
res
)
=>
{
resolve
(
res
)
wx
.
setStorageSync
(
'_loginCode'
,
res
.
code
)
},
fail
:
(
res
)
=>
{
reject
(
res
)
}
})
}
else
{
wx
.
login
({
success
:
(
res
)
=>
{
resolve
(
res
)
...
...
@@ -184,7 +172,28 @@ class WXService extends Http {
reject
(
res
)
}
})
}
// 企业 wx.qy.login
// if (currentEnv) {
// wx.qy.login({
// success: (res) => {
// resolve(res)
// wx.setStorageSync('_loginCode', res.code)
// },
// fail: (res) => {
// reject(res)
// }
// })
// } else {
// wx.login({
// success: (res) => {
// resolve(res)
// wx.setStorageSync('_loginCode', res.code)
// },
// fail: (res) => {
// reject(res)
// }
// })
// }
})
}
...
...
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