From ec92af74b91bcd86b2d529044d875b60b0adf3f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B5=B7=E6=B4=8B=E4=B9=8B=E5=A3=B0?= Date: Tue, 3 Sep 2019 19:03:47 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=97=A8=E5=BA=97=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/joinFrDpell/index.js | 6 ++++-- pages/joinFrDpell/index.wxml | 2 +- pages/spellGroup/mySpellGroup/index.js | 3 ++- pages/spellGroup/mySpellGroup/index.wxml | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pages/joinFrDpell/index.js b/pages/joinFrDpell/index.js index 4d4e6ba..17c9e92 100644 --- a/pages/joinFrDpell/index.js +++ b/pages/joinFrDpell/index.js @@ -28,7 +28,8 @@ Page({ sec: "00", paramData:null, showErr:false, - showTime:true + showTime: true, + merchantVoList: [] }, /** @@ -203,7 +204,8 @@ Page({ data.validStartDate = utils.formatTime(data.validStartDate, 'yyyy-MM-dd') data.validEndDate = utils.formatTime(data.validEndDate, 'yyyy-MM-dd') that.setData({ - data + data, + merchantVoList: data.merchantVoList }); }); }, diff --git a/pages/joinFrDpell/index.wxml b/pages/joinFrDpell/index.wxml index 87fa0de..eeb1527 100644 --- a/pages/joinFrDpell/index.wxml +++ b/pages/joinFrDpell/index.wxml @@ -30,7 +30,7 @@ - + 购买须知: diff --git a/pages/spellGroup/mySpellGroup/index.js b/pages/spellGroup/mySpellGroup/index.js index 956eb51..f47cfa9 100644 --- a/pages/spellGroup/mySpellGroup/index.js +++ b/pages/spellGroup/mySpellGroup/index.js @@ -46,7 +46,8 @@ Page({ queueData: null, zIndex: 11, display: "none", - orderGroupId:'' + orderGroupId:'', + merchantVoList:[] }, /** diff --git a/pages/spellGroup/mySpellGroup/index.wxml b/pages/spellGroup/mySpellGroup/index.wxml index daf84c0..8d850bd 100644 --- a/pages/spellGroup/mySpellGroup/index.wxml +++ b/pages/spellGroup/mySpellGroup/index.wxml @@ -50,7 +50,7 @@ - + 购买须知