2.0.2版本 fix:小程序分享,小程序密码修改,小程序直接进入登录页
Showing
2 changed files
with
14 additions
and
26 deletions
| ... | @@ -10,53 +10,40 @@ let firstload = false | ... | @@ -10,53 +10,40 @@ let firstload = false |
| 10 | export default { | 10 | export default { |
| 11 | onLaunch: function(options) { | 11 | onLaunch: function(options) { |
| 12 | console.log('App Launch', options); | 12 | console.log('App Launch', options); |
| 13 | firstload = true | ||
| 14 | 13 | ||
| 15 | this.globalData.baseUrl_api = config.baseUrl_api; | 14 | this.globalData.baseUrl_api = config.baseUrl_api; |
| 16 | if(loginUrl.indexOf(options.path)==-1){ | 15 | if(loginUrl.indexOf(options.path)==-1){ |
| 17 | let userName = uni.getStorageSync('userName') | 16 | let userName = uni.getStorageSync('userName') |
| 18 | if (userName) { | 17 | if (userName) { |
| 19 | getInfo().then(() => { | 18 | getInfo().then(() => { |
| 20 | this.globalData.isLogin = true; | 19 | this.globalData.isLogin = true; |
| 20 | firstload = true | ||
| 21 | let firstLoadCallback = getApp().firstLoadCallback; | 21 | let firstLoadCallback = getApp().firstLoadCallback; |
| 22 | if (firstLoadCallback) { | 22 | if (firstLoadCallback) { |
| 23 | firstLoadCallback(); | 23 | firstLoadCallback(); |
| 24 | } | 24 | } |
| 25 | }).catch(() => { | 25 | }).catch(() => { |
| 26 | firstload = true | ||
| 26 | uni.redirectTo({ | 27 | uni.redirectTo({ |
| 27 | url: '/login/login' | 28 | url: '/login/login' |
| 28 | }) | 29 | }) |
| 29 | }) | 30 | }) |
| 30 | } else { | 31 | } else { |
| 31 | this.globalData.isLogin = false; | 32 | this.globalData.isLogin = false; |
| 33 | firstload = true | ||
| 32 | uni.redirectTo({ | 34 | uni.redirectTo({ |
| 33 | url: '/login/login' | 35 | url: '/login/login' |
| 34 | }) | 36 | }) |
| 35 | } | 37 | } |
| 36 | } | 38 | } |
| 37 | }, | 39 | }, |
| 38 | onShow: function() { | 40 | onShow: function() { |
| 39 | // if(firstload&&!this.globalData.isLogin){ | 41 | console.log('App Show',firstload,this.globalData.isLogin); |
| 40 | // console.log('App Show'); | 42 | if(firstload&&!this.globalData.isLogin){ |
| 41 | // uni.redirectTo({ | 43 | uni.redirectTo({ |
| 42 | // url: '/login/login' | 44 | url: '/login/login' |
| 43 | // }) | ||
| 44 | // } | ||
| 45 | |||
| 46 | if(firstload){ | ||
| 47 | getInfo().then(() => { | ||
| 48 | this.globalData.isLogin = true; | ||
| 49 | let firstLoadCallback = getApp().firstLoadCallback; | ||
| 50 | if (firstLoadCallback) { | ||
| 51 | firstLoadCallback(); | ||
| 52 | } | ||
| 53 | }).catch(() => { | ||
| 54 | uni.redirectTo({ | ||
| 55 | url: '/login/login' | ||
| 56 | }) | ||
| 57 | }) | 45 | }) |
| 58 | } | 46 | } |
| 59 | |||
| 60 | }, | 47 | }, |
| 61 | onHide: function() { | 48 | onHide: function() { |
| 62 | console.log('App Hide'); | 49 | console.log('App Hide'); | ... | ... |
| ... | @@ -121,7 +121,7 @@ | ... | @@ -121,7 +121,7 @@ |
| 121 | 121 | ||
| 122 | onLoad(() => { | 122 | onLoad(() => { |
| 123 | getCode() | 123 | getCode() |
| 124 | 124 | ||
| 125 | if (uni.showShareMenu) { | 125 | if (uni.showShareMenu) { |
| 126 | uni.showShareMenu({ | 126 | uni.showShareMenu({ |
| 127 | withShareTicket: true, | 127 | withShareTicket: true, |
| ... | @@ -204,7 +204,8 @@ | ... | @@ -204,7 +204,8 @@ |
| 204 | }) | 204 | }) |
| 205 | } | 205 | } |
| 206 | 206 | ||
| 207 | function getCode() { | 207 | function getCode() { |
| 208 | uni.hideLoading() | ||
| 208 | getCodeImg().then((res) => { | 209 | getCodeImg().then((res) => { |
| 209 | codeUrl.value = 'data:image/gif;base64,' + res.data.img | 210 | codeUrl.value = 'data:image/gif;base64,' + res.data.img |
| 210 | form.value.uuid = res.data.uuid | 211 | form.value.uuid = res.data.uuid | ... | ... |
-
Please register or sign in to post a comment