diff --git a/pages/webView/webView.js b/pages/webView/webView.js index 9b1a479..db6429a 100644 --- a/pages/webView/webView.js +++ b/pages/webView/webView.js @@ -1,19 +1,19 @@ const app = getApp() Page({ data: { - url: '' + worktoken: '' }, onLoad: function (options) { console.log(options); - console.log( decodeURIComponent(options.url)); + console.log( decodeURIComponent(options.worktoken)); if (options.token) { this.setData({ - url: `${options.url}` + worktoken: `${options.worktoken}` }) - console.log('url',this.data.url) + console.log('url',this.data.worktoken) } else { this.setData({ - url: decodeURIComponent(options.url) + worktoken: decodeURIComponent(options.worktoken) // url:`${options.url}?deptName=${options.deptName}&gridId=${options.gridId}` }) } diff --git a/pages/webView/webView.wxml b/pages/webView/webView.wxml index b80152d..d0509c7 100644 --- a/pages/webView/webView.wxml +++ b/pages/webView/webView.wxml @@ -1,2 +1,3 @@ - + + \ No newline at end of file diff --git a/pages/work2/work2.js b/pages/work2/work2.js index 97ed102..54fb7f9 100644 --- a/pages/work2/work2.js +++ b/pages/work2/work2.js @@ -123,8 +123,9 @@ Page({ onHotlineCompletion(){ let token=wx.getStorageSync('token') console.log(token,"jhgjgjjhbj"); + console.log('https://epmet-preview.elinkservice.cn/epmet-work-h5/#/Hotline?worktoken='+token) wx.navigateTo({ - url: '/pages/webView/webView?url=' + 'https://epmet-preview.elinkservice.cn/epmet-work-h5/#/Hotline?worktoken='+token, + url: '/pages/webView/webView?worktoken='+token, }) }