From c834635338c464c8a7f2f59c374f3f60cd85f87e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=99=96?= Date: Thu, 7 Mar 2019 16:15:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E4=BA=AB=E5=8A=9F=E8=83=BD=E4=BC=A0?= =?UTF-8?q?=E5=8F=82=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/index/index.js | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/pages/index/index.js b/pages/index/index.js index ca0e4fa..37fa0ca 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -40,39 +40,44 @@ Page({ wx.setStorageSync('imgurl', imgurl) app.getLocation(); if (options.couponChannelId || options.orderId) { - if (options.cuserId){ - /** - * 转赠判断 - */ - that.userLogin(options.couponChannelId, null, options.cuserId, options.coverImg, options.userName, options.avatarUrl, options.couponOrderId, options.updateDate); - }else{ - that.userLogin(options.couponChannelId, options.orderId); - } + that.userLogin(options); + // if (options.cuserId){ + // /** + // * 转赠判断 + // */ + // // that.userLogin(options.couponChannelId, null, options.cuserId, options.coverImg, options.userName, options.avatarUrl, options.couponOrderId, options.updateDate); + // that.userLogin(options.couponChannelId, null, options.cuserId, options.coverImg, options.userName, options.avatarUrl, options.couponOrderId, options.updateDate); + // } else if (options.orderGroupId){ + // // 来自于拼团 + // that.userLogin(options.couponChannelId, null, options.orderGroupId); + // }else{ + // that.userLogin(options.couponChannelId, options.orderId); + // } } else { that.userLogin() } }, - checkuerstatus(couponChannelId, orderId, cuserId, coverImg, userName, avatarUrl, couponOrderId, updateDate) { + checkuerstatus(options) { let that = this; Http.post({ url: config.api.checkUserStatus, data: {} }) .then(res => { - if (couponChannelId && !cuserId) { + if (options&&options.couponChannelId && !options.cuserId) { wx.redirectTo({ - url: `/pages/coupon/detail/index?couponChannelId=${couponChannelId}`, + url: `/pages/coupon/detail/index?couponChannelId=${options.couponChannelId}`, }) - } else if (couponChannelId && cuserId){ + } else if (options &&options.couponChannelId && options.cuserId){ /** * 转赠判断 */ wx.redirectTo({ - url: `/pages/coupon/detail/index?couponChannelId=${couponChannelId}&cuserId=${cuserId}&coverImg=${coverImg}&userName=${userName}&avatarUrl=${avatarUrl}&couponOrderId=${couponOrderId}&updateDate=${updateDate}`, + url: `/pages/coupon/detail/index?couponChannelId=${options.couponChannelId}&cuserId=${options.cuserId}&coverImg=${options.coverImg}&userName=${options.userName}&avatarUrl=${options.avatarUrl}&couponOrderId=${options.couponOrderId}&updateDate=${options.updateDate}`, }) - } else if (orderId) { + } else if (options &&options.orderId) { wx.redirectTo({ - url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${orderId}&from='${"discount"}`, + url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${options.orderId}&from='${"discount"}`, }) }else{ wx.switchTab({ @@ -109,7 +114,7 @@ Page({ /** * 用户登录 */ - userLogin: function (couponChannelId, orderId, cuserId, coverImg, userName, avatarUrl, couponOrderId, updateDate) { + userLogin: function (options) { var that = this; // 登录 wx.login({ @@ -151,8 +156,8 @@ Page({ }) app.globalData.token = res.data.token; Http.setToken(res.data.token); - if (couponChannelId || orderId){ - that.checkuerstatus(couponChannelId, orderId, cuserId, coverImg, userName, avatarUrl, couponOrderId, updateDate); + if (options&&(options.couponChannelId || options.orderId)){ + that.checkuerstatus(options); }else{ that.checkuerstatus(); }