diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index ece4cfc..3e20967 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ // } // }) let that = this - const versionNum = "1.4.31" + const versionNum = "1.4.32" api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data.scanFlag diff --git a/project.config.json b/project.config.json index 3a679df..0e8739b 100644 --- a/project.config.json +++ b/project.config.json @@ -111,9 +111,9 @@ "scene": null }, { - "id": -1, - "name": "锦水档案", - "pathName": "subpages/understandJs/pages/archives/archives", + "id": 7, + "name": "我有事说", + "pathName": "subpages/discussion/pages/addIssue/addIssue", "query": "", "scene": null }, diff --git a/subpages/oneKeyService/pages/index/index.js b/subpages/oneKeyService/pages/index/index.js index eb0899f..be2b1eb 100644 --- a/subpages/oneKeyService/pages/index/index.js +++ b/subpages/oneKeyService/pages/index/index.js @@ -67,6 +67,10 @@ Page({ wx.navigateTo({ url: `../warning/warning?modulecode=${e.currentTarget.dataset.modulecode}` }) + } else if (e.currentTarget.dataset.modulecode == 'notice_cgjj') { + wx.navigateTo({ + url: `../warning/warning?modulecode=${e.currentTarget.dataset.modulecode}` + }) } } }) \ No newline at end of file diff --git a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js index 831a447..8746f45 100644 --- a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js +++ b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.js @@ -36,6 +36,11 @@ Page({ title: '安全365' }) this.noticeDetail(options.id) + } else if(options.modulecode == 'notice_cgjj'){ + wx.setNavigationBarTitle({ + title: '城管聚焦' + }) + this.noticeDetail(options.id) } }, diff --git a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.json b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.json index b86ff26..d8bbc60 100644 --- a/subpages/oneKeyService/pages/noticeDetail/noticeDetail.json +++ b/subpages/oneKeyService/pages/noticeDetail/noticeDetail.json @@ -1,4 +1,4 @@ { "usingComponents": {}, - "navigationBarTitleText": "锦水" + "navigationBarTitleText": "" } \ No newline at end of file diff --git a/subpages/oneKeyService/pages/warning/warning.js b/subpages/oneKeyService/pages/warning/warning.js index 0dfbf4a..b5890d0 100644 --- a/subpages/oneKeyService/pages/warning/warning.js +++ b/subpages/oneKeyService/pages/warning/warning.js @@ -44,6 +44,11 @@ Page({ wx.setNavigationBarTitle({ title: '安全365' }) + }else if(options.modulecode == 'notice_cgjj'){ + this.getBannerList('6') + wx.setNavigationBarTitle({ + title: '城管聚焦' + }) }else{ this.getBannerList('2') wx.setNavigationBarTitle({ diff --git a/subpages/oneKeyService/pages/warning/warning.json b/subpages/oneKeyService/pages/warning/warning.json index 25bf808..8db8a6b 100644 --- a/subpages/oneKeyService/pages/warning/warning.json +++ b/subpages/oneKeyService/pages/warning/warning.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "锦水警事", + "navigationBarTitleText": "", "usingComponents": { "load-more": "../../../../components/loadMore/loadMore", "no-data":"../../../../components/nodata/nodata"