From 26c69f783d179d2097cc5b151727a9b43278c0e7 Mon Sep 17 00:00:00 2001 From: meo <18801474720@163.com> Date: Tue, 28 May 2019 21:28:41 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=BC=E5=9B=A2=E8=B4=AD=E4=B9=B0][?= =?UTF-8?q?=E5=88=A0=E9=99=A4]:[=E6=8B=BC=E5=9B=A2=E8=B4=AD=E4=B9=B0?= =?UTF-8?q?=E5=BE=85=E6=94=AF=E4=BB=98=E8=B7=B3=E8=BD=AC=E7=9A=84=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=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 | 3 +-- pages/spellGroup/mySpellGroup/index.js | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/pages/joinFrDpell/index.js b/pages/joinFrDpell/index.js index e23452d..0e8501b 100644 --- a/pages/joinFrDpell/index.js +++ b/pages/joinFrDpell/index.js @@ -85,7 +85,6 @@ Page({ * 直接购买 */ gotoBuy(e) { - console.log(22222) let formId = e.detail.formId; let that=this; that.setData({ @@ -158,7 +157,6 @@ Page({ * 发起拼团 */ gotoSpell() { - console.log(111111111) this.setData({ canSpell: false }) @@ -282,6 +280,7 @@ Page({ * 拼团订单 */ data.orderGroupId = orderGroupId + var that = this; Http.get({ url: config.api.checkPhoneStatus, diff --git a/pages/spellGroup/mySpellGroup/index.js b/pages/spellGroup/mySpellGroup/index.js index dfad553..165d45b 100644 --- a/pages/spellGroup/mySpellGroup/index.js +++ b/pages/spellGroup/mySpellGroup/index.js @@ -306,7 +306,14 @@ Page({ */ let that = this; if (orderGroupId == 0) { - data.orderGroupId = orderGroupId + data.orderGroupId = orderGroupId, + that.setData({ + isFromSpell:true + }) + }else{ + that.setData({ + isFromSpell: false + }) } Http.get({ url: config.api.checkPhoneStatus, @@ -393,9 +400,16 @@ Page({ success: function (res) { console.log(res.confirm) if (res.confirm) { - wx.navigateTo({ - url: '/pages/order/index/index?id=all', - }) + console.log(that.data.isFromSpell) + if (that.data.isFromSpell){ + wx.navigateTo({ + url: '/pages/spellGroup/spellGroup?from=myspellList', + }) + }else{ + wx.navigateTo({ + url: '/pages/order/index/index?id=all', + }) + } } } })