hookehuyr

需求有改变,暂时屏蔽兑换主页面,写死跳转到个人兑换页面去

1 <!-- 1 <!--
2 * @Date: 2025-08-27 17:44:10 2 * @Date: 2025-08-27 17:44:10
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2025-09-12 23:28:37 4 + * @LastEditTime: 2025-09-15 11:35:20
5 * @FilePath: /lls_program/src/components/BottomNav.vue 5 * @FilePath: /lls_program/src/components/BottomNav.vue
6 * @Description: 文件描述 6 * @Description: 文件描述
7 --> 7 -->
...@@ -36,7 +36,8 @@ const meIconActive = 'https://cdn.ipadbiz.cn/lls_prog/icon/me_active1.svg'; ...@@ -36,7 +36,8 @@ const meIconActive = 'https://cdn.ipadbiz.cn/lls_prog/icon/me_active1.svg';
36 const navItems = shallowRef([ 36 const navItems = shallowRef([
37 { path: '/pages/Dashboard/index', icon: homeIcon, activeIcon: homeIconActive, label: '首页' }, 37 { path: '/pages/Dashboard/index', icon: homeIcon, activeIcon: homeIconActive, label: '首页' },
38 { path: '/pages/ActivitiesCover/index', icon: activitiesIcon, activeIcon: activitiesIconActive, label: '活动' }, 38 { path: '/pages/ActivitiesCover/index', icon: activitiesIcon, activeIcon: activitiesIconActive, label: '活动' },
39 - { path: '/pages/RewardCategories/index', icon: rewardsIcon, activeIcon: rewardsIconActive, label: '兑换' }, 39 + // { path: '/pages/RewardCategories/index', icon: rewardsIcon, activeIcon: rewardsIconActive, label: '兑换' },
40 + { path: '/pages/Rewards/index?id=health&category=health', icon: rewardsIcon, activeIcon: rewardsIconActive, label: '兑换' },
40 { path: '/pages/Profile/index', icon: meIcon, activeIcon: meIconActive, label: '我的' }, 41 { path: '/pages/Profile/index', icon: meIcon, activeIcon: meIconActive, label: '我的' },
41 ]); 42 ]);
42 43
...@@ -46,7 +47,7 @@ const currentPage = computed(() => { ...@@ -46,7 +47,7 @@ const currentPage = computed(() => {
46 }); 47 });
47 48
48 const isActive = (path) => { 49 const isActive = (path) => {
49 - return currentPage.value === path; 50 + return path.includes(currentPage.value);
50 }; 51 };
51 52
52 const navigate = (path) => { 53 const navigate = (path) => {
......
...@@ -401,7 +401,6 @@ defineExpose({ ...@@ -401,7 +401,6 @@ defineExpose({
401 const initData = async () => { 401 const initData = async () => {
402 floatingItems.value = generatePointsData(); 402 floatingItems.value = generatePointsData();
403 animatedTotalPoints.value = props.totalPoints; 403 animatedTotalPoints.value = props.totalPoints;
404 - console.warn('初始化积分数据', props.pendingPoints)
405 } 404 }
406 405
407 // 监听props变化 406 // 监听props变化
...@@ -427,7 +426,8 @@ const handleGoToRewards = () => { ...@@ -427,7 +426,8 @@ const handleGoToRewards = () => {
427 return 426 return
428 } 427 }
429 Taro.navigateTo({ 428 Taro.navigateTo({
430 - url: '/pages/RewardCategories/index', 429 + // url: '/pages/RewardCategories/index',
430 + url: '/pages/Rewards/index?id=health&category=health',
431 }) 431 })
432 } 432 }
433 433
......
...@@ -113,7 +113,8 @@ const handleGoToRewards = () => { ...@@ -113,7 +113,8 @@ const handleGoToRewards = () => {
113 return 113 return
114 } 114 }
115 Taro.navigateTo({ 115 Taro.navigateTo({
116 - url: '/pages/RewardCategories/index', 116 + // url: '/pages/RewardCategories/index',
117 + url: '/pages/Rewards/index?id=health&category=health',
117 }) 118 })
118 } 119 }
119 120
......
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
93 </view> 93 </view>
94 </view> 94 </view>
95 </view> 95 </view>
96 - <!-- <BottomNav /> --> 96 + <BottomNav />
97 </view> 97 </view>
98 </template> 98 </template>
99 99
...@@ -101,6 +101,7 @@ ...@@ -101,6 +101,7 @@
101 import { ref, computed, onMounted, watch } from 'vue'; 101 import { ref, computed, onMounted, watch } from 'vue';
102 import Taro, { useDidShow } from '@tarojs/taro'; 102 import Taro, { useDidShow } from '@tarojs/taro';
103 import { ScreenLittle, Search2, My, ArrowUp, ArrowDown } from '@nutui/icons-vue-taro'; 103 import { ScreenLittle, Search2, My, ArrowUp, ArrowDown } from '@nutui/icons-vue-taro';
104 +import BottomNav from '../../components/BottomNav.vue';
104 // 导入接口 105 // 导入接口
105 import { getUserProfileAPI } from '@/api/user'; 106 import { getUserProfileAPI } from '@/api/user';
106 import { getFamilyDashboardAPI } from '@/api/family'; 107 import { getFamilyDashboardAPI } from '@/api/family';
......