From 32f7d61dbdbc6f64312aa444026b217269ea8f36 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Sat, 10 Aug 2019 21:50:32 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=B6=88=E8=B4=B9=E5=8D=A1][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:[=E4=BF=AE=E6=94=B9=E6=B6=88=E8=B4=B9=E5=8D=A1undifi?= =?UTF-8?q?ned=E7=9A=84=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/ConsumeDetail/ConsumeDetail.js | 11 +++++------ pages/cardorder/index/index.js | 20 +++++++++----------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/pages/ConsumeDetail/ConsumeDetail.js b/pages/ConsumeDetail/ConsumeDetail.js index 31ce6af..b503020 100644 --- a/pages/ConsumeDetail/ConsumeDetail.js +++ b/pages/ConsumeDetail/ConsumeDetail.js @@ -131,13 +131,12 @@ Page({ }, onLoad(options) { let that = this; - let cardId = options.cardId - console.log(cardId) - if (cardId == undefined) { - cardId = 0; + + if (options.cardId){ + that.cardpayList(cardId); + that.cardDetail(cardId); } - that.cardpayList(cardId); - that.cardDetail(cardId); + if (options.from){ this.setData({ showIndexReuturn:true diff --git a/pages/cardorder/index/index.js b/pages/cardorder/index/index.js index 33cbecd..7bf63a5 100644 --- a/pages/cardorder/index/index.js +++ b/pages/cardorder/index/index.js @@ -117,12 +117,11 @@ Page({ }, // 跳转到详情 gotoConsumeDetail: function(e) { - if (e.currentTarget.dataset.id == undefined) { - return; + if (e.currentTarget.dataset.id){ + wx.navigateTo({ + url: `/pages/ConsumeDetail/ConsumeDetail?cardId=${e.currentTarget.dataset.id}`, + }) } - wx.navigateTo({ - url: `/pages/ConsumeDetail/ConsumeDetail?cardId=${e.currentTarget.dataset.id}`, - }) }, //点击跳转到券详情页面 gotouse: function(e) { @@ -131,13 +130,12 @@ Page({ } else { var mystatus = this.data.mystatus; } - if (e.currentTarget.dataset.quancode == undefined) { - return; + if (e.currentTarget.dataset.quancode) { + wx.navigateTo({ + url: `/pages/couponorder/detail/index?quancode=${ + e.currentTarget.dataset.quancode}&couponorderstatus=${mystatus}` + }); } - wx.navigateTo({ - url: `/pages/couponorder/detail/index?quancode=${ - e.currentTarget.dataset.quancode}&couponorderstatus=${mystatus}` - }); }, gotoBuy: function() { wx.navigateTo({