Commit 73b2bbce authored by youjie's avatar youjie

no message

parent 40d62760
...@@ -142,22 +142,26 @@ ...@@ -142,22 +142,26 @@
NewUnionId: data.currentWxUserAuth.unionid //'oV5Rm1J_MpkEVvE0VPEicwCDG1Zo' NewUnionId: data.currentWxUserAuth.unionid //'oV5Rm1J_MpkEVvE0VPEicwCDG1Zo'
}).then(res=>{ }).then(res=>{
if (res.Code==1) { if (res.Code==1) {
uni.hideLoading()
data.loading = true
methods.setUserLoginByUnionId(data.currentWxUserAuth.unionid) methods.setUserLoginByUnionId(data.currentWxUserAuth.unionid)
}else{ }else{
uni.hideLoading() uni.hideLoading()
data.loading = true data.loading = true
uni.showToast({ setTimeout(()=>{
title: res.Message, uni.showToast({
icon: "none", title: res.Message,
}); icon: "none",
});
},2000)
} }
}); });
}, },
setUserLoginByUnionId(uid){ setUserLoginByUnionId(uid){
loginByUnionId({uid}).then(r=>{ loginByUnionId({uid}).then(r=>{
if(r.Code!=1){
uni.hideLoading()
data.loading = true
}
if(r.Data && r.Data.length>0){ if(r.Data && r.Data.length>0){
uni.setStorageSync("ErpStus",r.Data) uni.setStorageSync("ErpStus",r.Data)
let account=[] let account=[]
...@@ -183,10 +187,7 @@ ...@@ -183,10 +187,7 @@
setAccountsLogin(Accounts){ setAccountsLogin(Accounts){
getLoginAccounts({Accounts}).then(r=>{ getLoginAccounts({Accounts}).then(r=>{
let erpStus=uni.getStorageSync('ErpStus') let erpStus=uni.getStorageSync('ErpStus')
uni.hideLoading()
data.loading = true
if(r.Data && r.Data.length>0){ if(r.Data && r.Data.length>0){
if(erpStus){ if(erpStus){
erpStus.forEach(x=>{ erpStus.forEach(x=>{
if(x.ClassInAccount==r.Data[0].Account){ if(x.ClassInAccount==r.Data[0].Account){
...@@ -203,11 +204,13 @@ ...@@ -203,11 +204,13 @@
}else if(erpStus){ }else if(erpStus){
uni.removeStorageSync('userInfo') uni.removeStorageSync('userInfo')
uni.removeStorageSync('users') uni.removeStorageSync('users')
uni.setStorageSync('erpUserInfo',x[0]) uni.setStorageSync('erpUserInfo',erpStus[0])
uni.reLaunch({ uni.reLaunch({
url:'/pages/index/index' url:'/pages/index/index'
}) })
} }
uni.hideLoading()
data.loading = true
}).catch(e=>{ }).catch(e=>{
uni.hideLoading() uni.hideLoading()
......
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
url:'/pages/index/index' url:'/pages/index/index'
}) })
}else if(erpStus){ }else if(erpStus){
uni.setStorageSync('erpUserInfo',x[0]) uni.setStorageSync('erpUserInfo',erpStus[0])
uni.reLaunch({ uni.reLaunch({
url:'/pages/index/index' url:'/pages/index/index'
}) })
......
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