From fc38d1c92f01a224e8373c4425481bb1d85e2bf3 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 21 七月 2023 15:36:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pages/tabBar/utils/tabBar.js | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/pages/tabBar/utils/tabBar.js b/pages/tabBar/utils/tabBar.js
index feb6513..4902507 100644
--- a/pages/tabBar/utils/tabBar.js
+++ b/pages/tabBar/utils/tabBar.js
@@ -1,16 +1,34 @@
const user_leader = [
{
- "pagePath": "pages/tabBar/examine/examine",
+ "pagePath": "pages/tabBar/firstPage/firstPage",
"iconPath": "/static/notice1.png",
"selectedIconPath": "/static/notice1-selected.png",
- "text": "通知审核"
+ "text": "首页"
+ },
+ {
+ "pagePath": "pages/tabBar/current/current",
+ "iconPath": "/static/send.png",
+ "selectedIconPath": "/static/send_selected.png",
+ "text": "信息"
+ },
+ // {
+ // "pagePath": "pages/tabBar/examine/examine",
+ // "iconPath": "/static/notice1.png",
+ // "selectedIconPath": "/static/notice1-selected.png",
+ // "text": "通知审核"
+ // },
+ {
+ "pagePath": "pages/tabBar/weather/weather",
+ "iconPath": "/static/notice1.png",
+ "selectedIconPath": "/static/notice1-selected.png",
+ "text": "气象"
},
{
"pagePath": "pages/tabBar/count/count",
"iconPath": "/static/notice1.png",
"selectedIconPath": "/static/notice1-selected.png",
"text": "信息统计"
- }
+ },
]
const user_other = [
@@ -27,6 +45,12 @@
"text": "我的叫应"
},
{
+ "pagePath": "pages/tabBar/current/current",
+ "iconPath": "/static/send.png",
+ "selectedIconPath": "/static/send_selected.png",
+ "text": "信息"
+ },
+ {
"pagePath": "pages/tabBar/information/information",
"iconPath": "/static/send.png",
"selectedIconPath": "/static/send_selected.png",
--
Gitblit v1.9.2