diff --git a/pages/getphoneInfo/index.js b/pages/getphoneInfo/index.js index 592282c..7b6dba2 100755 --- a/pages/getphoneInfo/index.js +++ b/pages/getphoneInfo/index.js @@ -7,23 +7,28 @@ Page({ couponChannelId: "", path:null, paramData:null, - signActivity:"" + signActivity:"", + mineFlag:null }, onLoad: function (options) { - this.setData({ + var that = this; + that.setData({ path: options.path }) - this.setData({ + that.setData({ paramData: options }) - var that = this; - if (options.couponChannelId) { + if (options&&options.couponChannelId) { that.setData({ couponChannelId: options.couponChannelId }); } - - if (options.signActivity){ + if (options && options.mineFlag) { + that.setData({ + mineFlag: options.mineFlag + }) + } + if (options&&options.signActivity){ that.setData({ signActivity: options.signActivity }); @@ -107,6 +112,10 @@ Page({ wx.redirectTo({ url: `/pages/radetail/joinActivity/edit?activityId=${that.data.signActivity}` }) + } else if (that.data.mineFlag == 'mine'){ + wx.switchTab({ + url: '/pages/user/index' + }); } else { wx.showToast({ title: res.data.msg, diff --git a/pages/user/index.js b/pages/user/index.js index 716f675..2298e07 100644 --- a/pages/user/index.js +++ b/pages/user/index.js @@ -26,6 +26,7 @@ Page({ wmbarginicon: imgurl.wmbarginicon.url, wmspellgroup: imgurl.wmspellgroup.url, canIUse: wx.canIUse('official-account'), + mineFlag:"", flag: 'hidden', score: '0', name: "", @@ -41,6 +42,18 @@ Page({ showmemberqrcode: false, placeholder: '' }, + checkUserStatus() { + let that = this; + Http.get({ + url: config.api.checkPhoneStatus, + data: {} + }).then(res => { + }).catch(err => { + wx.navigateTo({ + url: `/pages/getphoneInfo/index?mineFlag=mine`, + }) + }) + }, /** * 跳转到成长值的页面 */ @@ -119,6 +132,7 @@ Page({ */ onShow: function() { let that = this; + that.checkUserStatus(); that.setData({ appVersion: extConfig.appVersion, })