diff --git a/pages/agent/fragment/index.js b/pages/agent/fragment/index.js index 945792c..74978e4 100644 --- a/pages/agent/fragment/index.js +++ b/pages/agent/fragment/index.js @@ -86,7 +86,7 @@ Component({ } }, searchList: function(){ - util.navigateTo('/pages/mall/search-list/index') + util.navigateTo('/pages/mall/search-list/index?tab=0') }, chooseCity: function(){ this.triggerEvent("picker", {type: 2, cityId: this.data.form.cityId}) diff --git a/pages/agent/fragment/index.wxml b/pages/agent/fragment/index.wxml index 7360ac0..619cf1f 100644 --- a/pages/agent/fragment/index.wxml +++ b/pages/agent/fragment/index.wxml @@ -18,7 +18,7 @@ - + diff --git a/pages/mall/fragment/index.js b/pages/mall/fragment/index.js index 2a7814a..f182008 100644 --- a/pages/mall/fragment/index.js +++ b/pages/mall/fragment/index.js @@ -105,7 +105,7 @@ Component({ } }, searchList: function(){ - wx.navigateTo({url: `/pages/mall/search-list/index` }) + wx.navigateTo({url: `/pages/mall/search-list/index?tab=1` }) }, postInfo: function(e){ var item = this.data.momentList[e.currentTarget.dataset.index] diff --git a/pages/mall/search-list/index.js b/pages/mall/search-list/index.js index 094a5ec..5019356 100644 --- a/pages/mall/search-list/index.js +++ b/pages/mall/search-list/index.js @@ -28,7 +28,10 @@ Page({ if(!util.isEmpty(searchString)){ this.setData({rearchStringList: searchString.split(',').slice(0, 24)}) } - this.setData({height: app.globalData.fragmentHeight - 100}) + if(options.tab) { + this.data.tabIndex = Number(options.tab) + } + this.setData({height: app.globalData.fragmentHeight - 100, tabIndex: this.data.tabIndex}) }, clearHistory: function(){ var that = this diff --git a/pages/moment/fragment/index.js b/pages/moment/fragment/index.js index 5aa54d9..363299d 100644 --- a/pages/moment/fragment/index.js +++ b/pages/moment/fragment/index.js @@ -81,7 +81,8 @@ Component({ util.navigateTo('/pages/article/feedback/index') }, searchList: function(){ - util.navigateTo('/pages/mall/search-list/index') + var tab = this.data.tabIndex == 3 ? 3 : 1 + util.navigateTo(`/pages/mall/search-list/index?tab=${tab}`) }, onTabChange: function({detail}){ if(this.data.tabIndex == Number(detail.index)){