diff --git a/pages/index/index.wxml b/pages/index/index.wxml index 4ac2eaf..41518cc 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -172,7 +172,7 @@ - + diff --git a/pages/user/service/info/index.js b/pages/user/service/info/index.js index be99801..aa5bb40 100644 --- a/pages/user/service/info/index.js +++ b/pages/user/service/info/index.js @@ -9,6 +9,7 @@ Page({ */ data: { info:null, + linkData:[] }, /** @@ -28,7 +29,10 @@ Page({ var that = this; WxParse.wxParse('article', 'html', article, that, 0); - + // console.log(this.data) + let arrayData = [] + this.parseTagA(this.data.article.nodes, arrayData) + this.setData({linkData: arrayData}) }) } else { @@ -37,15 +41,48 @@ Page({ }, // wxParse 解析a标签 wxParseTagATap: function(e){ - var href = e.currentTarget.dataset.src; - console.log(href); - if(href.indexOf("http") >= 0){ + console.log(e) + let href = e.currentTarget.dataset.src; + let linkTarget = this.data.linkData.find(v=>v.href == href) + if (linkTarget) { + if (linkTarget["attr-minilink"]) { + wx.navigateTo({url: linkTarget["attr-minilink"]}) + } else { + if(href.indexOf("http") >= 0){ + wx.navigateTo({ + url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(href) + }) + } + } + } + if (this.data.link) { wx.navigateTo({ - url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(href) + url: this.data.link }) - } + } + return + // console.log(e.currentTarget) + // var href = e.currentTarget.dataset.src; + // console.log(href); + // if(href.indexOf("http") >= 0){ + // wx.navigateTo({ + // url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(href) + // }) + // } }, + // 递归article取出所有a标签 + parseTagA:function (nodes, array) { + nodes.forEach(v=>{ + if (v.attr && v.attr.href) { + array.push(v.attr) + } + if (Array.isArray(v.nodes) && v.nodes.length>0) { + this.parseTagA(v.nodes,array) + } + }) + }, + showService:function(){ util.pagePoint({ diff --git a/utils/wxParse/wxParse.wxss b/utils/wxParse/wxParse.wxss index 6e1d604..063fc24 100644 --- a/utils/wxParse/wxParse.wxss +++ b/utils/wxParse/wxParse.wxss @@ -17,9 +17,6 @@ color: #666; line-height: 1.8; } -view{ - word-break:break-all; overflow:auto; -} .wxParse-inline{ display: inline; margin: 0;