admingit/WechatOwnerService
1
0
Fork 0
mirror of https://gitee.com/java110/WechatOwnerService.git synced 2026-02-23 21:36:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化bug

Browse Source 
Signed-off-by: java110 <928255095@qq.com>
This commit is contained in:
java110 2024-07-18 15:32:55 +00:00 committed by Gitee
parent 2ca31c8801
commit ceaed2cfc5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
api/user/sessionApi.js
View File

@ -20,17 +20,17 @@ import {
} from '../../api/community/communityApi.js';
import {
saveOwnerStorage,
saveUserLoginInfo,
removeUserLoginInfo,
getWAppId,
saveWAppId,
getLoginFlag
} from '@/lib/java110/utils/StorageUtil.js';
saveOwnerStorage,
saveUserLoginInfo,
removeUserLoginInfo,
getWAppId,
saveWAppId,
getLoginFlag
} from '@/lib/java110/utils/StorageUtil.js';
import {
isWxOrAli
} from '../../lib/java110/utils/EnvUtil.js';
isWxOrAli
} from '../../lib/java110/utils/EnvUtil.js';
const LOGIN_FLAG = 'loginFlag'; //登录标识
@ -57,6 +57,7 @@ export function autoLogin(options) {
if (hasLogin()) {
return;
}
//todo 如果是 h5 或者 微信小程序 ，检查是否做了配置，如果没有做配置不做自登陆
// #ifdef H5 || MP-WEIXIN
autoLoginWechat(options);
@ -70,19 +71,23 @@ export function autoLogin(options) {
*/
export function autoLoginWechat(options) {
let _openId = options.openId;
if(_openId){ //h5 自登陆的情况
loginByOpenId(_openId);
return;
if (_openId) { //h5 自登陆的情况
let _time = uni.getStorageSync('refreshUserOpenId');
if(_time){
loginByOpenId(_openId);
uni.removeStorageSync('refreshUserOpenId');
return;
}
}
//todo 如果参数中带了wAppId
let _wAppId = options.wAppId;
if(_wAppId){
if (_wAppId) {
_generatorOpenId(options, _wAppId);
return;
}
let _objType = "1100"; // todo public
// #ifdef MP-WEIXIN
_objType = "1000";
@ -121,6 +126,8 @@ export function _refreshWechatOpenId(options, appId) {
wAppId: appId,
}).then(_data => {
if (_data.code == 0) {
let _date = new Date();
uni.setStorageSync("refreshUserOpenId", _data.getTime());
window.location.href = _data.data.openUrl;
return;
}
@ -158,12 +165,12 @@ export function _refreshWechatMiniOpenId() {
});
}
export function loginByOpenId(openId){
export function loginByOpenId(openId) {
requestNoAuth({
url: url.ownerUserLoginByOpenId,
method: "POST",
data: {
openId:openId
openId: openId
},
//动态数据
success: function(res) {
@ -172,17 +179,19 @@ export function loginByOpenId(openId){
return;
}
//todo 保存业主信息
uni.setStorageSync("userInfo",_json.data);
uni.setStorageSync("currentCommunityInfo",{
communityId:_json.data.communityId,
communityName:_json.data.communityName,
uni.setStorageSync("userInfo", _json.data);
uni.setStorageSync("currentCommunityInfo", {
communityId: _json.data.communityId,
communityName: _json.data.communityName,
});
uni.removeStorageSync("ownerInfo");
saveUserLoginInfo(_json.data.userId, _json.data.token, _json.data.key);
},
fail: function(e) {
uni.hideLoading();
reject(e);
}
});
}
}