diff --git a/pages/spellDetail/index.js b/pages/spellDetail/index.js index b8c2e13..e15bfce 100644 --- a/pages/spellDetail/index.js +++ b/pages/spellDetail/index.js @@ -213,8 +213,9 @@ Page({ showAlert: true }) } + console.log(data,3333333333333) that.setData({ - data: res.data + data: data }) }); }, diff --git a/pages/spellDetail/index.wxml b/pages/spellDetail/index.wxml index e5caf31..4eaf2c4 100644 --- a/pages/spellDetail/index.wxml +++ b/pages/spellDetail/index.wxml @@ -30,18 +30,6 @@ - @@ -55,30 +43,27 @@ ? - - - - 结束 - {{sec}} - : - {{min}} - : - {{hour}} - - {{day}} - 剩余 + + 结束 + {{sec}} + : + {{min}} + : + {{hour}} + + {{day}} + 剩余 + + + + 还差 + 1 + 拼团成功,赶快邀人 + + diff --git a/pages/spellGroup/mySpellGroup/index.js b/pages/spellGroup/mySpellGroup/index.js index 8e4d228..88cd961 100644 --- a/pages/spellGroup/mySpellGroup/index.js +++ b/pages/spellGroup/mySpellGroup/index.js @@ -44,6 +44,7 @@ Page({ queueData: null, zIndex: 11, display: "none", + orderGroupId:'' }, /** @@ -124,7 +125,8 @@ Page({ this.setData({ canBuyIf: false, formId: e.detail.formId, - queueData: null + queueData: null, + orderGroupId:'' }) that.getQuestions(); }, @@ -351,7 +353,8 @@ Page({ let that = this; that.setData({ canSpell: false, - formId: e.detail.formId + formId: e.detail.formId, + orderGroupId:0 }) that.getQuestions(0); }, @@ -502,8 +505,8 @@ Page({ * 拼团订单 */ let that = this; - if (orderGroupId == 0) { - data.orderGroupId = orderGroupId, + if (this.data.orderGroupId == 0) { + data.orderGroupId = this.data.orderGroupId, that.setData({ isFromSpell:true })