diff --git a/pages/login/compatibleLogin.vue b/pages/login/compatibleLogin.vue index e61e7725..b0e498a2 100644 --- a/pages/login/compatibleLogin.vue +++ b/pages/login/compatibleLogin.vue @@ -71,7 +71,7 @@ this.init(this.saveForm); if (this.type == "user") { uni.reLaunch({ - url: '/pages/projectEnd/projectIndex/projectIndex' + url: '/pages/projectEnd/projectIndex/projectIndex?fromPage=loginPage' }) } else if (this.type == "supplier") { uni.reLaunch({ @@ -213,7 +213,6 @@ }) }); // #endif - uni.setStorageSync('wflow-token', data.token); uni.setStorageSync('account', this.formData.account); uni.setStorageSync('password', this.formData.password); diff --git a/pages/projectEnd/projectIndex/projectIndex.vue b/pages/projectEnd/projectIndex/projectIndex.vue index ecbbe0cd..d6738e81 100644 --- a/pages/projectEnd/projectIndex/projectIndex.vue +++ b/pages/projectEnd/projectIndex/projectIndex.vue @@ -263,7 +263,7 @@ uni.removeStorageSync('buildObj') } }, - onLoad() { + onLoad(options) { var userInfo = JSON.parse(uni.getStorageSync('userInfo')) console.log('userInfo===========', userInfo) this.userInfo = userInfo @@ -271,7 +271,7 @@ this.styType = userInfo.styleType this.systemInfo = uni.getStorageSync('systemInfo') this.getSystemLogoConfig() - if(!this.userInfo.personMail){ + if(!this.userInfo.personMail && options.fromPage && options.fromPage == 'loginPage'){ this.checkInfoComplete() } // #ifdef APP-PLUS