diff --git a/pages/index/index.js b/pages/index/index.js index 6a0d026..0f20cc1 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -327,9 +327,17 @@ Page({ gotoPath: function (e) { console.log(e) if (e.currentTarget.dataset.event) { - this.pagePoint({ - event: e.currentTarget.dataset.event - }, 1) + if (e.currentTarget.dataset.event=='gongyeyuanqu_click') { + wx.navigateToMiniProgram({ + appId: 'wxd323e63a10aa6865', + path: 'pages/home/index' + }) + return + }else{ + this.pagePoint({ + event: e.currentTarget.dataset.event + }, 1) + } } if (e.currentTarget.dataset.title == '书香借阅') { wx.navigateToMiniProgram({ @@ -479,7 +487,7 @@ Page({ } break; case 3: - if ((item.tdata.indexOf('http://') != -1 || item.tdata.indexOf('https://') != -1) && item.tdata.indexOf('m.cloud.sz-trip.com') == -1) { + if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) && item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) { // 外部h5 console.log(item.tdata) app.globalData.weburl = item.tdata; @@ -487,7 +495,7 @@ Page({ url: "/pages/pbService/web/index" }) } else { - let page = item.tdata.split("/"); + let page = item.tdata.url.split("/"); page = page[page.length - 1].split("?") console.log(page[0]) let url = this.data.urltopage[page[0]]; @@ -644,7 +652,7 @@ Page({ } break; case 3: - if ((item.tdata.indexOf('http://') != -1 || item.tdata.indexOf('https://') != -1) && item.tdata.indexOf('m.cloud.sz-trip.com') == -1) { + if ((item.tdata.url.indexOf('http://') != -1 || item.tdata.url.indexOf('https://') != -1) && item.tdata.url.indexOf('m.cloud.sz-trip.com') == -1) { // 外部h5 console.log(item.tdata) app.globalData.weburl = item.tdata; @@ -652,7 +660,7 @@ Page({ url: "/pages/pbService/web/index" }) } else { - let page = item.tdata.split("/"); + let page = item.tdata.url.split("/"); page = page[page.length - 1].split("?") console.log(page[0]) let url = this.data.urltopage[page[0]]; diff --git a/pages/user/user.js b/pages/user/user.js index bd63679..ed85eca 100644 --- a/pages/user/user.js +++ b/pages/user/user.js @@ -80,7 +80,7 @@ Page({ phoneCall:function(){ wx.showModal({ title:'呼叫人工客服', - content:'0512-66555111', + content:'0512-66555111\n客服服务时间:08:30-17:30', success:function(res){ if (res.cancel) { return