diff --git a/subpages/understandJs/pages/delicious/delicious.js b/subpages/understandJs/pages/delicious/delicious.js index df1637b..30b0275 100644 --- a/subpages/understandJs/pages/delicious/delicious.js +++ b/subpages/understandJs/pages/delicious/delicious.js @@ -22,6 +22,15 @@ Page({ this.setData({ noticeCategory:options.modulecode }) + if(options.modulecode == 'notice_taste'){ + wx.setNavigationBarTitle({ + title: '锦水味道' + }) + }else if(options.modulecode == 'notice_jssq'){ + wx.setNavigationBarTitle({ + title: '锦水社区' + }) + } this.noticelist(); }, noticelist () { diff --git a/subpages/understandJs/pages/delicious/delicious.json b/subpages/understandJs/pages/delicious/delicious.json index f6b48ec..8db8a6b 100644 --- a/subpages/understandJs/pages/delicious/delicious.json +++ b/subpages/understandJs/pages/delicious/delicious.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "锦水味道", + "navigationBarTitleText": "", "usingComponents": { "load-more": "../../../../components/loadMore/loadMore", "no-data":"../../../../components/nodata/nodata" diff --git a/subpages/understandJs/pages/index/index.js b/subpages/understandJs/pages/index/index.js index 6bccb8a..b7b345b 100644 --- a/subpages/understandJs/pages/index/index.js +++ b/subpages/understandJs/pages/index/index.js @@ -89,6 +89,10 @@ Page({ wx.navigateTo({ url: `../noticeDetail/noticeDetail?modulecode=${e.currentTarget.dataset.modulecode}` }) + } else if (e.currentTarget.dataset.modulecode == 'notice_jssq') { + wx.navigateTo({ + url: `../delicious/delicious?modulecode=${e.currentTarget.dataset.modulecode}` + }) } } }) \ No newline at end of file diff --git a/subpages/understandJs/pages/noticeDetail/noticeDetail.js b/subpages/understandJs/pages/noticeDetail/noticeDetail.js index 5741b70..0d85310 100644 --- a/subpages/understandJs/pages/noticeDetail/noticeDetail.js +++ b/subpages/understandJs/pages/noticeDetail/noticeDetail.js @@ -35,6 +35,11 @@ Page({ title: "锦水味道" }) this.noticeDetail(options.id) + } else if(options.modulecode == 'notice_jssq'){ + wx.setNavigationBarTitle({ + title: "锦水社区" + }) + this.noticeDetail(options.id) } else if(options.modulecode == "notice_impression"){ wx.setNavigationBarTitle({ title: "锦水印象" diff --git a/utils/config.js b/utils/config.js index e94fe91..d099316 100644 --- a/utils/config.js +++ b/utils/config.js @@ -6,8 +6,8 @@ module.exports = { }; function BASEURL() { - // return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境 - return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 + return 'https://eug-test.elinkit.com.cn/js/epdc-api/api/' // 锦水测试环境 + // return 'https://epdc-jinshui.elinkservice.cn/epdc-api/api/' // 锦水正式环境接口地址 // return 'http://192.168.43.19:9094/epdc-api/api/' }