|
@@ -81,17 +81,13 @@ export default class Index extends Component {
|
81
|
81
|
})
|
82
|
82
|
}
|
83
|
83
|
componentDidShow() {
|
84
|
|
- if (Taro.getStorageSync('firstLoading') != '8') {
|
85
|
|
- Taro.showTabBar({
|
86
|
|
- animation: false
|
|
84
|
+
|
|
85
|
+ if (this.props.curCity.id) {
|
|
86
|
+ ready.queue(() => {
|
|
87
|
+ console.log('我又隐藏啦,哈哈哈哈')
|
|
88
|
+ Taro.hideTabBar()
|
|
89
|
+ this.loadData()
|
87
|
90
|
})
|
88
|
|
- if (this.props.curCity.id) {
|
89
|
|
- ready.queue(() => {
|
90
|
|
- // debugger
|
91
|
|
- this.loadData()
|
92
|
|
- })
|
93
|
|
- }
|
94
|
|
- Taro.setStorageSync('firstLoading', '6')
|
95
|
91
|
}
|
96
|
92
|
}
|
97
|
93
|
|
|
@@ -178,21 +174,22 @@ export default class Index extends Component {
|
178
|
174
|
|
179
|
175
|
const maskVisible = banner && this.props.screenShow !== (banner || {}).contentId
|
180
|
176
|
if (maskVisible) {
|
181
|
|
- Taro.hideTabBar({
|
182
|
|
- animation: true
|
183
|
|
- })
|
|
177
|
+ Taro.hideTabBar()
|
|
178
|
+ } else {
|
|
179
|
+ Taro.showTabBar()
|
184
|
180
|
}
|
185
|
181
|
|
186
|
182
|
this.setState({
|
187
|
183
|
maskVisible,
|
188
|
184
|
maskBanner: banner || {}
|
189
|
185
|
}, () => {
|
|
186
|
+ if (Taro.getStorageSync('firstLoading') != '8') {
|
|
187
|
+ const { dispatch } = getStore()
|
|
188
|
+ dispatch({ type: SET_SCREEN_SHOWED, payload: (banner || {}).contentId })
|
190
|
189
|
|
191
|
|
-
|
192
|
|
- const { dispatch } = getStore()
|
193
|
|
- dispatch({ type: SET_SCREEN_SHOWED, payload: (banner || {}).contentId })
|
194
|
|
-
|
195
|
|
-
|
|
190
|
+ } else {
|
|
191
|
+ Taro.setStorageSync('firstLoading', '6')
|
|
192
|
+ }
|
196
|
193
|
})
|
197
|
194
|
})
|
198
|
195
|
}
|
|
@@ -404,9 +401,7 @@ export default class Index extends Component {
|
404
|
401
|
this.setState({
|
405
|
402
|
maskVisible: false
|
406
|
403
|
})
|
407
|
|
- Taro.showTabBar({
|
408
|
|
- animation: true
|
409
|
|
- })
|
|
404
|
+ Taro.showTabBar()
|
410
|
405
|
}
|
411
|
406
|
|
412
|
407
|
makePhoneCall = () => {
|