Browse Source

提交精致锦水居民端

master
lihenian 6 years ago
parent
commit
64311b2cea
  1. 4
      app.json
  2. 2
      pages/association/association.json
  3. 2
      pages/discussion/discussion.json
  4. 2
      pages/mine/mine.wxml
  5. 6
      pages/toRegister/toRegister.js

4
app.json

@ -106,13 +106,13 @@
}, },
{ {
"pagePath": "pages/discussion/discussion", "pagePath": "pages/discussion/discussion",
"text": "党群议事", "text": "我有事说",
"iconPath": "images/discuss.png", "iconPath": "images/discuss.png",
"selectedIconPath": "images/discussSelected.png" "selectedIconPath": "images/discussSelected.png"
}, },
{ {
"pagePath": "pages/association/association", "pagePath": "pages/association/association",
"text": "邻里党群", "text": "党群互动",
"iconPath": "images/association.png", "iconPath": "images/association.png",
"selectedIconPath": "images/association-select.png" "selectedIconPath": "images/association-select.png"
}, },

2
pages/association/association.json

@ -3,6 +3,6 @@
"my-association-list": "./components/my-association-list/index", "my-association-list": "./components/my-association-list/index",
"command-association-list": "./components/command-association-list/index" "command-association-list": "./components/command-association-list/index"
}, },
"navigationBarTitleText": "邻里党群", "navigationBarTitleText": "党群互动",
"onReachBottomDistance": 100 "onReachBottomDistance": 100
} }

2
pages/discussion/discussion.json

@ -1,5 +1,5 @@
{ {
"navigationBarTitleText": "党群议事", "navigationBarTitleText": "我有事说",
"usingComponents": { "usingComponents": {
"issue-list": "./components/issueList/issueList", "issue-list": "./components/issueList/issueList",
"project-list": "./components/projectList/projectList", "project-list": "./components/projectList/projectList",

2
pages/mine/mine.wxml

@ -132,7 +132,7 @@
<view class="topic-nodata" wx:if="{{topicList.length === 0 && !preloadVisible}}"> <view class="topic-nodata" wx:if="{{topicList.length === 0 && !preloadVisible}}">
<image class="no-data" src="../../images/mine/topic-nodata.png" /> <image class="no-data" src="../../images/mine/topic-nodata.png" />
<view class="tip">您还未发布话题</view> <view class="tip">您还未发布话题</view>
<view class="tip">快到“邻里党群”,到您的群里发布吧</view> <view class="tip">快到“党群互动”,到您的群里发布吧</view>
</view> </view>
</view> </view>

6
pages/toRegister/toRegister.js

@ -21,7 +21,7 @@ Page({
} }
}) })
let that = this let that = this
const versionNum = '1.0.0' const versionNum = '1.0.1'
api.getScanSwitch(versionNum).then(function (res) { api.getScanSwitch(versionNum).then(function (res) {
console.log(res.data) console.log(res.data)
let state = res.data.scanFlag let state = res.data.scanFlag
@ -42,9 +42,9 @@ Page({
// }) // })
}, },
experience() { experience() {
app.globalData.tempGridId = '1215152928323555330' app.globalData.tempGridId = '1233592630168813569'
wx.reLaunch({ wx.reLaunch({
url: '/pages/index/index?scene=1215152928323555330' url: '/pages/index/index?scene=1233592630168813569'
}) })
}, },
scan() { scan() {

Loading…
Cancel
Save