Commit 887f5c5ad6bdd2a4d5f93194ec19b1690faf3b80
Exists in
master
and in
2 other branches
Merge branch 'master' of https://git.healthbaby.com.cn/luoye/littleapp_child
Showing 2 changed files
littleApp_child/pages/CompleteTouristInfo/CompleteTouristInfo.js
View file @
887f5c5
| ... | ... | @@ -44,10 +44,6 @@ |
| 44 | 44 | this.setData({ showErr: true }) |
| 45 | 45 | return |
| 46 | 46 | } |
| 47 | - // if (!e.detail.value.name || e.detail.value.name == ''){ | |
| 48 | - // this.setData({ showErr:true}) | |
| 49 | - // return | |
| 50 | - // } | |
| 51 | 47 | this.setData({ showErr: false }) |
| 52 | 48 | networkUtil.showLoading() |
| 53 | 49 | getApp().globalData.token = token |
| ... | ... | @@ -56,7 +52,7 @@ |
| 56 | 52 | console.log(res) |
| 57 | 53 | wx.showModal({ |
| 58 | 54 | title: '提示', |
| 59 | - content: '注册成功，立即登录', | |
| 55 | + content: '资料完善成功，立即进入首页', | |
| 60 | 56 | success: function (res) { |
| 61 | 57 | if (res.confirm) { |
| 62 | 58 | self.loginSuccess() |
littleApp_child/pages/home/home.js
View file @
887f5c5
| ... | ... | @@ -406,6 +406,13 @@ |
| 406 | 406 | }) |
| 407 | 407 | }, |
| 408 | 408 | loginSuccess(data) { |
| 409 | + // 为3的时候就是没填写资料 | |
| 410 | + if(data.status == 4){ | |
| 411 | + wx.navigateTo({ | |
| 412 | + url: '../CompleteTouristInfo/CompleteTouristInfo?userId=' + data.id + '&token=' + data.token | |
| 413 | + }) | |
| 414 | + return | |
| 415 | + } | |
| 409 | 416 | // 游客用户 |
| 410 | 417 | if (data.patientIds && data.patientIds.length == 0){ |
| 411 | 418 | data.patientIds = [data.id] |