diff --git a/pages/index/index.js b/pages/index/index.js index 1a3b040..851c44e 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -165,10 +165,18 @@ Page({ this.setData({ visible: true }) }, onImageClick: function(){ - console.log(this.data.landInfo) + if(this.data.landInfo.redirectInfo.targetView == 'showH5'){ + util.navigateTo('/pages/html/html/index?link=' + this.data.landInfo.redirectInfo.params.id + '?title=' + this.data.landInfo.title) + return + } + util.navigateTarget(this.data.landInfo.redirectInfo) this.setData({ visible: false, landInfo: null }) }, toRule: function(){ - console.log('toRule>>>') + if(this.data.landInfo.ruleRedirectInfo.targetView == 'showH5'){ + util.navigateTo('/pages/html/html/index?link=' + this.data.landInfo.ruleRedirectInfo.params.id + '?title=' + this.data.landInfo.title) + return + } + util.navigateTarget(this.data.landInfo.ruleRedirectInfo) } }) diff --git a/pages/mall/index/index.js b/pages/mall/index/index.js index 7498061..8734569 100644 --- a/pages/mall/index/index.js +++ b/pages/mall/index/index.js @@ -93,56 +93,9 @@ Component({ var item = this.data.bannerList[e.currentTarget.dataset.index] if(item.redirectInfo.targetView == 'showH5'){ util.navigateTo('/pages/html/html/index?link=' + item.redirectInfo.params.id + '?title=' + item.title) - } else if(item.redirectInfo.targetView == 'showImage'){ - util.navigateTo('/pages/html/banner/index?src=' + item.redirectInfo.params.id) - } - - if(item.redirectInfo.targetView == 'showBidList'){ - util.navigateTo('/pages/goods/ablility/index') - } else if(item.redirectInfo.targetView == 'showProxyList'){ - // wx.navigateTo({ url: '/pages/goods/ablility/index' }) - } else if(item.redirectInfo.targetView == 'showQNPrice'){ - util.navigateTo('/pages/mall/price-index/index') - } else if(item.redirectInfo.targetView == 'showFactoryPrice'){ - util.navigateTo('/pages/article/price-detail/index') - } else if(item.redirectInfo.targetView == 'showFactoryQueue'){ - util.navigateTo('/pages/article/queue-detail/index') - } else if(item.redirectInfo.targetView == 'showArticleHome'){ - // 情报首页 - event.emit('EventMessage', { what: 250, desc: 'page-article', index: 0 }) - } else if(item.redirectInfo.targetView == 'myArticle'){ - util.navigateTo('/pages/article/list/index') - } else if(item.redirectInfo.targetView == 'myMessage'){ - util.navigateTo('/pages/message/index/index') - } else if(item.redirectInfo.targetView == 'member'){ - util.navigateTo('/pages/ztbvip/index') - } else if(item.redirectInfo.targetView == 'showPurchaseList'){ - util.navigateTo('/pages/purchase/ablility/index') - } else if(item.redirectInfo.targetView == 'showProductList'){ - util.navigateTo('/pages/goods/ablility/index?type=1') - } else if(item.redirectInfo.targetView == 'logistics'){ - util.navigateTo('/pages/html/logistics/index') - } else if(item.redirectInfo.targetView == 'contract'){ - util.navigateTo('/pages/home/service/index') - } else if(item.redirectInfo.targetView == 'myAddress'){ - util.navigateTo('/pages/adress/list/index') - } else if(item.redirectInfo.targetView == 'myBankCard'){ - util.navigateTo('/pages/bank/vindex/index') - } else if(item.redirectInfo.targetView == 'personalBillDetail'){ - util.navigateTo('/pages/bank/bill/index') - } else if(item.redirectInfo.targetView == 'myScore'){ - util.navigateTo('/pages/html/integral/index') - } else if(item.redirectInfo.targetView == 'myBalance'){ - util.navigateTo('/pages/withdrawal/balance/index') - } else if(item.redirectInfo.targetView == 'myProxyList'){ - util.navigateTo('/pages/agent/order/index') - } else if(item.redirectInfo.targetView == 'myBidList'){ - util.navigateTo('/pages/bidding/index/index') - } else if(item.redirectInfo.targetView == 'myShop'){ - util.navigateTo('/pages/shop/index/index') - } else if(item.redirectInfo.targetView == 'buyerOrderList'){ - util.navigateTo('/pages/morder/index/index') + return } + util.navigateTarget(item.redirectInfo) }, onGridTap: function(e){ var index = e.currentTarget.dataset.index diff --git a/utils/util.js b/utils/util.js index 821282b..2075caa 100644 --- a/utils/util.js +++ b/utils/util.js @@ -1,3 +1,4 @@ +const event = require('./event') const app = getApp() const formatTime = date => { @@ -203,6 +204,58 @@ function navigateTo(url){ wx.navigateTo({ url }) } +function navigateTarget(redirectInfo){ + if(redirectInfo.targetView == 'showImage'){ + navigateTo('/pages/html/banner/index?src=' + redirectInfo.params.id) + } else if(redirectInfo.targetView == 'showBidList'){ + navigateTo('/pages/goods/ablility/index') + } else if(redirectInfo.targetView == 'showProxyList'){ + navigateTo({ url: '/pages/goods/ablility/index' }) + } else if(redirectInfo.targetView == 'showQNPrice'){ + navigateTo('/pages/mall/price-index/index') + } else if(redirectInfo.targetView == 'showFactoryPrice'){ + navigateTo('/pages/article/price-detail/index') + } else if(redirectInfo.targetView == 'showFactoryQueue'){ + navigateTo('/pages/article/queue-detail/index') + } else if(redirectInfo.targetView == 'showArticleHome'){ + event.emit('EventMessage', { what: 250, desc: 'page-article', index: 0 }) + } else if(redirectInfo.targetView == 'myArticle'){ + navigateTo('/pages/article/list/index') + } else if(redirectInfo.targetView == 'myMessage'){ + navigateTo('/pages/message/index/index') + } else if(redirectInfo.targetView == 'member'){ + navigateTo('/pages/ztbvip/index') + } else if(redirectInfo.targetView == 'showPurchaseList'){ + navigateTo('/pages/purchase/ablility/index') + } else if(redirectInfo.targetView == 'showProductList'){ + navigateTo('/pages/goods/ablility/index?type=1') + } else if(redirectInfo.targetView == 'logistics'){ + navigateTo('/pages/html/logistics/index') + } else if(redirectInfo.targetView == 'contract'){ + navigateTo('/pages/home/service/index') + } else if(redirectInfo.targetView == 'myAddress'){ + navigateTo('/pages/adress/list/index') + } else if(redirectInfo.targetView == 'myBankCard'){ + navigateTo('/pages/bank/vindex/index') + } else if(redirectInfo.targetView == 'personalBillDetail'){ + navigateTo('/pages/bank/bill/index') + } else if(redirectInfo.targetView == 'myScore'){ + navigateTo('/pages/html/integral/index') + } else if(redirectInfo.targetView == 'myBalance'){ + navigateTo('/pages/withdrawal/balance/index') + } else if(redirectInfo.targetView == 'myProxyList'){ + navigateTo('/pages/agent/order/index') + } else if(redirectInfo.targetView == 'myBidList'){ + navigateTo('/pages/bidding/index/index') + } else if(redirectInfo.targetView == 'myShop'){ + navigateTo('/pages/shop/index/index') + } else if(redirectInfo.targetView == 'buyerOrderList'){ + navigateTo('/pages/morder/index/index') + } else if(redirectInfo.targetView == 'createArticle'){ + navigateTo('/pages/article/publish/index') + } +} + module.exports = { isEmpty: isEmpty, extend: extend, @@ -216,5 +269,6 @@ module.exports = { showBackToast: showBackToast, checkPhone: checkPhone, checkId: checkId, - navigateTo: navigateTo + navigateTo: navigateTo, + navigateTarget: navigateTarget } \ No newline at end of file