From 8da6f33d33dbf768a6dd5de2fa33fd6fb28cd195 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 27 Jun 2024 17:18:26 +0800
Subject: [PATCH] 代码优化

---
 common/common.js |   52 ++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/common/common.js b/common/common.js
index 31ff8a2..b186b74 100644
--- a/common/common.js
+++ b/common/common.js
@@ -104,12 +104,12 @@
 				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-02-selected.png',
+				iconPath: '/static/img/tabbar-02.png',
+				url: '/pages/circle/index'
+			},
 			{
 				name: '我的',
 				iconPathSelected: '/static/img/tabbar-03-selected.png',
@@ -124,7 +124,12 @@
 				iconPath: '/static/img/tabbar-04.png',
 				url: '/pages/home/index'
 			},
-
+			{
+				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 +152,12 @@
 				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-02-selected.png',
+				iconPath: '/static/img/tabbar-02.png',
+				url: '/pages/circle/index'
+			},
 			{
 				name: '驾驶舱',
 				iconPathSelected: '/static/img/tabbar-07-selected.png',
@@ -176,6 +180,12 @@
 				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-07-selected.png',
 				iconPath: '/static/img/tabbar-07.png',
@@ -188,5 +198,19 @@
 				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-03-selected.png',
+				iconPath: '/static/img/tabbar-03.png',
+				url: '/pages/user/center'
+			}
+		]
 	}
 }
\ No newline at end of file

--
Gitblit v1.9.3