diff --git a/app.json b/app.json index 91d6bdb..472d5db 100644 --- a/app.json +++ b/app.json @@ -106,13 +106,13 @@ }, { "pagePath": "pages/discussion/discussion", - "text": "党群议事", + "text": "我有事说", "iconPath": "images/discuss.png", "selectedIconPath": "images/discussSelected.png" }, { "pagePath": "pages/association/association", - "text": "邻里党群", + "text": "党群互动", "iconPath": "images/association.png", "selectedIconPath": "images/association-select.png" }, diff --git a/pages/association/association.json b/pages/association/association.json index 417ed0d..bb11deb 100644 --- a/pages/association/association.json +++ b/pages/association/association.json @@ -3,6 +3,6 @@ "my-association-list": "./components/my-association-list/index", "command-association-list": "./components/command-association-list/index" }, - "navigationBarTitleText": "邻里党群", + "navigationBarTitleText": "党群互动", "onReachBottomDistance": 100 } \ No newline at end of file diff --git a/pages/discussion/discussion.json b/pages/discussion/discussion.json index 3807972..e9b6c57 100644 --- a/pages/discussion/discussion.json +++ b/pages/discussion/discussion.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "党群议事", + "navigationBarTitleText": "我有事说", "usingComponents": { "issue-list": "./components/issueList/issueList", "project-list": "./components/projectList/projectList", diff --git a/pages/mine/mine.wxml b/pages/mine/mine.wxml index a49b952..e4074f3 100644 --- a/pages/mine/mine.wxml +++ b/pages/mine/mine.wxml @@ -132,7 +132,7 @@ 您还未发布话题 - 快到“邻里党群”,到您的群里发布吧 + 快到“党群互动”,到您的群里发布吧 diff --git a/pages/toRegister/toRegister.js b/pages/toRegister/toRegister.js index bf63b84..7f9236a 100644 --- a/pages/toRegister/toRegister.js +++ b/pages/toRegister/toRegister.js @@ -21,7 +21,7 @@ Page({ } }) let that = this - const versionNum = '1.0.0' + const versionNum = '1.0.1' api.getScanSwitch(versionNum).then(function (res) { console.log(res.data) let state = res.data.scanFlag @@ -42,9 +42,9 @@ Page({ // }) }, experience() { - app.globalData.tempGridId = '1215152928323555330' + app.globalData.tempGridId = '1233592630168813569' wx.reLaunch({ - url: '/pages/index/index?scene=1215152928323555330' + url: '/pages/index/index?scene=1233592630168813569' }) }, scan() {