|
|
|
@ -1,16 +1,16 @@ |
|
|
|
import store from '@/store'; |
|
|
|
import store from '@/store'; |
|
|
|
// APP--授权登录
|
|
|
|
// APP--授权登录
|
|
|
|
// type授权登录平台 'qq'、'weixin'、'apple'
|
|
|
|
// type授权登录平台 'qq'、'weixin'、'apple'
|
|
|
|
export const loginApp = (type,successCallback,errorCallback) => { |
|
|
|
export const loginApp = (type, successCallback, errorCallback) => { |
|
|
|
uni.login({ |
|
|
|
uni.login({ |
|
|
|
provider: type, |
|
|
|
provider: type, |
|
|
|
success: function(loginRes) { |
|
|
|
success: function (loginRes) { |
|
|
|
// 获取用户信息
|
|
|
|
// 获取用户信息
|
|
|
|
uni.getUserInfo({ |
|
|
|
uni.getUserInfo({ |
|
|
|
provider: type, |
|
|
|
provider: type, |
|
|
|
success: function(infoRes) { |
|
|
|
success: function (infoRes) { |
|
|
|
let data = {} |
|
|
|
let data = {} |
|
|
|
if(type=='qq'){ |
|
|
|
if (type == 'qq') { |
|
|
|
data = { |
|
|
|
data = { |
|
|
|
'openid': loginRes.authResult.openid, |
|
|
|
'openid': loginRes.authResult.openid, |
|
|
|
'nickname': infoRes.userInfo.nickname, |
|
|
|
'nickname': infoRes.userInfo.nickname, |
|
|
|
@ -19,7 +19,7 @@ export const loginApp = (type,successCallback,errorCallback) => { |
|
|
|
'city': infoRes.userInfo.city, |
|
|
|
'city': infoRes.userInfo.city, |
|
|
|
'figureurl': infoRes.userInfo.figureurl_qq |
|
|
|
'figureurl': infoRes.userInfo.figureurl_qq |
|
|
|
} |
|
|
|
} |
|
|
|
}else if(type=='weixin'){ |
|
|
|
} else if (type == 'weixin') { |
|
|
|
data = { |
|
|
|
data = { |
|
|
|
'openid': loginRes.authResult.openid, |
|
|
|
'openid': loginRes.authResult.openid, |
|
|
|
'nickname': infoRes.userInfo.nickName, |
|
|
|
'nickname': infoRes.userInfo.nickName, |
|
|
|
@ -30,21 +30,21 @@ export const loginApp = (type,successCallback,errorCallback) => { |
|
|
|
'headimgurl': infoRes.userInfo.avatarUrl, |
|
|
|
'headimgurl': infoRes.userInfo.avatarUrl, |
|
|
|
'unionid': loginRes.authResult.unionid |
|
|
|
'unionid': loginRes.authResult.unionid |
|
|
|
} |
|
|
|
} |
|
|
|
}else if(type=='apple'){ |
|
|
|
} else if (type == 'apple') { |
|
|
|
data = { |
|
|
|
data = { |
|
|
|
verifyType: 'password', |
|
|
|
verifyType: 'password', |
|
|
|
personalPhone: '13888888888', |
|
|
|
personalPhone: '13888888888', |
|
|
|
personalPhoneCountryCode: '86', |
|
|
|
personalPhoneCountryCode: '86', |
|
|
|
password:'123456' |
|
|
|
password: '123456' |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
successCallback && successCallback(data) |
|
|
|
successCallback && successCallback(data) |
|
|
|
} |
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|
},fail: function (err) {
|
|
|
|
}, fail: function (err) { |
|
|
|
console.log(res, "失败") |
|
|
|
console.log(res, "失败") |
|
|
|
errorCallback && errorCallback(res) |
|
|
|
errorCallback && errorCallback(res) |
|
|
|
}
|
|
|
|
} |
|
|
|
}); |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
// 微信/支付宝小程序---手机号授权登录时使用
|
|
|
|
// 微信/支付宝小程序---手机号授权登录时使用
|
|
|
|
@ -53,46 +53,46 @@ export const getPhoneInfo = (info, successCallback, errCallback) => { |
|
|
|
let httpData = {} |
|
|
|
let httpData = {} |
|
|
|
// #ifdef MP-WEIXIN
|
|
|
|
// #ifdef MP-WEIXIN
|
|
|
|
httpData = { |
|
|
|
httpData = { |
|
|
|
code: info.code, //小程序code
|
|
|
|
code: info.code, //小程序code
|
|
|
|
iv: info.iv, //小程序加密算法的初始向量
|
|
|
|
iv: info.iv, //小程序加密算法的初始向量
|
|
|
|
encryptedData: info.encryptedData, //包括敏感数据在内的完整用户信息的加密数据
|
|
|
|
encryptedData: info.encryptedData, //包括敏感数据在内的完整用户信息的加密数据
|
|
|
|
}; |
|
|
|
}; |
|
|
|
// #endif
|
|
|
|
// #endif
|
|
|
|
// #ifdef MP-ALIPAY
|
|
|
|
// #ifdef MP-ALIPAY
|
|
|
|
httpData = { |
|
|
|
httpData = { |
|
|
|
code: '', //小程序code
|
|
|
|
code: '', //小程序code
|
|
|
|
iv: '', //小程序加密算法的初始向量
|
|
|
|
iv: '', //小程序加密算法的初始向量
|
|
|
|
encryptedData: info, //包括敏感数据在内的完整用户信息的加密数据
|
|
|
|
encryptedData: info, //包括敏感数据在内的完整用户信息的加密数据
|
|
|
|
}; |
|
|
|
}; |
|
|
|
// #endif
|
|
|
|
// #endif
|
|
|
|
|
|
|
|
|
|
|
|
// 此时需要您的接口返回个人信息
|
|
|
|
// 此时需要您的接口返回个人信息
|
|
|
|
// uni.$u.http.post('您的接口', httpData).then(res => {
|
|
|
|
// uni.$u.http.post('您的接口', httpData).then(res => {
|
|
|
|
var loginInfo = { |
|
|
|
var loginInfo = { |
|
|
|
// userId: res.id,
|
|
|
|
// userId: res.id,
|
|
|
|
// sessionId: res.sessionId,
|
|
|
|
// sessionId: res.sessionId,
|
|
|
|
// phoneNum: res.phoneNum,
|
|
|
|
// phoneNum: res.phoneNum,
|
|
|
|
// userName: res.userName,
|
|
|
|
// userName: res.userName,
|
|
|
|
// openId: res.openId,
|
|
|
|
// openId: res.openId,
|
|
|
|
}; |
|
|
|
}; |
|
|
|
successCallback && successCallback(loginInfo) |
|
|
|
successCallback && successCallback(loginInfo) |
|
|
|
// }, err => {
|
|
|
|
// }, err => {
|
|
|
|
// errCallback && errCallback(err)
|
|
|
|
// errCallback && errCallback(err)
|
|
|
|
// });
|
|
|
|
// });
|
|
|
|
} |
|
|
|
} |
|
|
|
// 微信/支付宝小程序---通用授权个人信息登录
|
|
|
|
// 微信/支付宝小程序---通用授权个人信息登录
|
|
|
|
export const getUserInfo = (successCallback,errorCallback) => { |
|
|
|
export const getUserInfo = (successCallback, errorCallback) => { |
|
|
|
uni.showLoading({ |
|
|
|
uni.showLoading({ |
|
|
|
title: '正在申请授权', |
|
|
|
title: '正在申请授权', |
|
|
|
}); |
|
|
|
}); |
|
|
|
// #ifdef MP-WEIXIN
|
|
|
|
// #ifdef MP-WEIXIN
|
|
|
|
uni.getUserProfile({ |
|
|
|
uni.getUserProfile({ |
|
|
|
desc: '用于完善会员资料', |
|
|
|
desc: '用于完善会员资料', |
|
|
|
success: function(res) { |
|
|
|
success: function (res) { |
|
|
|
uni.hideLoading() |
|
|
|
uni.hideLoading() |
|
|
|
var offUserInfo = res.userInfo |
|
|
|
var offUserInfo = res.userInfo |
|
|
|
successCallback && successCallback(offUserInfo) |
|
|
|
successCallback && successCallback(offUserInfo) |
|
|
|
},fail: (res) => { |
|
|
|
}, fail: (res) => { |
|
|
|
uni.hideLoading() |
|
|
|
uni.hideLoading() |
|
|
|
errorCallback && errorCallback(res) |
|
|
|
errorCallback && errorCallback(res) |
|
|
|
} |
|
|
|
} |
|
|
|
@ -105,12 +105,12 @@ export const getUserInfo = (successCallback,errorCallback) => { |
|
|
|
var offUserInfo = JSON.parse(res.response).response // 以下方的报文格式解析两层 response
|
|
|
|
var offUserInfo = JSON.parse(res.response).response // 以下方的报文格式解析两层 response
|
|
|
|
offUserInfo.avatarUrl = offUserInfo.avatar |
|
|
|
offUserInfo.avatarUrl = offUserInfo.avatar |
|
|
|
successCallback && successCallback(offUserInfo) |
|
|
|
successCallback && successCallback(offUserInfo) |
|
|
|
},fail: (res) => { |
|
|
|
}, fail: (res) => { |
|
|
|
uni.hideLoading() |
|
|
|
uni.hideLoading() |
|
|
|
console.log(res, "失败") |
|
|
|
console.log(res, "失败") |
|
|
|
errorCallback && errorCallback(res) |
|
|
|
errorCallback && errorCallback(res) |
|
|
|
} |
|
|
|
} |
|
|
|
})
|
|
|
|
}) |
|
|
|
// #endif
|
|
|
|
// #endif
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -118,91 +118,86 @@ let lock = false |
|
|
|
let promiseResult = [] |
|
|
|
let promiseResult = [] |
|
|
|
// 获取token
|
|
|
|
// 获取token
|
|
|
|
export const getToken = () => { |
|
|
|
export const getToken = () => { |
|
|
|
return new Promise((resolve, reject) => { |
|
|
|
return new Promise((resolve, reject) => { |
|
|
|
promiseResult.push({ |
|
|
|
promiseResult.push({ |
|
|
|
resolve, |
|
|
|
resolve, |
|
|
|
reject |
|
|
|
reject |
|
|
|
}) |
|
|
|
}) |
|
|
|
if (!lock) { |
|
|
|
if (!lock) { |
|
|
|
lock = true |
|
|
|
lock = true |
|
|
|
// uni.login({
|
|
|
|
// uni.login({
|
|
|
|
// success(res){
|
|
|
|
// success(res){
|
|
|
|
var httpData = { |
|
|
|
var httpData = { |
|
|
|
username: 'ceshi', |
|
|
|
username: 'ceshi', |
|
|
|
password: '111111', |
|
|
|
password: '111111', |
|
|
|
} |
|
|
|
} |
|
|
|
uni.$u.http.post('/api/Tokensys/login',httpData,{custom: {isFactory:false}}).then(res => { |
|
|
|
uni.$u.http.post('/api/Tokensys/login', httpData, { custom: { isFactory: false } }).then(res => { |
|
|
|
if(res.code==1){ |
|
|
|
if (res.code == 1) { |
|
|
|
let userInfo = { |
|
|
|
let userInfo = { |
|
|
|
token:res.token,//token用于判断是否登录
|
|
|
|
token: res.token,//token用于判断是否登录
|
|
|
|
} |
|
|
|
} |
|
|
|
console.log(res.token,'res.token') |
|
|
|
console.log(res.token, 'res.token') |
|
|
|
store.commit('setUserInfo',userInfo) |
|
|
|
store.commit('setUserInfo', userInfo) |
|
|
|
console.log(store.state.userInfo.token,'getToken-token') |
|
|
|
console.log(store.state.userInfo.token, 'getToken-token') |
|
|
|
// uni.$emit("loginCallback") //全局登录监听回调方法
|
|
|
|
// uni.$emit("loginCallback") //全局登录监听回调方法
|
|
|
|
} |
|
|
|
} |
|
|
|
while (promiseResult.length) { |
|
|
|
while (promiseResult.length) { |
|
|
|
// p1.resolve(res.data)
|
|
|
|
// p1.resolve(res.data)
|
|
|
|
promiseResult.shift().resolve(res) |
|
|
|
promiseResult.shift().resolve(res) |
|
|
|
} |
|
|
|
} |
|
|
|
lock = false |
|
|
|
lock = false |
|
|
|
}).catch(err => { |
|
|
|
}).catch(err => { |
|
|
|
while (promiseResult.length) { |
|
|
|
while (promiseResult.length) { |
|
|
|
// p1.reject(err)
|
|
|
|
// p1.reject(err)
|
|
|
|
promiseResult.shift().reject(err) |
|
|
|
promiseResult.shift().reject(err) |
|
|
|
} |
|
|
|
} |
|
|
|
lock = false |
|
|
|
lock = false |
|
|
|
}) |
|
|
|
}) |
|
|
|
// }
|
|
|
|
// }
|
|
|
|
// })
|
|
|
|
// })
|
|
|
|
} |
|
|
|
} |
|
|
|
}) |
|
|
|
}) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 获取当前路径
|
|
|
|
// 获取当前路径
|
|
|
|
export const getCurrentRouter = (callback) => { |
|
|
|
export const getCurrentRouter = (callback) => { |
|
|
|
let routes = getCurrentPages() // 获取当前打开过的页面路由数组
|
|
|
|
let routes = getCurrentPages() // 获取当前打开过的页面路由数组
|
|
|
|
let curRoute = routes[routes.length - 1].route |
|
|
|
let curRoute = routes[routes.length - 1].route |
|
|
|
return curRoute |
|
|
|
return curRoute |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
var throttleLogin = true |
|
|
|
var throttleLogin = true |
|
|
|
//判断是否登录（所有端）
|
|
|
|
//判断是否登录（所有端）
|
|
|
|
export const judgeLogin = (callback) => { |
|
|
|
export const judgeLogin = (callback) => { |
|
|
|
let storeUserInfo = store.state.userInfo; |
|
|
|
console.log('judgeLogin', store) |
|
|
|
if (!storeUserInfo.userId){ // nvue页面读取不到vuex里面数据，将取缓存
|
|
|
|
const storeUserInfo = uni.getStorageSync('userInfo') |
|
|
|
// #ifdef MP-WEIXIN
|
|
|
|
if (!storeUserInfo) { |
|
|
|
storeUserInfo = uni.getStorageSync('userInfo') |
|
|
|
if (throttleLogin) { |
|
|
|
// #endif
|
|
|
|
throttleLogin = false |
|
|
|
} |
|
|
|
setTimeout(() => { |
|
|
|
console.log(storeUserInfo,'storeUserInfo----') |
|
|
|
throttleLogin = true //节流
|
|
|
|
if (!storeUserInfo.accessToken) { |
|
|
|
}, 1000) |
|
|
|
if(throttleLogin){ |
|
|
|
store.commit('setCurrentRouter', getCurrentRouter()) //获取当前路径
|
|
|
|
throttleLogin = false |
|
|
|
// #ifdef MP
|
|
|
|
setTimeout(()=>{ |
|
|
|
store.commit('setLoginPopupShow', true); |
|
|
|
throttleLogin = true //节流
|
|
|
|
// #endif
|
|
|
|
},1000) |
|
|
|
// #ifdef APP-PLUS
|
|
|
|
store.commit('setCurrentRouter',getCurrentRouter()) //获取当前路径
|
|
|
|
uni.$showModal({ |
|
|
|
// #ifdef MP
|
|
|
|
title: "登录提示", |
|
|
|
store.commit('setLoginPopupShow', true); |
|
|
|
confirmVal: '去登录', |
|
|
|
// #endif
|
|
|
|
cancelVal: '再逛会', |
|
|
|
// #ifdef APP-PLUS
|
|
|
|
content: '此时此刻需要您登录喔~', |
|
|
|
uni.$showModal({ |
|
|
|
}).then(res => { |
|
|
|
title: "登录提示", |
|
|
|
uni.navigateTo({ |
|
|
|
confirmVal:'去登录', |
|
|
|
url: "/pages/user/login" |
|
|
|
cancelVal:'再逛会', |
|
|
|
}); |
|
|
|
content:'此时此刻需要您登录喔~', |
|
|
|
}).catch(res => { }) |
|
|
|
}).then(res=>{ |
|
|
|
// #endif
|
|
|
|
uni.navigateTo({ |
|
|
|
|
|
|
|
url: "/pages/user/login" |
|
|
|
} else { |
|
|
|
}); |
|
|
|
// uni.$u.toast('您点击的太频繁了')
|
|
|
|
}).catch(res=>{}) |
|
|
|
} |
|
|
|
// #endif
|
|
|
|
} else { |
|
|
|
|
|
|
|
|
|
|
|
}else{ |
|
|
|
|
|
|
|
// uni.$u.toast('您点击的太频繁了')
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
}else{ |
|
|
|
|
|
|
|
callback && callback() |
|
|
|
callback && callback() |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
