|
|
@@ -20,7 +20,6 @@ function wxLogin(successcallback, failcallback) {
|
|
|
success: function(res) {
|
|
|
if (res.code) {
|
|
|
// 获取openid
|
|
|
- console.log(res);
|
|
|
let url = genAPIUrl('wx/user/openId')
|
|
|
let data = { code: res.code }
|
|
|
return request.getInstance().url(url).data(data).send().success(successcallback).fail(failcallback);
|
|
|
@@ -38,27 +37,24 @@ function getLoginSchedule(sessionKey, openId, successcallback, failcallback) {
|
|
|
wx.getUserInfo({
|
|
|
withCredentials: true,
|
|
|
success: function (res) {
|
|
|
- console.log(res);
|
|
|
let url = genAPIUrl('wx/user/loginRegist');
|
|
|
const userData = {
|
|
|
encryptedData: res.encryptedData,
|
|
|
sessionKey: sessionKey,
|
|
|
iv: res.iv
|
|
|
}
|
|
|
- console.log(userData)
|
|
|
request.getInstance().url(url).header({
|
|
|
"content-type": "application/x-www-form-urlencoded; charset=UTF-8"
|
|
|
}).data(userData).method('POST').send().success(res => {
|
|
|
- console.log(res)
|
|
|
- // wx.hideToast()
|
|
|
- // wx.showToast({
|
|
|
- // title: '登录成功',
|
|
|
- // icon: 'success',
|
|
|
- // duration: 1500
|
|
|
- // })
|
|
|
- // wx.setStorageSync('uid', res.data.data.data.uid)
|
|
|
- // wx.setStorageSync('user', res)
|
|
|
- // successcallback(res)
|
|
|
+ wx.hideToast()
|
|
|
+ wx.showToast({
|
|
|
+ title: '登录成功',
|
|
|
+ icon: 'success',
|
|
|
+ duration: 1500
|
|
|
+ })
|
|
|
+ wx.setStorageSync('uid', res.data.data.data.uid)
|
|
|
+ wx.setStorageSync('user', res)
|
|
|
+ successcallback(res)
|
|
|
});
|
|
|
},
|
|
|
fail: function(res) {
|
|
|
@@ -84,8 +80,6 @@ function getOpenidSessionKey(successcallback, failcallback) {
|
|
|
if(res.data.code == 200){
|
|
|
let sessionKey = res.data.data.session_key;
|
|
|
let openId = res.data.data.openid;
|
|
|
- console.log(sessionKey);
|
|
|
- console.log(openId);
|
|
|
getLoginSchedule(sessionKey, openId, successcallback, failcallback);
|
|
|
}
|
|
|
|
Rorschach