From c9928dd4f6d25e2339ea1400f59ec58674a927a7 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 19 六月 2025 20:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
components/custom-tabbar.vue | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/components/custom-tabbar.vue b/components/custom-tabbar.vue
index a483f52..75aec2e 100644
--- a/components/custom-tabbar.vue
+++ b/components/custom-tabbar.vue
@@ -47,7 +47,9 @@
"key": 'index'
},
{
- "pagePath": "/pages/tabbar/category/category",
+ // "pagePath": "/pages/tabbar/category/category",
+ "pagePath": "/pages/commodity-square/commoditySquare",
+
"iconPath": "/static/tabbar/category.png",
"selectedIconPath": "/static/tabbar/category-s.png",
"text": "鍟嗗煄",
@@ -55,8 +57,8 @@
},
{
"pagePath": "/pages/tabbar/video/video",
- "iconPath": "/static/tabbar/video.png",
- "selectedIconPath": "/static/tabbar/video-selected.png",
+ "iconPath": "/static/tabbar/video1.png",
+ "selectedIconPath": "/static/tabbar/video1-selected.png",
"key": 'video'
},
{
--
Gitblit v1.8.0