|
@@ -257,12 +257,7 @@ export default {
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
onShow() {
|
|
onShow() {
|
|
|
- // Tabbar 切换过渡动画(最少停留 1 秒)
|
|
|
|
|
this.showTabTransition = true
|
|
this.showTabTransition = true
|
|
|
- var self = this
|
|
|
|
|
- setTimeout(function() {
|
|
|
|
|
- self.showTabTransition = false
|
|
|
|
|
- }, 1800)
|
|
|
|
|
|
|
|
|
|
var token = uni.getStorageSync('token')
|
|
var token = uni.getStorageSync('token')
|
|
|
this.isLoggedIn = !!token
|
|
this.isLoggedIn = !!token
|
|
@@ -281,6 +276,7 @@ export default {
|
|
|
this.loadDimensionProducts()
|
|
this.loadDimensionProducts()
|
|
|
// 游客也能浏览文章
|
|
// 游客也能浏览文章
|
|
|
this.loadFeaturedArticles()
|
|
this.loadFeaturedArticles()
|
|
|
|
|
+ this._watchPageReady()
|
|
|
},
|
|
},
|
|
|
methods: {
|
|
methods: {
|
|
|
loadSectionConfig: function() {
|
|
loadSectionConfig: function() {
|
|
@@ -530,6 +526,25 @@ export default {
|
|
|
},
|
|
},
|
|
|
goRelationshipQuestionnaire: function() {
|
|
goRelationshipQuestionnaire: function() {
|
|
|
uni.navigateTo({ url: '/pages/wisdom-detail/relationship-questionnaire' })
|
|
uni.navigateTo({ url: '/pages/wisdom-detail/relationship-questionnaire' })
|
|
|
|
|
+ },
|
|
|
|
|
+ _watchPageReady() {
|
|
|
|
|
+ var self = this
|
|
|
|
|
+ var unwatch = this.$watch(function() {
|
|
|
|
|
+ if (self.isLoggedIn) {
|
|
|
|
|
+ return !!(self.cognitiveReport || self.energyOverview)
|
|
|
|
|
+ }
|
|
|
|
|
+ return !!(self.dimensionActivities && self.dimensionActivities.length > 0) ||
|
|
|
|
|
+ !!(self.dimensionProducts && self.dimensionProducts.length > 0)
|
|
|
|
|
+ }, function(val) {
|
|
|
|
|
+ if (val) {
|
|
|
|
|
+ if (unwatch) unwatch()
|
|
|
|
|
+ self.showTabTransition = false
|
|
|
|
|
+ }
|
|
|
|
|
+ })
|
|
|
|
|
+ setTimeout(function() {
|
|
|
|
|
+ if (unwatch) unwatch()
|
|
|
|
|
+ self.showTabTransition = false
|
|
|
|
|
+ }, 5000)
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|