From 3c738f4fe2762bba8087e5a22fc0dc06560eab0e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 08 Aug 2024 10:01:17 +0800
Subject: [PATCH] 三色任务与自查任务
---
common/common.js | 82 ++++++++++++++++++++++++++++++++++-------
1 files changed, 68 insertions(+), 14 deletions(-)
diff --git a/common/common.js b/common/common.js
index 31ff8a2..1a57fd7 100644
--- a/common/common.js
+++ b/common/common.js
@@ -104,12 +104,18 @@
iconPath: '/static/img/tabbar-01.png',
url: '/pages/home/index'
},
- // {
- // name: '圈子',
- // iconPathSelected: '/static/img/tabbar-02-selected.png',
- // iconPath: '/static/img/tabbar-02.png',
- // url: '/pages/circle/index'
- // },
+ {
+ name: '周边',
+ iconPathSelected: '/static/img/tabbar-09-selected.png',
+ iconPath: '/static/img/tabbar-09.png',
+ url: '/pages/myMap/myMap'
+ },
+ {
+ name: '邻里圈',
+ iconPathSelected: '/static/img/tabbar-02-selected.png',
+ iconPath: '/static/img/tabbar-02.png',
+ url: '/pages/circle/index'
+ },
{
name: '我的',
iconPathSelected: '/static/img/tabbar-03-selected.png',
@@ -124,7 +130,18 @@
iconPath: '/static/img/tabbar-04.png',
url: '/pages/home/index'
},
-
+ {
+ name: '周边',
+ iconPathSelected: '/static/img/tabbar-09-selected.png',
+ iconPath: '/static/img/tabbar-09.png',
+ url: '/pages/myMap/myMap'
+ },
+ {
+ name: '协同圈',
+ iconPathSelected: '/static/img/tabbar-08-selected.png',
+ iconPath: '/static/img/tabbar-08.png',
+ url: '/pages/circle/index'
+ },
{
name: '驾驶舱',
iconPathSelected: '/static/img/tabbar-05-selected.png',
@@ -147,13 +164,18 @@
iconPath: '/static/img/tabbar-01.png',
url: '/pages/home/index'
},
-
- // {
- // name: '圈子',
- // iconPathSelected: '/static/img/tabbar-02-selected.png',
- // iconPath: '/static/img/tabbar-02.png',
- // url: '/pages/circle/index'
- // },
+ {
+ name: '周边',
+ iconPathSelected: '/static/img/tabbar-09-selected.png',
+ iconPath: '/static/img/tabbar-09.png',
+ url: '/pages/myMap/myMap'
+ },
+ {
+ name: '协同圈',
+ iconPathSelected: '/static/img/tabbar-02-selected.png',
+ iconPath: '/static/img/tabbar-02.png',
+ url: '/pages/circle/index'
+ },
{
name: '驾驶舱',
iconPathSelected: '/static/img/tabbar-07-selected.png',
@@ -176,6 +198,18 @@
url: '/pages/home/index'
},
{
+ name: '周边',
+ iconPathSelected: '/static/img/tabbar-09-selected.png',
+ iconPath: '/static/img/tabbar-09.png',
+ url: '/pages/myMap/myMap'
+ },
+ {
+ name: '圈子',
+ iconPathSelected: '/static/img/tabbar-02-selected.png',
+ iconPath: '/static/img/tabbar-02.png',
+ url: '/pages/circle/index'
+ },
+ {
name: '驾驶舱',
iconPathSelected: '/static/img/tabbar-07-selected.png',
iconPath: '/static/img/tabbar-07.png',
@@ -188,5 +222,25 @@
url: '/pages/user/center'
}
]
+ } else if (roleType == 5) { //校园主体和通用
+ return [{
+ name: '首页',
+ iconPathSelected: '/static/img/tabbar-01-selected.png',
+ iconPath: '/static/img/tabbar-01.png',
+ url: '/pages/home/index'
+ },
+ {
+ name: '周边',
+ iconPathSelected: '/static/img/tabbar-09-selected.png',
+ iconPath: '/static/img/tabbar-09.png',
+ url: '/pages/myMap/myMap'
+ },
+ {
+ name: '我的',
+ iconPathSelected: '/static/img/tabbar-03-selected.png',
+ iconPath: '/static/img/tabbar-03.png',
+ url: '/pages/user/center'
+ }
+ ]
}
}
\ No newline at end of file
--
Gitblit v1.9.3