From a93b41f886d4d1ae9c3e5e5c1ee4bff17f3c0ff2 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Tue, 2 Jul 2019 15:59:09 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D][?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0]:[=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E7=94=A8=E6=88=B7=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E7=9A=84=E6=8E=88=E6=9D=83]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/acSignIn/index.js | 2 +- pages/getphoneInfo/index.js | 122 +++++++++++++++++++----------------- pages/radetail/index.js | 17 ++++- 3 files changed, 79 insertions(+), 62 deletions(-) diff --git a/pages/acSignIn/index.js b/pages/acSignIn/index.js index 8975fcb..447328b 100644 --- a/pages/acSignIn/index.js +++ b/pages/acSignIn/index.js @@ -44,7 +44,7 @@ Page({ goSignUp(e) { let activityId = e.currentTarget.dataset.id; wx.navigateTo({ - url: `/pages/radetail/joinActivity/edit?activityId=${activityId}`, + url: `/pages/radetail/index?id=${activityId}`, }) }, goback: function () { diff --git a/pages/getphoneInfo/index.js b/pages/getphoneInfo/index.js index 4ddc414..592282c 100755 --- a/pages/getphoneInfo/index.js +++ b/pages/getphoneInfo/index.js @@ -6,10 +6,10 @@ Page({ canIUse: wx.canIUse("button.open-type.getPhoneNumber"), couponChannelId: "", path:null, - paramData:null + paramData:null, + signActivity:"" }, onLoad: function (options) { - console.log(options,98888) this.setData({ path: options.path }) @@ -23,6 +23,11 @@ Page({ }); } + if (options.signActivity){ + that.setData({ + signActivity: options.signActivity + }); + } Http.get({ url: config.api.marketicon, @@ -57,73 +62,72 @@ Page({ encryptedData: encryptedData, iv: iv } - }).then( - function (res) { - app.globalData.phone = res.data.phone; - /** - * 来自积分兑换 - */ - if (that.data.path == 'jifen') { + }).then(res=>{ + app.globalData.phone = res.data.phone; + /** + * 来自积分兑换 + */ + if (that.data.path == 'jifen') { + wx.redirectTo({ + url: `/pages/integralmall/payIntegcoupondetail/index?couponChannelId=${that.data.paramData.couponChannelId}&couponId=${that.data.paramData.couponId}` + }) + return; + } + /** + * 来自拼团详情 + */ + if (that.data.path == 'spell') { + if (that.data.paramData.avatarUrl) { wx.redirectTo({ - url: `/pages/integralmall/payIntegcoupondetail/index?couponChannelId=${that.data.paramData.couponChannelId}&couponId=${that.data.paramData.couponId}` + url: `/pages/joinFrDpell/index?couponId=${that.data.paramData.couponId}&orderGroupId=${that.data.paramData.orderGroupId}&couponChannelId=${that.data.paramData.couponChannelId}&orderId=${that.data.paramData.orderId}&avatarUrl=${that.data.paramData.avatarUrl}&nickName=${that.data.paramData.nickName}` }) - return; - } - /** - * 来自拼团详情 - */ - console.log(that.data, 98888) - if (that.data.path == 'spell') { - if (that.data.paramData.avatarUrl){ - wx.redirectTo({ - url: `/pages/joinFrDpell/index?couponId=${that.data.paramData.couponId}&orderGroupId=${that.data.paramData.orderGroupId}&couponChannelId=${that.data.paramData.couponChannelId}&orderId=${that.data.paramData.orderId}&avatarUrl=${that.data.paramData.avatarUrl}&nickName=${that.data.paramData.nickName}` - }) - }else{ - wx.redirectTo({ - url: `/pages/spellGroup/mySpellGroup/index?couponId=${that.data.paramData.couponId}&couponChannelId=${that.data.paramData.couponChannelId}` - }) - } - return; - } - /** - * fromId若存在来自卡转赠 - */ - if (that.data.path == 'index' && !that.data.paramData.cuserId) { + } else { wx.redirectTo({ - url: "/pages/game/index?url=" + that.data.paramData.url + "&id=" + that.data.paramData.id + "&gameId=" + that.data.paramData.gameId, - }) - } else if (that.data.path == 'index' && that.data.paramData.cuserId){ - wx.reLaunch({ - url: "/pages/coupon/detail/index?cuserId=" + that.data.paramData.cuserId + '&couponChannelId=' + that.data.paramData.couponChannelId + '&coverImg=' + that.data.paramData.coverImg + '&avatarUrl=' + that.data.paramData.avatarUrl + '&userName=' + that.data.paramData.userName + '&couponOrderId=' + that.data.paramData.couponOrderId + "&updateDate=" + that.data.paramData.updateDate + url: `/pages/spellGroup/mySpellGroup/index?couponId=${that.data.paramData.couponId}&couponChannelId=${that.data.paramData.couponChannelId}` }) - } else { - wx.showToast({ - title: res.data.msg, - icon: "success", - success: function (res) { - if (that.data.couponChannelId) { - wx.redirectTo({ - url: "/pages/coupon/detail/index?couponChannelId=" +that.data.couponChannelId +"&flag=pay" - }) - } else { - wx.switchTab({ - url: '/pages/passCar/passCar', - }) - } - } - }); } - }, - function (error) { + return; + } + /** + * fromId若存在来自卡转赠 + */ + if (that.data.path == 'index' && !that.data.paramData.cuserId) { + wx.redirectTo({ + url: "/pages/game/index?url=" + that.data.paramData.url + "&id=" + that.data.paramData.id + "&gameId=" + that.data.paramData.gameId, + }) + } else if (that.data.path == 'index' && that.data.paramData.cuserId) { + wx.reLaunch({ + url: "/pages/coupon/detail/index?cuserId=" + that.data.paramData.cuserId + '&couponChannelId=' + that.data.paramData.couponChannelId + '&coverImg=' + that.data.paramData.coverImg + '&avatarUrl=' + that.data.paramData.avatarUrl + '&userName=' + that.data.paramData.userName + '&couponOrderId=' + that.data.paramData.couponOrderId + "&updateDate=" + that.data.paramData.updateDate + }) + } + /** + * 活动报名 + */ + else if (that.data.signActivity) { + wx.redirectTo({ + url: `/pages/radetail/joinActivity/edit?activityId=${that.data.signActivity}` + }) + } else { wx.showToast({ - title: "请重新授权手机号", - icon: "none" + title: res.data.msg, + icon: "success", + success: function (res) { + if (that.data.couponChannelId) { + wx.redirectTo({ + url: "/pages/coupon/detail/index?couponChannelId=" + that.data.couponChannelId + "&flag=pay" + }) + } else { + wx.switchTab({ + url: '/pages/passCar/passCar', + }) + } + } }); } - ) + }) .catch(err => { wx.showToast({ - title: err.errMsg, + title: err.message, icon: 'none', duration: 2000, mask: false diff --git a/pages/radetail/index.js b/pages/radetail/index.js index 97c0451..29ac2d5 100644 --- a/pages/radetail/index.js +++ b/pages/radetail/index.js @@ -69,8 +69,21 @@ Page({ //跳转到报名详情页 goSignUp(e) { let activityId = e.currentTarget.dataset.activityid; - wx.navigateTo({ - url: `/pages/radetail/joinActivity/edit?activityId=${activityId}`, + this.checkUserStatus(activityId); + }, + checkUserStatus(activityId){ + let that = this; + Http.get({ + url: config.api.checkPhoneStatus, + data: {} + }).then(res=>{ + wx.navigateTo({ + url: `/pages/radetail/joinActivity/edit?activityId=${activityId}`, + }) + }).catch(err=>{ + wx.navigateTo({ + url: `/pages/getphoneInfo/index?signActivity=${activityId}`, + }) }) }, goback: function() {