|
|
@@ -162,7 +162,7 @@ export default {
|
|
|
return {
|
|
|
isLoggedIn: false,
|
|
|
role: null,
|
|
|
- showTabTransition: false,
|
|
|
+ showTabTransition: true,
|
|
|
activeChildId: null,
|
|
|
activeChildName: '',
|
|
|
userName: '',
|
|
|
@@ -243,7 +243,7 @@ export default {
|
|
|
var self = this
|
|
|
setTimeout(function() {
|
|
|
self.showTabTransition = false
|
|
|
- }, 1100)
|
|
|
+ }, 1500)
|
|
|
|
|
|
var token = uni.getStorageSync('token')
|
|
|
this.isLoggedIn = !!token
|
|
|
@@ -410,16 +410,25 @@ export default {
|
|
|
onTaskClick: function(task) {},
|
|
|
goTasks: function() { uni.switchTab({ url: '/pages/tasks/tasks' }) },
|
|
|
goActivityDetail: function(id) {},
|
|
|
- goMoreActivities: function() {},
|
|
|
- goProductDetail: function(id) {
|
|
|
- var token = uni.getStorageSync('token')
|
|
|
- if (token) {
|
|
|
- uni.navigateTo({ url: '/pages/discover/product-detail/product-detail?id=' + id })
|
|
|
- } else {
|
|
|
- uni.navigateTo({ url: '/pages/login/login?redirect=' + encodeURIComponent('/pages/wisdom/index') })
|
|
|
+ goMoreActivities: function() {
|
|
|
+ uni.navigateTo({ url: '/pages/discover/index' })
|
|
|
+ },
|
|
|
+ goActivityDetail: function(act) {
|
|
|
+ if (act && act.id) uni.navigateTo({ url: '/pages/discover-detail/activity-detail/activity-detail?id=' + act.id })
|
|
|
+ },
|
|
|
+ goProductDetail: function(prod) {
|
|
|
+ if (prod && prod.id) {
|
|
|
+ var token = uni.getStorageSync('token')
|
|
|
+ if (token) {
|
|
|
+ uni.navigateTo({ url: '/pages/discover-detail/product-detail/product-detail?id=' + prod.id })
|
|
|
+ } else {
|
|
|
+ uni.navigateTo({ url: '/pages/login/login?redirect=' + encodeURIComponent('/pages/wisdom/index') })
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
- goMoreProducts: function() {},
|
|
|
+ goMoreProducts: function() {
|
|
|
+ uni.navigateTo({ url: '/pages/discover/index' })
|
|
|
+ },
|
|
|
loadFeaturedArticles: function() {
|
|
|
var self = this
|
|
|
getFeaturedArticles({ size: 5 }).then(function(res) {
|