|
|
|
|
@ -6,10 +6,12 @@ App({
|
|
|
|
|
sessionId: '',
|
|
|
|
|
headers2: {
|
|
|
|
|
"content-type": "multipart/form-data",
|
|
|
|
|
Authorization: "",
|
|
|
|
|
'Cookie': ''
|
|
|
|
|
},
|
|
|
|
|
headers: {
|
|
|
|
|
"content-type": "application/x-www-form-urlencoded",
|
|
|
|
|
Authorization: "",
|
|
|
|
|
'Cookie': ''
|
|
|
|
|
},
|
|
|
|
|
userLoginTokenInfo: {
|
|
|
|
|
@ -118,32 +120,91 @@ App({
|
|
|
|
|
},
|
|
|
|
|
getLoginUserTokenInfo: function() {
|
|
|
|
|
var that = this;
|
|
|
|
|
// debugger;
|
|
|
|
|
try {
|
|
|
|
|
var value = wx.getStorageSync('loginUserTokenInfo');
|
|
|
|
|
var value = wx.getStorageSync("loginUserTokenInfo");
|
|
|
|
|
console.log(value);
|
|
|
|
|
if (value) {
|
|
|
|
|
that.globalData.userLoginTokenInfo = value;
|
|
|
|
|
// console.log(that.isNotEmptyCheck(that.globalData.userLoginTokenInfo.token));
|
|
|
|
|
if (that.isNotEmptyCheck(that.globalData.userLoginTokenInfo.token)) {
|
|
|
|
|
let token = that.globalData.userLoginTokenInfo.token;
|
|
|
|
|
that.globalData.header.Authorization = "Bearer " + token;
|
|
|
|
|
that.globalData.headers2.Authorization = "Bearer " + token;
|
|
|
|
|
that.globalData.headers.Authorization = "Bearer " + token;
|
|
|
|
|
console.log(that.globalData.headers);
|
|
|
|
|
wx.request({
|
|
|
|
|
url: that.globalData.ip + "/checkToken",
|
|
|
|
|
method: "GET",
|
|
|
|
|
header: that.globalData.headers,
|
|
|
|
|
success: function (res) {
|
|
|
|
|
console.log(res);
|
|
|
|
|
|
|
|
|
|
if (res.data.status == 200) {
|
|
|
|
|
if (wx.getStorageSync("messageClick" + res.data.data.id)) {
|
|
|
|
|
console.log("messageClick" + res.data.data.id);
|
|
|
|
|
} else {
|
|
|
|
|
wx.setStorageSync("messageClick" + res.data.data.id, false);
|
|
|
|
|
}
|
|
|
|
|
that.globalData.isLogin = true;
|
|
|
|
|
that.globalData.test = "b";
|
|
|
|
|
that.globalData.user = res.data.data.user;
|
|
|
|
|
// that.globalData.user.idauth = 0;
|
|
|
|
|
|
|
|
|
|
if (that.isNotEmptyCheck(that.globalData.userLoginTokenInfo.tel)) {
|
|
|
|
|
that.globalData.loginUserInfo = res.data.data;
|
|
|
|
|
console.log(that.globalData.loginUserInfo);
|
|
|
|
|
that.getServiceInfo().then(() => {
|
|
|
|
|
console.log("getServiceInfo");
|
|
|
|
|
});
|
|
|
|
|
console.log("getLoginUserTokenInfo" + "+++++++++++++++++++++++++++++++++++++++++++");
|
|
|
|
|
if (that.userLoginCallback) {
|
|
|
|
|
that.userLoginCallback(res);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
//已过期
|
|
|
|
|
that.globalData.autoLoginTag = 1;
|
|
|
|
|
// that.appLoginByTel();
|
|
|
|
|
|
|
|
|
|
return new Promise(function(resolve, reject) {
|
|
|
|
|
// that.globalData.isLogin = false;
|
|
|
|
|
return new Promise(function (resolve, reject) {
|
|
|
|
|
try {
|
|
|
|
|
that.appLoginByTel(resolve, reject);
|
|
|
|
|
} catch (e) {
|
|
|
|
|
console.log('设置登录信息错误');
|
|
|
|
|
console.log("设置登录信息错误");
|
|
|
|
|
console.log(e);
|
|
|
|
|
reject();
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
});
|
|
|
|
|
// console.log(that.globalData.isLogin);
|
|
|
|
|
} else if (that.isNotEmptyCheck(that.globalData.userLoginTokenInfo.tel)) {
|
|
|
|
|
that.globalData.autoLoginTag = 1;
|
|
|
|
|
|
|
|
|
|
return new Promise(function (resolve, reject) {
|
|
|
|
|
try {
|
|
|
|
|
that.appLoginByTel(resolve, reject);
|
|
|
|
|
} catch (e) {
|
|
|
|
|
console.log("设置登录信息错误");
|
|
|
|
|
console.log(e);
|
|
|
|
|
reject();
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
console.log('获取用户登录信息---------------start');
|
|
|
|
|
console.log(value);
|
|
|
|
|
console.log('获取用户登录信息---------------end');
|
|
|
|
|
} else {
|
|
|
|
|
if (that.userLoginCallback) {
|
|
|
|
|
that.userLoginCallback();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
console.log("获取用户登录信息---------------start");
|
|
|
|
|
console.log(that.globalData.test);
|
|
|
|
|
// that.globalData.isLogin = true
|
|
|
|
|
setTimeout(() => {
|
|
|
|
|
console.log(that.globalData.isLogin);
|
|
|
|
|
}, 1000);
|
|
|
|
|
console.log("获取用户登录信息---------------end");
|
|
|
|
|
} catch (e) {
|
|
|
|
|
console.log('获取登录信息错误');
|
|
|
|
|
console.log("获取登录信息错误");
|
|
|
|
|
console.log(e);
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
@ -226,11 +287,11 @@ App({
|
|
|
|
|
console.log(that.globalData);
|
|
|
|
|
console.log("login====result=======2");
|
|
|
|
|
|
|
|
|
|
wx.showToast({
|
|
|
|
|
title: '登录成功',
|
|
|
|
|
icon: 'success',
|
|
|
|
|
duration: 2000
|
|
|
|
|
})
|
|
|
|
|
// wx.showToast({
|
|
|
|
|
// title: '登录成功',
|
|
|
|
|
// icon: 'success',
|
|
|
|
|
// duration: 2000
|
|
|
|
|
// })
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
@ -243,6 +304,8 @@ App({
|
|
|
|
|
that.globalData.sessionId = '';
|
|
|
|
|
that.globalData.headers.Cookie = '';
|
|
|
|
|
that.globalData.headers2.Cookie = '';
|
|
|
|
|
that.globalData.headers.Authorization = "";
|
|
|
|
|
that.globalData.headers2.Authorization = "";
|
|
|
|
|
that.globalData.isLogin = false;
|
|
|
|
|
that.globalData.hasUserInfo = 0;
|
|
|
|
|
that.globalData.loginUserInfo = {};
|
|
|
|
|
@ -261,7 +324,7 @@ App({
|
|
|
|
|
title: title,
|
|
|
|
|
content: content,
|
|
|
|
|
showCancel: false,
|
|
|
|
|
confirmColor: "#e60012",
|
|
|
|
|
confirmColor: "#0dcc91",
|
|
|
|
|
confirmText: btxt,
|
|
|
|
|
success: function (res) {
|
|
|
|
|
if (res.confirm) {
|
|
|
|
|
|
