From df5d88bc11e37aa87fa016b0f5479ef81b9923a6 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 15 Apr 2019 12:12:19 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=85=AC=E4=BC=97=E5=8F=B7=E9=93=BE=E6=8E=A5]?= =?UTF-8?q?[=E4=BF=AE=E6=94=B9]:=E4=B8=93=E9=A2=98=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E9=A1=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/getuserinfo/index.js | 6 +++--- pages/index/index.js | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pages/getuserinfo/index.js b/pages/getuserinfo/index.js index 762690d..f6943e2 100755 --- a/pages/getuserinfo/index.js +++ b/pages/getuserinfo/index.js @@ -124,7 +124,7 @@ Page({ } else if (that.data.orderId&&app.globalData.type=='bg') { // 参与砍价 wx.navigateTo({ - url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${that.data.orderId}&from=${"friend"}` + url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${that.data.orderId}` }); } else if (app.globalData.type == 'uc') { // 我的 @@ -172,7 +172,7 @@ Page({ url: '/pages/bargain/bargain?from=myhtml' }); } else if (app.globalData.type == 'sl') { - // 我的拼团 + // 拼团专场 wx.redirectTo({ url: '/pages/spellGroup/spellGroup' }); @@ -186,7 +186,7 @@ Page({ wx.redirectTo({ url: '/pages/discountCardList/discountCardList' }); - } else if (app.globalData.type == 'td') { + } else if (options && options.id && app.globalData.type == 'td') { // 专题活动页 wx.redirectTo({ url: '/pages/topicDetail/index' diff --git a/pages/index/index.js b/pages/index/index.js index f65aaca..cfe549f 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -147,7 +147,7 @@ Page({ } else if (options && options.orderId && app.globalData.type == 'bg') { // 参与砍价 wx.redirectTo({ - url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${options.orderId}&from='${"discount"}`, + url: `/pages/bargain/bargainDatail/bargainDatail?orderId=${options.orderId}&from=${"discount"}`, }) } else if (app.globalData.type == 'uc') { // 我的 @@ -195,7 +195,7 @@ Page({ url: '/pages/bargain/bargain?from=myhtml' }); } else if (app.globalData.type == 'sl') { - // 我的拼团 + // 拼团专场 wx.redirectTo({ url: '/pages/spellGroup/spellGroup' }); @@ -209,10 +209,10 @@ Page({ wx.redirectTo({ url: '/pages/discountCardList/discountCardList' }); - } else if (app.globalData.type == 'td') { + } else if (options && options.id && app.globalData.type == 'td') { // 专题活动页 wx.redirectTo({ - url: '/pages/topicDetail/index' + url: `/pages/topicDetail/index?id=${options.id}` }); } else if (app.globalData.type == 'ml') { // 门店