Commit 1815875d by 高淑倩

登陆

parent fd1b7614
...@@ -292,7 +292,8 @@ function getUserInfoByBtn(userInfo) { ...@@ -292,7 +292,8 @@ function getUserInfoByBtn(userInfo) {
mask: true mask: true
}) })
const currentEnv = wx.getStorageSync('_qyWeChat') 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) console.log('登陆', currentLoginUrl)
return wxService.post(`${currentLoginUrl}`, { return wxService.post(`${currentLoginUrl}`, {
......
...@@ -163,18 +163,6 @@ class WXService extends Http { ...@@ -163,18 +163,6 @@ class WXService extends Http {
const currentEnv = wx.getStorageSync('_qyWeChat') const currentEnv = wx.getStorageSync('_qyWeChat')
console.log('全局', currentEnv) console.log('全局', currentEnv)
return new Promise((resolve, reject) => { 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({ wx.login({
success: (res) => { success: (res) => {
resolve(res) resolve(res)
...@@ -184,7 +172,28 @@ class WXService extends Http { ...@@ -184,7 +172,28 @@ class WXService extends Http {
reject(res) 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)
// }
// })
// }
}) })
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment