diff --git a/pages/login/loading.vue b/pages/login/loading.vue index abfa1aa..7679081 100644 --- a/pages/login/loading.vue +++ b/pages/login/loading.vue @@ -34,33 +34,50 @@ if(rs.status==200){ //setToken(rs.result.access_token); //加载用户信息 - this.$store.dispatch("InitData").then(res => { - //console.log(res) - //this.$watermark.set(res.result.name + res.result.loginName); - // uni.switchTab({ - // url:'/pages/index/index' - // }) - uni.setStorageSync("boe_new_login",1);//记录新登录 - let openUrl=$this.toUrl; - if(openUrl){ - if(openUrl.startsWith('http')){ - location.href=openUrl - }else{ - if(openUrl=='/pages/index/index' || openUrl=='/pages/study/index' || openUrl=='/pages/plus/index' || openUrl=='/pages/my/index'){ - uni.switchTab({ - url:openUrl + this.$store.dispatch("InitData").then(res => { + //console.log(res) + //this.$watermark.set(res.result.name + res.result.loginName); + // uni.switchTab({ + // url:'/pages/index/index' + // }) + uni.setStorageSync("boe_new_login",1);//记录新登录 + let openUrl=$this.toUrl; + if(openUrl){ + if(openUrl.startsWith('http')){ + uni.showModal({ + title:'跳转url0', + content:openUrl }) + location.href=openUrl }else{ - uni.navigateTo({url:openUrl}) + if(openUrl=='/pages/index/index' || openUrl=='/pages/study/index' || openUrl=='/pages/plus/index' || openUrl=='/pages/my/index'){ + uni.showModal({ + title:'跳转url1', + content:openUrl + }) + uni.switchTab({ + url:openUrl + }) + }else{ + uni.showModal({ + title:'跳转url2', + content:openUrl + }) + uni.navigateTo({url:openUrl}) + } } - } - }else{ - uni.switchTab({ - url:'/pages/index/index' - }) - } - - }); + }else{ + uni.switchTab({ + url:'/pages/index/index' + }) + } + + }).catch(error => { + uni.showModal({ + title:'错误', + content:error + }) + }) }else{ console.log(rs.message+','+rs.error); //#ifdef APP-PLUS