diff --git a/app.wxss b/app.wxss index 7ef7977..cdecea9 100644 --- a/app.wxss +++ b/app.wxss @@ -1,5 +1,7 @@ /**app.wxss**/ @import './iconfont/iconfont.wxss'; +@import "./utils/wxParse/wxParse.wxss"; + .container { height: 100%; display: flex; diff --git a/images/place3.jpg b/images/place3.jpg deleted file mode 100644 index 2c6200e..0000000 Binary files a/images/place3.jpg and /dev/null differ diff --git a/pages/list/activity/index.wxml b/pages/list/activity/index.wxml index eb040be..5c6200e 100644 --- a/pages/list/activity/index.wxml +++ b/pages/list/activity/index.wxml @@ -41,7 +41,7 @@ {{item.source?item.source:""}} - + diff --git a/pages/list/activitynew/index.wxml b/pages/list/activitynew/index.wxml index 6adcbd1..e30e9de 100644 --- a/pages/list/activitynew/index.wxml +++ b/pages/list/activitynew/index.wxml @@ -106,7 +106,7 @@ - + {{item.name || item.title}} diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js index c224e55..9577afb 100644 --- a/pages/order/scene/index.js +++ b/pages/order/scene/index.js @@ -74,6 +74,7 @@ Page({ console.log('-------',app.globalData.product.sku.sku_model.is_need_idcard); console.log('---是否实名----',app.globalData.product.sku.sku_model.is_authentication); console.log('---一证一票----',app.globalData.product.sku.sku_model.is_real_name); + console.log(app.globalData.list, app.globalData.index,'list---index') if (!app.globalData.product) { util.back(); return; diff --git a/pages/user/service/info/index.js b/pages/user/service/info/index.js index c947c6b..be99801 100644 --- a/pages/user/service/info/index.js +++ b/pages/user/service/info/index.js @@ -1,13 +1,14 @@ // pages/user/service/info/index.js import commonApi from "../../../../utils/https/common" import util from "../../../../utils/util" +import WxParse from "../../../../utils/wxParse/wxParse.js" Page({ /** * 页面的初始数据 */ data: { - info:null + info:null, }, /** @@ -22,12 +23,30 @@ Page({ this.setData({ info:res.data }) + + var article = res.data.answer.replace(/"/g, ''); + var that = this; + WxParse.wxParse('article', 'html', article, that, 0); + + }) } else { util.back() } }, + // wxParse 解析a标签 + wxParseTagATap: function(e){ + var href = e.currentTarget.dataset.src; + console.log(href); + if(href.indexOf("http") >= 0){ + wx.navigateTo({ + url: "/pages/pbService/web/index?weburl=" + encodeURIComponent(href) + }) + } +}, + + showService:function(){ util.pagePoint({ event:'customer_service_human_click', diff --git a/pages/user/service/info/index.wxml b/pages/user/service/info/index.wxml index 81759d7..73623a1 100644 --- a/pages/user/service/info/index.wxml +++ b/pages/user/service/info/index.wxml @@ -1,8 +1,14 @@ + + + {{info.question_name}} - {{info.answer}} + + +