From 9cb0fceff6e26ff368d563cb86cbfa89ef88d1b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=99=96?= Date: Thu, 7 Mar 2019 15:11:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E5=8A=A0=E5=A5=BD?= =?UTF-8?q?=E5=8F=8B=E6=8B=BC=E5=9B=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/joinFrDpell/index.js | 5 +++-- pages/joinFrDpell/index.wxml | 2 +- pages/spellGroup/mySpellGroup/index.js | 6 +++--- pages/spellGroup/spellGroup.js | 6 ++++-- pages/spellGroup/spellGroup.wxml | 8 ++++---- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/pages/joinFrDpell/index.js b/pages/joinFrDpell/index.js index 1dff35f..1b91b8e 100644 --- a/pages/joinFrDpell/index.js +++ b/pages/joinFrDpell/index.js @@ -29,7 +29,8 @@ Page({ this.setData({ couponChannelId: options.couponChannelId, couponId: options.couponId, - orderGroupId: options.orderGroupId + orderGroupId: options.orderGroupId, + orderId:options.orderId }) this.getDetail(options.couponChannelId); this.getOneSpell(options.couponId) @@ -111,7 +112,7 @@ Page({ this.setData({ canSpell: false }) - this.orderFunc(0) + this.orderFunc(this.data.orderGroupId) }, //参与别人的拼团 gotoPartner() { diff --git a/pages/joinFrDpell/index.wxml b/pages/joinFrDpell/index.wxml index 73ff86f..4c4ac14 100644 --- a/pages/joinFrDpell/index.wxml +++ b/pages/joinFrDpell/index.wxml @@ -55,7 +55,7 @@ {{data.salePrice}} - 发起拼团 + 参加拼团 diff --git a/pages/spellGroup/mySpellGroup/index.js b/pages/spellGroup/mySpellGroup/index.js index f9dfe41..01bb501 100644 --- a/pages/spellGroup/mySpellGroup/index.js +++ b/pages/spellGroup/mySpellGroup/index.js @@ -90,14 +90,14 @@ Page({ }) } else { that.setData({ - spellData:null, + // spellData:null, clock: "00", day: "00", hour: "00", min: "00", sec: "00", }) - that.getOneSpell(that.data.couponId) + // that.getOneSpell(that.data.couponId) } setTimeout(function () { total_micro_second -= 1000; @@ -117,7 +117,7 @@ Page({ //参与别人的拼团 gotoPartner(){ wx.navigateTo({ - url: `/pages/spellDetail/index?orderId=${this.data.spellData.orderId}&couponId=${this.data.spellData.couponId}&orderGroupId=${this.data.spellData.orderGroupId}` + url: `/pages/joinFrDpell/index?orderId=${this.data.spellData.orderId}&couponId=${this.data.spellData.couponId}&orderGroupId=${this.data.spellData.orderGroupId}&couponChannelId=${this.data.couponChannelId}` }); }, /** diff --git a/pages/spellGroup/spellGroup.js b/pages/spellGroup/spellGroup.js index 1889ac5..8ba30ef 100644 --- a/pages/spellGroup/spellGroup.js +++ b/pages/spellGroup/spellGroup.js @@ -47,9 +47,11 @@ Page({ this.getList(1, "spellList") }, //跳转到我的拼团详情 - gotoStatusDetail(){ + gotoStatusDetail(e){ + console.log(e,333) + let data = e.currentTarget.dataset.data wx.navigateTo({ - url: '/pages/spellDetail/index', + url: `/pages/spellDetail/index?orderId=${data.orderId}&couponId=${data.couponId}&orderGroupId=${data.orderGroupId}`, }) }, //切换我的拼团 diff --git a/pages/spellGroup/spellGroup.wxml b/pages/spellGroup/spellGroup.wxml index 8655ac5..424ca63 100644 --- a/pages/spellGroup/spellGroup.wxml +++ b/pages/spellGroup/spellGroup.wxml @@ -26,11 +26,11 @@ 剩余{{item.remainInventory}} - - + + - + {{item.title}} {{item.subTitle}} @@ -43,7 +43,7 @@ - + {{item.statusText}}