diff --git a/app.json b/app.json index 69a96c1..584abeb 100644 --- a/app.json +++ b/app.json @@ -9,7 +9,8 @@ "pages/mine/mine", "pages/mine/about", "pages/hospital/contact", - "pages/hospital/ranking" + "pages/hospital/ranking", + "pages/home/webview" ], "window": { "backgroundTextStyle": "light", diff --git a/pages/home/index.js b/pages/home/index.js index 008e2d6..aeca8f5 100644 --- a/pages/home/index.js +++ b/pages/home/index.js @@ -16,7 +16,7 @@ Page({ { id: 1, name: '医院电话', icon: 'call', url: 'pages/hospital/contact', type: 'page' }, { id: 2, name: '科室排行', icon: 'ai-coordinate-system', url: 'pages/hospital/ranking', type: 'page' }, { id: 3, name: '医保备案', icon: 'system-code', url: '#小程序://异地备案/FfXUvTLmNptZx5E', type: 'wxapp' }, - { id: 4, name: '医疗影像', icon: 'film-1', url: 'https://www.114yygh.com/', type: 'website' } + { id: 4, name: '医疗影像', icon: 'film-1', url: '', type: '' } ] }, @@ -65,7 +65,7 @@ Page({ wx.switchTab({ url: '/' + item.url }); break; case 'website': - wx.navigateTo({ url: '/pages/webview/index?url=' + encodeURIComponent(item.url) }); + wx.navigateTo({ url: '/pages/home/webview?url=' + encodeURIComponent(item.url) }); break; case 'wxapp': wx.navigateToMiniProgram({ shortLink: item.url, env: 'release' }) diff --git a/pages/home/index.wxml b/pages/home/index.wxml index a1a2e06..c7e1e4a 100644 --- a/pages/home/index.wxml +++ b/pages/home/index.wxml @@ -67,9 +67,9 @@ - - - {{ item.name }} + + + {{ item.name }} diff --git a/pages/home/webview.js b/pages/home/webview.js new file mode 100644 index 0000000..4c42964 --- /dev/null +++ b/pages/home/webview.js @@ -0,0 +1,70 @@ +// pages/home/webview.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + url: '' + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + if (options.url) { + this.setData({ + url: decodeURIComponent(options.url) + }); + } + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/pages/home/webview.json b/pages/home/webview.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/home/webview.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/home/webview.wxml b/pages/home/webview.wxml new file mode 100644 index 0000000..12b8ab5 --- /dev/null +++ b/pages/home/webview.wxml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/pages/home/webview.wxss b/pages/home/webview.wxss new file mode 100644 index 0000000..6819689 --- /dev/null +++ b/pages/home/webview.wxss @@ -0,0 +1 @@ +/* pages/home/webview.wxss */ \ No newline at end of file diff --git a/pages/hospital/contact.js b/pages/hospital/contact.js index c28e918..3a0d1c3 100644 --- a/pages/hospital/contact.js +++ b/pages/hospital/contact.js @@ -2,36 +2,36 @@ const app = getApp() Page({ data: { - hospitalContact: [], + hospitalInfo: [], loading: true, }, onLoad(options) { - this.loadHospitalContact() + this.loadhospitalInfo() }, - loadHospitalContact() { + loadhospitalInfo() { const appData = app.globalData - if (appData.hospitalContact && appData.hospitalContact.length > 0) { + if (appData.hospitalInfo && appData.hospitalInfo.length > 0) { this.setData({ - hospitalContact: appData.hospitalContact, + hospitalInfo: appData.hospitalInfo, loading: false, }) - } else if (appData.hospitalContactReady) { - appData.hospitalContactReady.then((data) => { + } else if (appData.hospitalInfoReady) { + appData.hospitalInfoReady.then((data) => { this.setData({ - hospitalContact: data || [], + hospitalInfo: data || [], loading: false, }) }).catch(() => { this.setData({ - hospitalContact: [], + hospitalInfo: [], loading: false, }) }) } else { this.setData({ - hospitalContact: [], + hospitalInfo: [], loading: false, }) }