diff --git a/pages/index/index.js b/pages/index/index.js index ce3d235..44055fa 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -72,7 +72,6 @@ Page({ statusHeight: app.globalData.deviceInfo.statusHeight, navigationHeight: app.globalData.deviceInfo.navigationHeight, }); - this.init() }, init(){ this.login() @@ -122,15 +121,7 @@ Page({ }) }, toPolicyDetail(e){ - if(!this.data.bindPhone){ - wx.redirectTo({ - url: '/pages/register/register', - }) - }else{ - wx.navigateTo({ - url: '/subpages/index/policy/detail/detail?id=' + e.currentTarget.dataset.id, - }) - } + }, getMessage(){ @@ -157,7 +148,7 @@ Page({ * 生命周期函数--监听页面显示 */ onShow() { - + this.init() }, /** @@ -194,6 +185,7 @@ Page({ }) }, navigateTo(e){ + if(e.currentTarget.dataset.url && e.currentTarget.dataset.url != '/subpages/OCRCard/pages/index/index'){ if(e.currentTarget.dataset.url === '/pages/serve/serve'){ wx.switchTab({ @@ -204,15 +196,22 @@ Page({ url: e.currentTarget.dataset.url, }) }else if(e.currentTarget.dataset.url){ + if(!this.data.bindPhone){ if(this.data.userInfo.idCard){ - wx.navigateTo({ - url: `/subpages/index/checkInUser/checkInUser?idCard=${this.data.userInfo.idCard}`, - }) + wx.navigateTo({ + url: `/subpages/index/checkInUser/checkInUser?idCard=${this.data.userInfo.idCard}&name=${this.data.userInfo.name}&phone=${this.data.userInfo.phone}`, + }) + }else{ + wx.navigateTo({ + url: `/subpages/OCRCard/pages/index/index`, + }) + } }else{ wx.navigateTo({ - url: `/subpages/OCRCard/pages/index/index`, + url: '/pages/register/register', }) } + } } }); \ No newline at end of file diff --git a/pages/register/register.js b/pages/register/register.js index b976397..f73860b 100644 --- a/pages/register/register.js +++ b/pages/register/register.js @@ -72,7 +72,15 @@ Page({ wx.switchTab({ url: '/pages/index/index', }) + }else{ + wx.switchTab({ + url: '/pages/index/index', + }) } + }).catch(err=>{ + wx.switchTab({ + url: '/pages/index/index', + }) }) }, back(){ diff --git a/subpages/index/checkInUser/checkInUser.js b/subpages/index/checkInUser/checkInUser.js index 5777867..ce4fe10 100644 --- a/subpages/index/checkInUser/checkInUser.js +++ b/subpages/index/checkInUser/checkInUser.js @@ -21,7 +21,7 @@ Page({ onLoad(options) { if(options.idCard){ this.setData({ - 'form.idCard':options.idCard + 'form.idCard':options.idCard, }) this.selectMzGraduateInfo() } @@ -88,6 +88,11 @@ Page({ 'form.telephone':e.detail }) }, + onChangeName(e){ + this.setData({ + 'form.graduateName':e.detail + }) + }, submit(){ selectMzGraduateInfo({idCard:this.data.form.idCard}).then(res=>{ diff --git a/subpages/index/checkInUser/checkInUser.wxml b/subpages/index/checkInUser/checkInUser.wxml index 7fb5f32..5bb48a5 100644 --- a/subpages/index/checkInUser/checkInUser.wxml +++ b/subpages/index/checkInUser/checkInUser.wxml @@ -10,7 +10,7 @@ - +