From 3c095e2e263226a8f1f48556467a2a5885f3a82f Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Fri, 26 Jul 2019 11:43:46 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=88=91=E7=9A=84][=E5=A2=9E=E5=8A=A0]:[?= =?UTF-8?q?=E6=88=91=E7=9A=84=E5=A2=9E=E5=8A=A0=E6=8E=88=E6=9D=83=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E5=8F=B7=E7=9A=84=E5=8A=9F=E8=83=BD]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/getphoneInfo/index.js | 23 ++++++++++++++++------- pages/user/index.js | 14 ++++++++++++++ 2 files changed, 30 insertions(+), 7 deletions(-) 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, })