Просмотр исходного кода

fix(frontend): fix all tab pages - empty navigation methods, wrong paths, bad query params for goMoreActivities/goMoreProducts

User 4 месяцев назад
Родитель
Сommit
61add857e5

+ 6 - 2
cfc-frontend/pages/action/index.vue

@@ -207,7 +207,7 @@ export default {
   components: { TabTransition, PageBanner, LoginGuideCard, FamilyEnergyBar, UserQuickEntry, DimensionTasks, DimensionActivities, DimensionProducts, ContactCard, ContactImport, FamilyRelationGraph },
   data() {
     return {
-      showTabTransition: false,
+      showTabTransition: true,
       isLoggedIn: false,
       role: null,
       currentChildId: null,
@@ -267,6 +267,10 @@ export default {
   },
   onShow() {
     this.showTabTransition = true
+    var self = this
+    setTimeout(function() {
+      self.showTabTransition = false
+    }, 1500)
 
     var token = uni.getStorageSync('token')
     this.isLoggedIn = !!token
@@ -451,7 +455,7 @@ export default {
       uni.navigateTo({ url: '/pages/discover-detail/activity-detail/activity-detail?id=' + act.id })
     },
     goMoreActivities: function() {
-      uni.navigateTo({ url: '/pages/discover/index?type=activity&dimension=action' })
+      uni.navigateTo({ url: '/pages/discover/index' })
     },
     goProductDetail: function(prod) {
       uni.navigateTo({ url: '/pages/discover-detail/product-detail/product-detail?id=' + prod.id })

+ 5 - 6
cfc-frontend/pages/mind/index.vue

@@ -309,7 +309,7 @@ export default {
     return {
       isLoggedIn: false,
       role: null,
-      showTabTransition: false,
+      showTabTransition: true,
       currentChildId: null,
       visibleSections: [],
       familyMembersVisible: [],
@@ -461,7 +461,7 @@ export default {
     var self = this
     setTimeout(function() {
       self.showTabTransition = false
-    }, 1100)
+    }, 1500)
 
     var token = uni.getStorageSync('token')
     this.isLoggedIn = !!token
@@ -788,14 +788,13 @@ export default {
       uni.navigateTo({ url: '/pages/tasks/tasks' })
     },
     goActivityDetail: function(act) {
-      if (act && act.id) uni.navigateTo({ url: '/pages/discover/activity-detail/activity-detail?id=' + act.id })
+      if (act && act.id) uni.navigateTo({ url: '/pages/discover-detail/activity-detail/activity-detail?id=' + act.id })
     },
     goMoreActivities: function() {
-      var dimCode = this.currentDimensionCode
-      uni.navigateTo({ url: '/pages/discover/index?type=activity&dimension=' + dimCode })
+      uni.navigateTo({ url: '/pages/discover/index' })
     },
     goProductDetail: function(prod) {
-      if (prod && prod.id) uni.navigateTo({ url: '/pages/discover/product-detail/product-detail?id=' + prod.id })
+      if (prod && prod.id) uni.navigateTo({ url: '/pages/discover-detail/product-detail/product-detail?id=' + prod.id })
     },
     goMoreProducts: function() {
       var dimCode = this.currentDimensionCode

+ 19 - 10
cfc-frontend/pages/wisdom/index.vue

@@ -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) {